From c535389a291fba67c57a2aeb564d1efb6a3fff28 Mon Sep 17 00:00:00 2001
From: Lars Norberg <github@larsnorbergofficial.com>
Date: Tue, 27 Sep 2022 14:10:57 +0200
Subject: [PATCH] 2.1.51-Release

---
 .github/workflows/build.yml                   |   14 +-
 CHANGELOG.md                                  |    3 +
 SimpleClassPower/SimpleClassPower.toc         |    5 +-
 SimpleClassPower/SimpleClassPower_TBC.toc     |   39 +
 SimpleClassPower/SimpleClassPower_Vanilla.toc |   39 +
 SimpleClassPower/SimpleClassPower_Wrath.toc   |   39 +
 SimpleClassPower/back-end/libraries.xml       |    4 +-
 .../back-end/libraries/actionbutton.lua       | 1092 +++++++------
 SimpleClassPower/back-end/libraries/aura.lua  |   89 +-
 .../back-end/libraries/bagbutton.lua          |  276 ++--
 .../back-end/libraries/blizzard.lua           | 1366 ++++++++--------
 SimpleClassPower/back-end/libraries/cast.lua  |  274 ++--
 .../back-end/libraries/chatbubble.lua         |   92 +-
 .../back-end/libraries/chatframe.lua          |  382 ++---
 .../back-end/libraries/clientbuild.lua        |   84 +-
 SimpleClassPower/back-end/libraries/fader.lua |  420 ++---
 SimpleClassPower/back-end/libraries/frame.lua |  114 +-
 .../back-end/libraries/inputmethod.lua        |   14 +-
 .../back-end/libraries/minimap.lua            |   81 +-
 .../back-end/libraries/playerdata.lua         |   53 +-
 .../back-end/libraries/spellhighlight.lua     |   66 +-
 .../back-end/libraries/statusbar.lua          |   65 +-
 .../back-end/libraries/tooltip.lua            | 1329 +++++++--------
 .../back-end/libraries/tooltipscanner.lua     | 1433 +++++++++--------
 .../back-end/libraries/unitframe.lua          |  209 ++-
 .../back-end/plugins/generic_reputation.lua   |  111 +-
 .../back-end/plugins/unit_auras.lua           |  273 ++--
 .../back-end/plugins/unit_cast.lua            |  272 ++--
 .../back-end/plugins/unit_classpower.lua      |  776 +++++----
 .../back-end/plugins/unit_groupdebuff.lua     |  155 +-
 .../back-end/plugins/unit_grouprole.lua       |   78 +-
 .../back-end/plugins/unit_health.lua          |  293 ++--
 .../back-end/plugins/unit_level.lua           |  138 +-
 .../back-end/plugins/unit_name.lua            |   46 +-
 .../back-end/plugins/unit_pethappiness.lua    |   51 +-
 .../back-end/plugins/unit_threat.lua          |   20 +-
 SimpleClassPower/back-end/tools/binds.lua     |  275 ++--
 SimpleClassPower/back-end/tools/colors.lua    |  107 +-
 SimpleClassPower/front-end/root.lua           |  111 +-
 SimpleClassPower/front-end/stylesheet.lua     |   53 +-
 40 files changed, 5477 insertions(+), 4864 deletions(-)
 create mode 100644 SimpleClassPower/SimpleClassPower_TBC.toc
 create mode 100644 SimpleClassPower/SimpleClassPower_Vanilla.toc
 create mode 100644 SimpleClassPower/SimpleClassPower_Wrath.toc

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ff73ecf..b784908 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,17 +25,7 @@ jobs:
         with:
           fetch-depth: 0  # gets git history for changelogs
 
-      - name: Package Retail
+      - name: Package
         uses: BigWigsMods/packager@v2
         with:
-          args: -g retail -m .pkgmeta
-
-      - name: Package Classic
-        uses: BigWigsMods/packager@v2
-        with:
-          args: -g classic -m .pkgmeta
-
-      - name: Package BC
-        uses: BigWigsMods/packager@v2
-        with:
-          args: -g bcc -m .pkgmeta
+          args: -m .pkgmeta
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18557b3..1455447 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.51-Release] 2022-09-27
+- Updated for Wrath Classic.
+
 ## [2.1.50-Release] 2022-05-31
 - Bump toc to WoW client patch 9.2.5.
 
diff --git a/SimpleClassPower/SimpleClassPower.toc b/SimpleClassPower/SimpleClassPower.toc
index eea12e4..a029767 100644
--- a/SimpleClassPower/SimpleClassPower.toc
+++ b/SimpleClassPower/SimpleClassPower.toc
@@ -1,7 +1,4 @@
-## Interface: 90205
-## Interface-Retail: 90205
-## Interface-Classic: 11402
-## Interface-BCC: 20504
+## Interface: 90207
 
 ## Title: SimpleClassPower
 ## Notes: |cff666666By Lars Norberg.|r|n|n|cff4488ffPayPal|r|cffffffff:|r |n|cffffffffwww.paypal.me/GoldpawsStuff|r|n|n|cff4488ffPatreon|r|cffffffff:|r |n|cffffffffwww.patreon.com/GoldpawsStuff|r
diff --git a/SimpleClassPower/SimpleClassPower_TBC.toc b/SimpleClassPower/SimpleClassPower_TBC.toc
new file mode 100644
index 0000000..913a237
--- /dev/null
+++ b/SimpleClassPower/SimpleClassPower_TBC.toc
@@ -0,0 +1,39 @@
+## Interface: 20504
+
+## Title: SimpleClassPower
+## Notes: |cff666666By Lars Norberg.|r|n|n|cff4488ffPayPal|r|cffffffff:|r |n|cffffffffwww.paypal.me/GoldpawsStuff|r|n|n|cff4488ffPatreon|r|cffffffff:|r |n|cffffffffwww.patreon.com/GoldpawsStuff|r
+## Author: Lars Norberg
+## Version: @project-version@
+
+## X-Category: Interface Enhancements
+## X-Curse-Project-ID: 296245
+## X-Wago-ID: qv63j7Nb
+## X-License: Custom
+
+## SavedVariables: SimpleClassPower_DB
+
+# Addon libraries & plugins, the main engine of it all
+back-end\wheel.lua
+back-end\libraries.xml
+back-end\plugins.xml
+back-end\tools.xml
+
+# Addon localization
+locale\enUS.lua
+locale\esES.lua
+locale\esMX.lua
+locale\esMX.lua
+locale\frFR.lua
+locale\koKR.lua
+locale\ptBR.lua
+locale\ptPT.lua
+locale\ruRU.lua
+locale\zhCN.lua
+locale\zhTW.lua
+
+# Addon specific data tables and methods.
+front-end\private.lua
+front-end\stylesheet.lua
+
+# Main addon module
+front-end\root.lua
diff --git a/SimpleClassPower/SimpleClassPower_Vanilla.toc b/SimpleClassPower/SimpleClassPower_Vanilla.toc
new file mode 100644
index 0000000..b09143b
--- /dev/null
+++ b/SimpleClassPower/SimpleClassPower_Vanilla.toc
@@ -0,0 +1,39 @@
+## Interface: 11403
+
+## Title: SimpleClassPower
+## Notes: |cff666666By Lars Norberg.|r|n|n|cff4488ffPayPal|r|cffffffff:|r |n|cffffffffwww.paypal.me/GoldpawsStuff|r|n|n|cff4488ffPatreon|r|cffffffff:|r |n|cffffffffwww.patreon.com/GoldpawsStuff|r
+## Author: Lars Norberg
+## Version: @project-version@
+
+## X-Category: Interface Enhancements
+## X-Curse-Project-ID: 296245
+## X-Wago-ID: qv63j7Nb
+## X-License: Custom
+
+## SavedVariables: SimpleClassPower_DB
+
+# Addon libraries & plugins, the main engine of it all
+back-end\wheel.lua
+back-end\libraries.xml
+back-end\plugins.xml
+back-end\tools.xml
+
+# Addon localization
+locale\enUS.lua
+locale\esES.lua
+locale\esMX.lua
+locale\esMX.lua
+locale\frFR.lua
+locale\koKR.lua
+locale\ptBR.lua
+locale\ptPT.lua
+locale\ruRU.lua
+locale\zhCN.lua
+locale\zhTW.lua
+
+# Addon specific data tables and methods.
+front-end\private.lua
+front-end\stylesheet.lua
+
+# Main addon module
+front-end\root.lua
diff --git a/SimpleClassPower/SimpleClassPower_Wrath.toc b/SimpleClassPower/SimpleClassPower_Wrath.toc
new file mode 100644
index 0000000..3e0cf58
--- /dev/null
+++ b/SimpleClassPower/SimpleClassPower_Wrath.toc
@@ -0,0 +1,39 @@
+## Interface: 30400
+
+## Title: SimpleClassPower
+## Notes: |cff666666By Lars Norberg.|r|n|n|cff4488ffPayPal|r|cffffffff:|r |n|cffffffffwww.paypal.me/GoldpawsStuff|r|n|n|cff4488ffPatreon|r|cffffffff:|r |n|cffffffffwww.patreon.com/GoldpawsStuff|r
+## Author: Lars Norberg
+## Version: @project-version@
+
+## X-Category: Interface Enhancements
+## X-Curse-Project-ID: 296245
+## X-Wago-ID: qv63j7Nb
+## X-License: Custom
+
+## SavedVariables: SimpleClassPower_DB
+
+# Addon libraries & plugins, the main engine of it all
+back-end\wheel.lua
+back-end\libraries.xml
+back-end\plugins.xml
+back-end\tools.xml
+
+# Addon localization
+locale\enUS.lua
+locale\esES.lua
+locale\esMX.lua
+locale\esMX.lua
+locale\frFR.lua
+locale\koKR.lua
+locale\ptBR.lua
+locale\ptPT.lua
+locale\ruRU.lua
+locale\zhCN.lua
+locale\zhTW.lua
+
+# Addon specific data tables and methods.
+front-end\private.lua
+front-end\stylesheet.lua
+
+# Main addon module
+front-end\root.lua
diff --git a/SimpleClassPower/back-end/libraries.xml b/SimpleClassPower/back-end/libraries.xml
index 7f4d4d1..b0c5f40 100644
--- a/SimpleClassPower/back-end/libraries.xml
+++ b/SimpleClassPower/back-end/libraries.xml
@@ -2,7 +2,7 @@
 
 <!-- callback libs -->
 <Script file='libraries\message.lua'/>
-<Script file='libraries\event.lua'/> 
+<Script file='libraries\event.lua'/>
 
 <!-- let's load this one first, others will need it -->
 <Script file='libraries\clientbuild.lua'/>
@@ -60,7 +60,7 @@
 
 <!-- advanced media widget libs, require tooltip lib -->
 <Script file='libraries\actionbutton.lua'/>
-<Script file='libraries\bagbutton.lua'/>
+<!--<Script file='libraries\bagbutton.lua'/>-->
 <Script file='libraries\nameplates.lua'/>
 
 <!-- Disabling and styling of Blizzard widgets and menu options -->
diff --git a/SimpleClassPower/back-end/libraries/actionbutton.lua b/SimpleClassPower/back-end/libraries/actionbutton.lua
index 58f1540..a77fdc6 100644
--- a/SimpleClassPower/back-end/libraries/actionbutton.lua
+++ b/SimpleClassPower/back-end/libraries/actionbutton.lua
@@ -1,4 +1,4 @@
-local LibSecureButton = Wheel:Set("LibSecureButton", 138)
+local LibSecureButton = Wheel:Set("LibSecureButton", 145)
 if (not LibSecureButton) then
 	return
 end
@@ -106,16 +106,19 @@ local UnitClass = UnitClass
 -- Constants for client version
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
+local IsRetailShadowlands = LibClientBuild:IsRetailShadowlands()
+local IsRetailDragonflight = LibClientBuild:IsRetailDragonflight()
 
 -- Doing it this way to make the transition to library later on easier
-LibSecureButton.embeds = LibSecureButton.embeds or {} 
-LibSecureButton.buttons = LibSecureButton.buttons or {} 
-LibSecureButton.allbuttons = LibSecureButton.allbuttons or {} 
-LibSecureButton.callbacks = LibSecureButton.callbacks or {} 
+LibSecureButton.embeds = LibSecureButton.embeds or {}
+LibSecureButton.buttons = LibSecureButton.buttons or {}
+LibSecureButton.allbuttons = LibSecureButton.allbuttons or {}
+LibSecureButton.callbacks = LibSecureButton.callbacks or {}
 LibSecureButton.rankCache = LibSecureButton.rankCache or {} -- spell rank cache to identify multiple version of same spell in Classic
-LibSecureButton.controllers = LibSecureButton.controllers or {} -- controllers to return bindings to pet battles, vehicles, etc 
-LibSecureButton.numButtons = LibSecureButton.numButtons or 0 -- total number of spawned buttons 
+LibSecureButton.controllers = LibSecureButton.controllers or {} -- controllers to return bindings to pet battles, vehicles, etc
+LibSecureButton.numButtons = LibSecureButton.numButtons or 0 -- total number of spawned buttons
 LibSecureButton.disableBlizzardGlow = LibSecureButton.disableBlizzardGlow -- semantics. listing it for reference.
 
 -- Frame to securely hide items
@@ -153,7 +156,7 @@ local PETBUTTON_NAME_TEMPLATE_FULL = "GP_PetActionButton%d"
 -- Constants
 local NUM_ACTIONBAR_BUTTONS = NUM_ACTIONBAR_BUTTONS
 local NUM_PET_ACTION_SLOTS = NUM_PET_ACTION_SLOTS
-local NUM_STANCE_SLOTS = NUM_STANCE_SLOTS
+local NUM_STANCE_SLOTS = NUM_STANCE_SLOTS or 10
 local BOTTOMLEFT_ACTIONBAR_PAGE = BOTTOMLEFT_ACTIONBAR_PAGE
 local BOTTOMRIGHT_ACTIONBAR_PAGE = BOTTOMRIGHT_ACTIONBAR_PAGE
 local LEFT_ACTIONBAR_PAGE = LEFT_ACTIONBAR_PAGE
@@ -164,95 +167,145 @@ local DAY, HOUR, MINUTE = 86400, 3600, 60
 
 local SECURE = {}
 if (IsClassic or IsTBC) then
-	SECURE.Page_OnAttributeChanged = [=[ 
-		if (name == "state-page") then 
-			local page; 
-	
-			if (value == "11") then 
-				page = 12; 
-			end
-	
-			local driverResult; 
-			if page then 
+	SECURE.Page_OnAttributeChanged = [=[
+		if (name == "state-page") then
+			local page;
+
+			if (value == "11") then
+				page = 12;
+			end
+
+			local driverResult;
+			if page then
 				driverResult = value;
-				value = page; 
-			end 
-	
+				value = page;
+			end
+
 			self:SetAttribute("state", value);
-	
-			local button = self:GetFrameRef("Button"); 
-			local buttonPage = button:GetAttribute("actionpage"); 
-			local id = button:GetID(); 
-			local actionpage = tonumber(value); 
-			local slot = actionpage and (actionpage > 1) and ((actionpage - 1)*12 + id) or id; 
-	
-			button:SetAttribute("actionpage", actionpage or 0); 
-			button:SetAttribute("action", slot); 
-			button:CallMethod("UpdateAction"); 
-	
+
+			local button = self:GetFrameRef("Button");
+			local buttonPage = button:GetAttribute("actionpage");
+			local id = button:GetID();
+			local actionpage = tonumber(value);
+			local slot = actionpage and (actionpage > 1) and ((actionpage - 1)*12 + id) or id;
+
+			button:SetAttribute("actionpage", actionpage or 0);
+			button:SetAttribute("action", slot);
+			button:CallMethod("UpdateAction");
+
 			-- Debugging the weird results
 			-- *only showing bar 1, button 1
 			if (self:GetID() == 1) and (id == 1) then
-				if driverResult then 
-					local page = tonumber(driverResult); 
-					if page then 
-						self:CallMethod("AddDebugMessage", "ActionButton driver attempted to change page to: " ..driverResult.. " - Page changed by environment to: " .. value); 
-					else 
-						self:CallMethod("AddDebugMessage", "ActionButton driver reported the state: " ..driverResult.. " - Page changed by environment to: " .. value); 
+				if driverResult then
+					local page = tonumber(driverResult);
+					if page then
+						self:CallMethod("AddDebugMessage", "ActionButton driver attempted to change page to: " ..driverResult.. " - Page changed by environment to: " .. value);
+					else
+						self:CallMethod("AddDebugMessage", "ActionButton driver reported the state: " ..driverResult.. " - Page changed by environment to: " .. value);
 					end
-				elseif value then 
-					self:CallMethod("AddDebugMessage", "ActionButton driver changed page to: " ..value); 
+				elseif value then
+					self:CallMethod("AddDebugMessage", "ActionButton driver changed page to: " ..value);
 				end
 			end
-		end 
+		end
+	]=]
+end
+if (IsWrath) then
+
+	-- UNTESTED!
+	SECURE.Page_OnAttributeChanged = [=[
+		if (name == "state-page") then
+			local page;
+
+			if (value == "11") then
+				if (HasBonusActionBar()) and (GetActionBarPage() == 1) then
+					page = GetBonusBarIndex();
+				else
+					page = 12;
+				end
+			end
+
+			local driverResult;
+			if page then
+				driverResult = value;
+				value = page;
+			end
+
+			self:SetAttribute("state", value);
+
+			local button = self:GetFrameRef("Button");
+			local buttonPage = button:GetAttribute("actionpage");
+			local id = button:GetID();
+			local actionpage = tonumber(value);
+			local slot = actionpage and (actionpage > 1) and ((actionpage - 1)*12 + id) or id;
+
+			button:SetAttribute("actionpage", actionpage or 0);
+			button:SetAttribute("action", slot);
+			button:CallMethod("UpdateAction");
+
+			-- Debugging the weird results
+			-- *only showing bar 1, button 1
+			if (self:GetID() == 1) and (id == 1) then
+				if driverResult then
+					local page = tonumber(driverResult);
+					if page then
+						self:CallMethod("AddDebugMessage", "ActionButton driver attempted to change page to: " ..driverResult.. " - Page changed by environment to: " .. value);
+					else
+						self:CallMethod("AddDebugMessage", "ActionButton driver reported the state: " ..driverResult.. " - Page changed by environment to: " .. value);
+					end
+				elseif value then
+					self:CallMethod("AddDebugMessage", "ActionButton driver changed page to: " ..value);
+				end
+			end
+		end
 	]=]
 end
 if (IsRetail) then
-	SECURE.Page_OnAttributeChanged = [=[ 
-		if (name == "state-page") then 
-			local page; 
-	
-			if (value == "11") then 
-				if (HasBonusActionBar()) and (GetActionBarPage() == 1) then  
-					page = GetBonusBarIndex(); 
-				else 
-					page = 12; 
-				end 
-			end
-	
-			local driverResult; 
-			if page then 
+	SECURE.Page_OnAttributeChanged = [=[
+		if (name == "state-page") then
+			local page;
+
+			if (value == "11") then
+				if (HasBonusActionBar()) and (GetActionBarPage() == 1) then
+					page = GetBonusBarIndex();
+				else
+					page = 12;
+				end
+			end
+
+			local driverResult;
+			if page then
 				driverResult = value;
-				value = page; 
-			end 
-	
+				value = page;
+			end
+
 			self:SetAttribute("state", value);
-	
-			local button = self:GetFrameRef("Button"); 
-			local buttonPage = button:GetAttribute("actionpage"); 
-			local id = button:GetID(); 
-			local actionpage = tonumber(value); 
-			local slot = actionpage and (actionpage > 1) and ((actionpage - 1)*12 + id) or id; 
-	
-			button:SetAttribute("actionpage", actionpage or 0); 
-			button:SetAttribute("action", slot); 
-			button:CallMethod("UpdateAction"); 
-	
+
+			local button = self:GetFrameRef("Button");
+			local buttonPage = button:GetAttribute("actionpage");
+			local id = button:GetID();
+			local actionpage = tonumber(value);
+			local slot = actionpage and (actionpage > 1) and ((actionpage - 1)*12 + id) or id;
+
+			button:SetAttribute("actionpage", actionpage or 0);
+			button:SetAttribute("action", slot);
+			button:CallMethod("UpdateAction");
+
 			-- Debugging the weird results
 			-- *only showing bar 1, button 1
 			if (self:GetID() == 1) and (id == 1) then
-				if driverResult then 
-					local page = tonumber(driverResult); 
-					if page then 
-						self:CallMethod("AddDebugMessage", "ActionButton driver attempted to change page to: " ..driverResult.. " - Page changed by environment to: " .. value); 
-					else 
-						self:CallMethod("AddDebugMessage", "ActionButton driver reported the state: " ..driverResult.. " - Page changed by environment to: " .. value); 
+				if driverResult then
+					local page = tonumber(driverResult);
+					if page then
+						self:CallMethod("AddDebugMessage", "ActionButton driver attempted to change page to: " ..driverResult.. " - Page changed by environment to: " .. value);
+					else
+						self:CallMethod("AddDebugMessage", "ActionButton driver reported the state: " ..driverResult.. " - Page changed by environment to: " .. value);
 					end
-				elseif value then 
-					self:CallMethod("AddDebugMessage", "ActionButton driver changed page to: " ..value); 
+				elseif value then
+					self:CallMethod("AddDebugMessage", "ActionButton driver changed page to: " ..value);
 				end
 			end
-		end 
+		end
 	]=]
 
 end
@@ -270,7 +323,7 @@ local ShortKey = {
 	["Shift"] = "S",
 	["Left Shift"] = "LS",
 	["Right Shift"] = "RS",
-	["NumPad"] = "N", 
+	["NumPad"] = "N",
 	["Backspace"] = "BS",
 	["Button1"] = "B1",
 	["Button2"] = "B2",
@@ -337,16 +390,16 @@ local AbbreviateBindText = function(self, key)
 		key = key:upper()
 
 		-- Let's try to hook into Blizzard's own abbreviation system.
-		-- Note that this is only temporary, we need to use icons, 
+		-- Note that this is only temporary, we need to use icons,
 		-- and provide a better replacement system.
 		if (key:find("PAD")) then
 			local main = key:match("%-?([%a%d]-)$")
 			if (main) then
-				
+
 				local full = _G["KEY_"..main]
 				local abbr = _G["KEY_ABBR_"..main]
-				local abbr_letter = _G["KEY_ABBR_"..main.."_LTR"] 
-				local abbr_shapes = _G["KEY_ABBR_"..main.."_SHP"] 
+				local abbr_letter = _G["KEY_ABBR_"..main.."_LTR"]
+				local abbr_shapes = _G["KEY_ABBR_"..main.."_SHP"]
 
 				if (full and (abbr_letter or abbr_shapes or abbr)) then
 					key = key:gsub(main, abbr_letter or abbr_shapes or abbr)
@@ -398,12 +451,12 @@ end
 
 -- Utility Functions
 ----------------------------------------------------
--- Syntax check 
+-- Syntax check
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -411,24 +464,24 @@ local check = function(value, num, ...)
 	error(string_format("Bad argument #%.0f to '%s': %s expected, got %s", num, name, types, type(value)), 3)
 end
 
--- Function to name buttons. 
+-- Function to name buttons.
 -- If no id is given, just the basename is returned.
 -- This is intended for other functions.
 local nameHelper = function(id, buttonType)
 	local name
 	if (id) then
-		if (buttonType == "pet") then 
+		if (buttonType == "pet") then
 			name = string_format(PETBUTTON_NAME_TEMPLATE_FULL, id)
-		else 
+		else
 			name = string_format(BUTTON_NAME_TEMPLATE_FULL, id)
 		end
-	else 
-		if (buttonType == "pet") then 
+	else
+		if (buttonType == "pet") then
 			name = string_format(PETBUTTON_NAME_TEMPLATE_SIMPLE)
 		else
 			name = string_format(BUTTON_NAME_TEMPLATE_SIMPLE)
 		end
-	end 
+	end
 	return name
 end
 
@@ -436,39 +489,39 @@ end
 -- The actual IDs handled by drivers does not matter.
 local sortByID = function(a,b)
 	-- Check if both buttons exist, which for some reason isn't always true.
-	if (a) and (b) then 
+	if (a) and (b) then
 		-- Check for pagers, as is the case with standard actionbuttons.
 		-- Also check for their page ids, as they might not both have it.
 		if (a._pager) and (a._pager.id) and (b._pager) and (b._pager.id) then
 			-- Check if they belong to the same page id
 			if (a._pager.id == b._pager.id) then
 				-- Check for button id
-				if (a.id) and (b.id) then 
+				if (a.id) and (b.id) then
 					-- Sort by button id
 					return (a.id < b.id)
 				else
 					-- Prioritize the one that has and id, if any.
-					return a.id and true or false 
-				end 
+					return a.id and true or false
+				end
 			else
 				-- Prioritize the lowest page id
 				return (a._pager.id < b._pager.id)
 			end
 		else
 			-- Check for button id
-			if (a.id) and (b.id) then 
+			if (a.id) and (b.id) then
 				-- Sort by button id
 				return (a.id < b.id)
 			else
 				-- Prioritize the one that has and id, if any.
-				return a.id and true or false 
-			end 
+				return a.id and true or false
+			end
 		end
-	else 
+	else
 		-- Prioritize the one that exists, if any.
 		return a and true or false
-	end 
-end 
+	end
+end
 
 -- Aimed to be compact and displayed on buttons
 local formatCooldownTime = function(time)
@@ -489,7 +542,7 @@ local formatCooldownTime = function(time)
 		return "|cffff0000%d|r", time*10 - time*10%1
 	else
 		return ""
-	end	
+	end
 end
 
 local IsAddOnEnabled = function(addon)
@@ -500,7 +553,7 @@ local IsAddOnEnabled = function(addon)
 			end
 		end
 	end
-end 
+end
 
 -- Updates
 ----------------------------------------------------
@@ -511,49 +564,49 @@ local OnUpdate = function(self, elapsed)
 	self.cooldownTimer = (self.cooldownTimer or 0) - elapsed
 
 	-- Cooldown count
-	if (self.cooldownTimer <= 0) then 
+	if (self.cooldownTimer <= 0) then
 
 		local CooldownCount = self.CooldownCount
 		if (CooldownCount) then
 			local Charge = self.ChargeCooldown
-			local Cooldown = self.Cooldown 
+			local Cooldown = self.Cooldown
 
 			if (Charge.active) then
 				if (Charge.chargeStart and Charge.chargeDuration) and ((Charge.chargeStart > 0) and (Charge.chargeDuration > 1.5)) then
 					CooldownCount:SetFormattedText(formatCooldownTime(Charge.chargeDuration - GetTime() + Charge.chargeStart))
-					if (not CooldownCount:IsShown()) then 
+					if (not CooldownCount:IsShown()) then
 						CooldownCount:Show()
 					end
-				else 
-					if (CooldownCount:IsShown()) then 
+				else
+					if (CooldownCount:IsShown()) then
 						CooldownCount:SetText("")
 						CooldownCount:Hide()
 					end
-				end  
+				end
 
-			elseif (Cooldown.active) then 
+			elseif (Cooldown.active) then
 				if (Cooldown.start and Cooldown.duration) and ((Cooldown.start > 0) and (Cooldown.duration > 1.5)) then
 					CooldownCount:SetFormattedText(formatCooldownTime(Cooldown.duration - GetTime() + Cooldown.start))
-					if (not CooldownCount:IsShown()) then 
+					if (not CooldownCount:IsShown()) then
 						CooldownCount:Show()
 					end
-				else 
-					if (CooldownCount:IsShown()) then 
+				else
+					if (CooldownCount:IsShown()) then
 						CooldownCount:SetText("")
 						CooldownCount:Hide()
 					end
-				end  
+				end
 
 			else
-				if (CooldownCount and CooldownCount:IsShown()) then 
+				if (CooldownCount and CooldownCount:IsShown()) then
 					CooldownCount:SetText("")
 					CooldownCount:Hide()
 				end
-			end 
+			end
 		end
 
 		self.cooldownTimer = .1
-	end 
+	end
 
 	-- Range
 	if (self.rangeTimer <= 0) then
@@ -564,7 +617,7 @@ local OnUpdate = function(self, elapsed)
 			self:UpdateUsable()
 		end
 		self.rangeTimer = TOOLTIP_UPDATE_TIME
-	end 
+	end
 
 	-- Flashing
 	if (self.flashTime <= 0) then
@@ -576,7 +629,7 @@ local OnUpdate = function(self, elapsed)
 			end
 		end
 		self.flashTime = self.flashTime + ATTACK_BUTTON_FLASH_TIME
-	end 
+	end
 
 	-- Ant Trails
 	self.antsTimer = (self.antsTimer or 0) + elapsed
@@ -597,7 +650,7 @@ local OnUpdate = function(self, elapsed)
 		self.antsTimer = 0
 	end
 
-end 
+end
 
 local OnUpdatePet = function(self, elapsed)
 	-- Ant Trails
@@ -624,16 +677,16 @@ end
 local UpdateActionButton = function(self, event, ...)
 	local arg1, arg2 = ...
 
-	if (event == "PLAYER_ENTERING_WORLD") then 
+	if (event == "PLAYER_ENTERING_WORLD") then
 		self:Update()
 		self:UpdateAutoCastMacro()
 
-	elseif (event == "PLAYER_REGEN_ENABLED") then 
-		if self.queuedForMacroUpdate then 
+	elseif (event == "PLAYER_REGEN_ENABLED") then
+		if self.queuedForMacroUpdate then
 			self:UpdateAutoCastMacro()
 			self:UnregisterEvent("PLAYER_REGEN_ENABLED", UpdateActionButton)
 			self.queuedForMacroUpdate = nil
-		end 
+		end
 
 	elseif (event == "UPDATE_SHAPESHIFT_FORM") or (event == "UPDATE_VEHICLE_ACTIONBAR") then
 		self:Update()
@@ -650,7 +703,7 @@ local UpdateActionButton = function(self, event, ...)
 
 	elseif (event == "ACTIONBAR_UPDATE_COOLDOWN") then
 		self:UpdateCooldown()
-	
+
 	elseif (event == "ACTIONBAR_UPDATE_USABLE") then
 		self:UpdateUsable()
 
@@ -665,9 +718,9 @@ local UpdateActionButton = function(self, event, ...)
 		-- Just guessing at events right now, but will test at appropriate quests later.
 		self:UpdateCooldown()
 
-	elseif (event == "CURSOR_UPDATE") 
-		or (event == "ACTIONBAR_SHOWGRID") or (event == "ACTIONBAR_HIDEGRID") 
-		or (IsRetail and (event == "PET_BAR_SHOWGRID") or (event == "PET_BAR_HIDEGRID")) then 
+	elseif (event == "CURSOR_UPDATE")
+		or (event == "ACTIONBAR_SHOWGRID") or (event == "ACTIONBAR_HIDEGRID")
+		or (IsRetail and (event == "PET_BAR_SHOWGRID") or (event == "PET_BAR_HIDEGRID")) then
 			self:UpdateGrid()
 
 	elseif (event == "LOSS_OF_CONTROL_ADDED") then
@@ -676,7 +729,7 @@ local UpdateActionButton = function(self, event, ...)
 	elseif (event == "LOSS_OF_CONTROL_UPDATE") then
 		self:UpdateCooldown()
 
-	elseif (event == "PLAYER_MOUNT_DISPLAY_CHANGED") then 
+	elseif (event == "PLAYER_MOUNT_DISPLAY_CHANGED") then
 		self:UpdateUsable()
 
 	elseif (event == "GP_SPELL_ACTIVATION_OVERLAY_GLOW_SHOW") then
@@ -732,9 +785,9 @@ local UpdateActionButton = function(self, event, ...)
 	elseif (event == "SPELL_UPDATE_CHARGES") then
 		self:UpdateCount()
 
-	elseif (event == "SPELLS_CHANGED") or (event == "UPDATE_MACROS") then 
-		-- Needed for macros. 
-		self:Update() 
+	elseif (event == "SPELLS_CHANGED") or (event == "UPDATE_MACROS") then
+		-- Needed for macros.
+		self:Update()
 	elseif (event == "SPELL_UPDATE_ICON") then
 		self:Update() -- really? how often is this called?
 
@@ -745,7 +798,7 @@ local UpdateActionButton = function(self, event, ...)
 	elseif (event == "UPDATE_BINDINGS") then
 		self:UpdateBinding()
 
-	elseif (event == "UPDATE_SUMMONPETS_ACTION") then 
+	elseif (event == "UPDATE_SUMMONPETS_ACTION") then
 		local actionType, id = GetActionInfo(self.buttonAction)
 		if (actionType == "summonpet") then
 			local texture = GetActionTexture(self.buttonAction)
@@ -767,7 +820,7 @@ end
 
 local UpdatePetButton = function(self, event, ...)
 	local arg1 = ...
-	
+
 	if (event == "PLAYER_ENTERING_WORLD") then
 		self:Update()
 	elseif (event == "PET_BAR_UPDATE") then
@@ -800,7 +853,7 @@ local UpdateStanceButton = function(self, event, ...)
 		self:UpdateMaxButtons()
 
 	elseif (event == "UPDATE_SHAPESHIFT_FORMS") then
-		if (InCombatLockdown()) then 
+		if (InCombatLockdown()) then
 			self:RegisterEvent("PLAYER_REGEN_ENABLED", UpdateStanceButton)
 		else
 			self:UpdateMaxButtons()
@@ -823,7 +876,7 @@ local UpdateTooltip = function(self)
 	tooltip:SetDefaultAnchor(self)
 	tooltip:SetMinimumWidth(280)
 	tooltip:SetAction(self.buttonAction)
-end 
+end
 
 local UpdatePetTooltip = function(self)
 	local tooltip = self:GetTooltip()
@@ -831,7 +884,7 @@ local UpdatePetTooltip = function(self)
 	tooltip:SetDefaultAnchor(self)
 	tooltip:SetMinimumWidth(20)
 	tooltip:SetPetAction(self.id)
-end 
+end
 
 local OnCooldownDone = function(cooldown)
 	cooldown.active = nil
@@ -976,7 +1029,7 @@ ActionButton.UnregisterEvent = function(self, event, func)
 			if events[i] == func then
 				table_remove(events, i)
 				if #events == 0 then
-					UnregisterEvent(self, event) 
+					UnregisterEvent(self, event)
 				end
 			end
 		end
@@ -984,7 +1037,7 @@ ActionButton.UnregisterEvent = function(self, event, func)
 end
 
 ActionButton.UnregisterAllEvents = function(self)
-	if not Callbacks[self] then 
+	if not Callbacks[self] then
 		return
 	end
 	for event, funcs in pairs(Callbacks[self]) do
@@ -1022,14 +1075,14 @@ end
 -- ActionButton Updates
 ----------------------------------------------------
 ActionButton.Update = function(self)
-	if HasAction(self.buttonAction) then 
+	if HasAction(self.buttonAction) then
 		self.hasAction = true
 		self.Icon:SetTexture(GetActionTexture(self.buttonAction))
 		self:SetAlpha(1)
 	else
 		self.hasAction = false
-		self.Icon:SetTexture(nil) 
-	end 
+		self.Icon:SetTexture(nil)
+	end
 
 	self:UpdateBinding()
 	self:UpdateCount()
@@ -1045,82 +1098,82 @@ ActionButton.Update = function(self)
 		self:UpdateRank()
 	end
 
-	if (self.PostUpdate) then 
+	if (self.PostUpdate) then
 		self:PostUpdate()
-	end 
+	end
 end
 
 -- Called when the button action (and thus the texture) has changed
 ActionButton.UpdateAction = function(self)
 	self.buttonAction = self:GetAction()
 	local texture = GetActionTexture(self.buttonAction)
-	if texture then 
+	if texture then
 		self.Icon:SetTexture(texture)
 	else
-		self.Icon:SetTexture(nil) 
-	end 
+		self.Icon:SetTexture(nil)
+	end
 	self:Update()
-end 
+end
 
 ActionButton.UpdateAutoCast = function(self)
-	if (HasAction(self.buttonAction) and IsAutoCastPetAction(self.buttonAction)) then 
-		if IsEnabledAutoCastPetAction(self.buttonAction) then 
+	if (HasAction(self.buttonAction) and IsAutoCastPetAction(self.buttonAction)) then
+		if IsEnabledAutoCastPetAction(self.buttonAction) then
 			if (not self.SpellAutoCast.Ants.Anim:IsPlaying()) then
 				self.SpellAutoCast.Ants.Anim:Play()
 				self.SpellAutoCast.Glow.Anim:Play()
 			end
 			self.SpellAutoCast:SetAlpha(1)
-		else 
+		else
 			if (self.SpellAutoCast.Ants.Anim:IsPlaying()) then
 				self.SpellAutoCast.Ants.Anim:Pause()
 				self.SpellAutoCast.Glow.Anim:Pause()
 			end
 			self.SpellAutoCast:SetAlpha(.5)
-		end 
+		end
 		self.SpellAutoCast:Show()
-	else 
+	else
 		self.SpellAutoCast:Hide()
-	end 
+	end
 end
 
 ActionButton.UpdateAutoCastMacro = function(self)
-	if InCombatLockdown() then 
+	if InCombatLockdown() then
 		self.queuedForMacroUpdate = true
 		self:RegisterEvent("PLAYER_REGEN_ENABLED", UpdateActionButton)
-		return 
+		return
 	end
 	local name = IsAutoCastPetAction(self.buttonAction) and GetSpellInfo(self:GetSpellID())
-	if name then 
+	if name then
 		self:SetAttribute("macrotext", "/petautocasttoggle "..name)
-	else 
+	else
 		self:SetAttribute("macrotext", nil)
-	end 
+	end
 end
 
 -- Called when the keybinds are loaded or changed
-ActionButton.UpdateBinding = function(self) 
+ActionButton.UpdateBinding = function(self)
 	local Keybind = self.Keybind
-	if Keybind then 
+	if Keybind then
 		Keybind:SetText(self.showFullBindText and self:GetBindingText() or self:GetBindingTextAbbreviated())
-	end 
-end 
+	end
+end
 
 ActionButton.UpdateCheckedState = function(self)
 	-- Suppress the checked state if the button is currently flashing
 	local action = self.buttonAction
-	if self.Flash then 
+	if self.Flash then
 		if IsCurrentAction(action) and not((IsAttackAction(action) and IsCurrentAction(action)) or IsAutoRepeatAction(action)) then
 			self:SetChecked(true)
 		else
 			self:SetChecked(false)
 		end
-	else 
+	else
 		if (IsCurrentAction(action) or IsAutoRepeatAction(action)) then
 			self:SetChecked(true)
 		else
 			self:SetChecked(false)
 		end
-	end 
+	end
 end
 
 ActionButton.UpdateCooldown = function(self)
@@ -1158,7 +1211,7 @@ ActionButton.UpdateCooldown = function(self)
 			end
 
 			local ChargeCooldown = self.ChargeCooldown
-			if (ChargeCooldown) then 
+			if (ChargeCooldown) then
 				if (charges and maxCharges and (charges > 0) and (charges < maxCharges)) and not((not chargeStart) or (chargeStart == 0)) then
 					-- Set the spellcharge cooldown
 					--cooldown:SetDrawBling(cooldown:GetEffectiveAlpha() > 0.5)
@@ -1168,23 +1221,23 @@ ActionButton.UpdateCooldown = function(self)
 					ChargeCooldown.chargeStart = chargeStart
 					ChargeCooldown.chargeDuration = chargeDuration
 					ChargeCooldown.chargeModRate = chargeModRate
-					hasChargeCooldown = true 
+					hasChargeCooldown = true
 				else
 					ChargeCooldown:Hide()
 				end
-			end 
+			end
 
-			if (hasChargeCooldown) then 
+			if (hasChargeCooldown) then
 				Cooldown.start = nil
 				Cooldown.duration = nil
 				Cooldown.modRate = nil
 				SetCooldown(Cooldown, 0, 0, false)
 				local CooldownCount = self.CooldownCount
-				if (CooldownCount and CooldownCount:IsShown()) then 
+				if (CooldownCount and CooldownCount:IsShown()) then
 					CooldownCount:SetText("")
 					CooldownCount:Hide()
 				end
-			else 
+			else
 				if (duration > 0) then
 					Cooldown.start = start
 					Cooldown.duration = duration
@@ -1196,29 +1249,29 @@ ActionButton.UpdateCooldown = function(self)
 					Cooldown.modRate = nil
 					SetCooldown(Cooldown, 0, 0, false)
 					local CooldownCount = self.CooldownCount
-					if (CooldownCount and CooldownCount:IsShown()) then 
+					if (CooldownCount and CooldownCount:IsShown()) then
 						CooldownCount:SetText("")
 						CooldownCount:Hide()
 					end
 				end
-			end 
+			end
 		end
 
-		if (hasChargeCooldown) then 
-			if (self.PostUpdateChargeCooldown) then 
+		if (hasChargeCooldown) then
+			if (self.PostUpdateChargeCooldown) then
 				return self:PostUpdateChargeCooldown(self.ChargeCooldown)
-			end 
-		else 
-			if (self.PostUpdateCooldown) then 
+			end
+		else
+			if (self.PostUpdateCooldown) then
 				return self:PostUpdateCooldown(self.Cooldown)
-			end 
-		end 
-	end 
+			end
+		end
+	end
 end
 
-ActionButton.UpdateCount = function(self) 
+ActionButton.UpdateCount = function(self)
 	local Count = self.Count
-	if Count then 
+	if Count then
 		local count
 		local action = self.buttonAction
 		local actionType, actionID = GetActionInfo(action)
@@ -1254,7 +1307,7 @@ ActionButton.UpdateCount = function(self)
 				end
 			end
 		else
-			if (HasAction(action)) then 
+			if (HasAction(action)) then
 				if (IsConsumableAction(action) or IsStackableAction(action) or (not IsItemAction(action) and GetActionCount(action) > 0)) then
 					count = GetActionCount(action)
 				else
@@ -1263,25 +1316,25 @@ ActionButton.UpdateCount = function(self)
 						count = charges
 					end
 				end
-		
-			end 
+
+			end
 		end
 		if (count) and (count > (self.maxDisplayCount or 9999)) then
 			count = "*"
 		end
 		Count:SetText(count or "")
-		if (self.PostUpdateCount) then 
+		if (self.PostUpdateCount) then
 			return self:PostUpdateCount(count)
-		end 
-	end 
-end 
+		end
+	end
+end
 
--- Updates the red flashing on attack skills 
+-- Updates the red flashing on attack skills
 ActionButton.UpdateFlash = function(self)
 	local Flash = self.Flash
-	if Flash then 
+	if Flash then
 		local action = self.buttonAction
-		if HasAction(action) then 
+		if HasAction(action) then
 			if (IsAttackAction(action) and IsCurrentAction(action)) or IsAutoRepeatAction(action) then
 				self.flashing = 1
 				self.flashTime = 0
@@ -1289,22 +1342,22 @@ ActionButton.UpdateFlash = function(self)
 				self.flashing = 0
 				self.Flash:Hide()
 			end
-		end 
-	end 
+		end
+	end
 	self:UpdateCheckedState()
-end 
+end
 
 ActionButton.UpdateFlyout = function(self)
 
-	if self.FlyoutBorder then 
+	if self.FlyoutBorder then
 		self.FlyoutBorder:Hide()
-	end 
+	end
 
-	if self.FlyoutBorderShadow then 
+	if self.FlyoutBorderShadow then
 		self.FlyoutBorderShadow:Hide()
-	end 
+	end
 
-	if self.FlyoutArrow then 
+	if self.FlyoutArrow then
 
 		local buttonAction = self:GetAction()
 		if HasAction(buttonAction) then
@@ -1336,31 +1389,31 @@ ActionButton.UpdateFlyout = function(self)
 				return
 			end
 		end
-		self.FlyoutArrow:Hide()	
-	end 
+		self.FlyoutArrow:Hide()
+	end
 end
 
 ActionButton.UpdateGrid = function(self)
 	local alpha = 0
-	if (self:IsShown()) then 
+	if (self:IsShown()) then
 		if (self:HasContent()) then
 			alpha = 1
 		elseif (CursorHasSpell() or CursorHasItem() or CursorHasMacro()) then
 			alpha = 1
-		else 
+		else
 			local cursor = GetCursorInfo()
-			if (cursor == "spell") 
-			or (cursor == "macro") 
-			or (cursor == "mount") 
-			or (cursor == "item") 
-			or (cursor == "battlepet") 
-			or (IsRetail and cursor == "petaction") then 
+			if (cursor == "spell")
+			or (cursor == "macro")
+			or (cursor == "mount")
+			or (cursor == "item")
+			or (cursor == "battlepet")
+			or (IsRetail and cursor == "petaction") then
 				alpha = 1
 			else
-				--if (self.showGrid) then 
+				--if (self.showGrid) then
 				alpha = self.overrideAlphaWhenEmpty or 0
-				--end 
-			end 
+				--end
+			end
 		end
 		self:SetAlpha(alpha)
 	end
@@ -1370,20 +1423,20 @@ end
 ActionButton.HasContent = function(self)
 	if (HasAction(self.buttonAction) and (self:GetSpellID() ~= 0)) then
 		return true
-	else 
+	else
 		return false
 	end
 end
 
 -- Called when the usable state of the button changes
-ActionButton.UpdateUsable = function(self) 
-	if (UnitIsDeadOrGhost("player")) then 
+ActionButton.UpdateUsable = function(self)
+	if (UnitIsDeadOrGhost("player")) then
 		self.Icon:SetDesaturated(true)
 		self.Icon:SetVertexColor(.3, .3, .3)
 		if (self.PostUpdateUsable) then
 			self:PostUpdateUsable(true)
 		end
-	
+
 	elseif (self.outOfRange) then
 		self.Icon:SetDesaturated(true)
 		self.Icon:SetVertexColor(1, .15, .15)
@@ -1406,7 +1459,7 @@ ActionButton.UpdateUsable = function(self)
 			if (self.PostUpdateUsable) then
 				self:PostUpdateUsable(true)
 			end
-	
+
 		else
 			self.Icon:SetDesaturated(true)
 			self.Icon:SetVertexColor(.3, .3, .3)
@@ -1420,7 +1473,7 @@ end
 ActionButton.UpdateRank = function(self)
 	if (self.Rank) then
 		local cache = RankCache[self]
-		if (not cache) then 
+		if (not cache) then
 			RankCache[self] = {}
 			cache = RankCache[self]
 		end
@@ -1430,52 +1483,52 @@ ActionButton.UpdateRank = function(self)
 		local oldName = cache.spellName -- used as identifier for multiples
 		local oldRank = cache.spellRank -- rank of this instance of the multiple
 
-		-- Update cached info 
+		-- Update cached info
 		cache.spellRank = self:GetSpellRank()
 		cache.spellName = GetSpellInfo(self:GetSpellID())
 
 		-- Button spell changed?
-		if (cache.spellName ~= oldName) then 
+		if (cache.spellName ~= oldName) then
 
 			-- We had a spell before, and there were more of it.
 			-- We need to find the old ones, update their counts,
-			-- and hide them if there's only a single one left. 
-			if (oldRank and (oldCount > 1)) then 
+			-- and hide them if there's only a single one left.
+			if (oldRank and (oldCount > 1)) then
 				local newCount = oldCount - 1
-				for button,otherCache in pairs(RankCache) do 
-					-- Ignore self, as we no longer have the same counter. 
-					if (button ~= self) and (otherCache.spellName == oldName) then 
+				for button,otherCache in pairs(RankCache) do
+					-- Ignore self, as we no longer have the same counter.
+					if (button ~= self) and (otherCache.spellName == oldName) then
 						otherCache.spellCount = newCount
 						button.Rank:SetText((newCount > 1) and otherCache.spellRank or "")
 					end
 				end
-			end 
-		end 
+			end
+		end
 
 		-- Counter for number of duplicates of the current spell
 		local howMany = 0
-		if (cache.spellRank) then 
-			for button,otherCache in pairs(RankCache) do 
-				if (otherCache.spellName == cache.spellName) then 
+		if (cache.spellRank) then
+			for button,otherCache in pairs(RankCache) do
+				if (otherCache.spellName == cache.spellName) then
 					howMany = howMany + 1
-				end 
+				end
 			end
-		end 
+		end
 
 		-- Update stored counter
 		cache.spellCount = howMany
 
 		-- Update all rank texts and counters
-		for button,otherCache in pairs(RankCache) do 
-			if (otherCache.spellName == cache.spellName) then 
+		for button,otherCache in pairs(RankCache) do
+			if (otherCache.spellName == cache.spellName) then
 				otherCache.spellCount = howMany
 				button.Rank:SetText((howMany > 1) and otherCache.spellRank or "")
-			end 
+			end
 		end
 	end
 end
 
-if (IsClassic or IsTBC) then
+if (IsClassic or IsTBC or IsWrath) then
 	ActionButton.ShowOverlayGlow = function(self, overlayType)
 		if (not self.SpellHighlight) then
 			return
@@ -1525,12 +1578,12 @@ if (IsRetail) then
 		end
 		local model = self.SpellHighlight.Model
 		local w,h = self:GetSize()
-		if (w and h) then 
+		if (w and h) then
 			model:SetSize(w*2,h*2)
 			model:Show()
-		else 
+		else
 			model:Hide()
-		end 
+		end
 		if (self.maxDpsGlowColor) then
 			local r, g, b, a = unpack(self.maxDpsGlowColor)
 			self.SpellHighlight.Texture:SetVertexColor(r, g, b, a or .75)
@@ -1574,16 +1627,16 @@ end
 ----------------------------------------------------
 ActionButton.GetSpellRank = function(self)
 	local spellID = self:GetSpellID()
-	if (spellID) then 
+	if (spellID) then
 		local name, _, icon, castTime, minRange, maxRange, spellId = GetSpellInfo(spellID)
 		local rankMsg = GetSpellSubtext(spellID)
-		if rankMsg then 
+		if rankMsg then
 			local rank = string_match(rankMsg, "(%d+)")
-			if rank then 
+			if rank then
 				return tonumber(rank)
-			end 
-		end 
-	end 
+			end
+		end
+	end
 end
 
 ActionButton.GetAction = function(self)
@@ -1592,7 +1645,7 @@ ActionButton.GetAction = function(self)
 	return actionpage and (actionpage > 1) and ((actionpage - 1) * NUM_ACTIONBAR_BUTTONS + id) or id
 end
 
-ActionButton.GetActionTexture = function(self) 
+ActionButton.GetActionTexture = function(self)
 	return GetActionTexture(self.buttonAction)
 end
 
@@ -1601,7 +1654,7 @@ ActionButton.GetBindingText = function(self, bindingType)
 		if (IsRetail) then
 			if (self.prioritizeGamePadBinds) or (bindingType == "pad") then
 				local bindingAction
-				for keyNumber = 1, select("#", GetBindingKey(self.bindingAction)) do 
+				for keyNumber = 1, select("#", GetBindingKey(self.bindingAction)) do
 					local key = select(keyNumber, GetBindingKey(self.bindingAction))
 					if (IsBindingForGamePad(key)) then
 						return key
@@ -1609,7 +1662,7 @@ ActionButton.GetBindingText = function(self, bindingType)
 				end
 			elseif (self.prioritzeKeyboardBinds) or (bindingType == "key") then
 				local bindingAction
-				for keyNumber = 1, select("#", GetBindingKey(self.bindingAction)) do 
+				for keyNumber = 1, select("#", GetBindingKey(self.bindingAction)) do
 					local key = select(keyNumber, GetBindingKey(self.bindingAction))
 					if (not IsBindingForGamePad(key)) then
 						return key
@@ -1620,32 +1673,32 @@ ActionButton.GetBindingText = function(self, bindingType)
 		return GetBindingKey(self.bindingAction) or GetBindingKey("CLICK "..self:GetName()..":LeftButton")
 	end
 
-end 
+end
 
 ActionButton.AbbreviateBindText = AbbreviateBindText
 ActionButton.GetBindingTextAbbreviated = function(self)
 	return self:AbbreviateBindText(self:GetBindingText())
 end
 
-ActionButton.GetCooldown = function(self) 
-	return GetActionCooldown(self.buttonAction) 
+ActionButton.GetCooldown = function(self)
+	return GetActionCooldown(self.buttonAction)
 end
 
-ActionButton.GetLossOfControlCooldown = function(self) 
-	return GetActionLossOfControlCooldown(self.buttonAction) 
+ActionButton.GetLossOfControlCooldown = function(self)
+	return GetActionLossOfControlCooldown(self.buttonAction)
 end
 
 ActionButton.GetPageID = function(self)
 	return self._pager:GetID()
-end 
+end
 
 ActionButton.GetPager = function(self)
 	return self._pager
-end 
+end
 
 ActionButton.GetVisibilityDriverFrame = function(self)
 	return self._owner
-end 
+end
 
 ActionButton.GetSpellID = function(self)
 	local actionType, id, subType = GetActionInfo(self.buttonAction)
@@ -1666,7 +1719,7 @@ ActionButton.IsFlyoutShown = function(self)
 	local buttonAction = self:GetAction()
 	if HasAction(buttonAction) then
 		return (GetActionInfo(buttonAction) == "flyout") and (SpellFlyout and SpellFlyout:IsShown() and SpellFlyout:GetParent() == self)
-	end 
+	end
 end
 
 ActionButton.IsInRange = function(self)
@@ -1676,10 +1729,10 @@ ActionButton.IsInRange = function(self)
 	end
 
 	local val = IsActionInRange(self.buttonAction, unit)
-	if (val == 1) then 
-		val = true 
-	elseif (val == 0) then 
-		val = false 
+	if (val == 1) then
+		val = true
+	elseif (val == 0) then
+		val = false
 	end
 
 	return val
@@ -1694,7 +1747,6 @@ ActionButton.OnEnable = function(self)
 	self:RegisterEvent("ACTIONBAR_UPDATE_USABLE", UpdateActionButton)
 	self:RegisterEvent("ACTIONBAR_HIDEGRID", UpdateActionButton)
 	self:RegisterEvent("ACTIONBAR_SHOWGRID", UpdateActionButton)
-	self:RegisterEvent("CURSOR_UPDATE", UpdateActionButton)
 	self:RegisterEvent("LOSS_OF_CONTROL_ADDED", UpdateActionButton)
 	self:RegisterEvent("LOSS_OF_CONTROL_UPDATE", UpdateActionButton)
 	self:RegisterEvent("PLAYER_ENTER_COMBAT", UpdateActionButton)
@@ -1715,7 +1767,11 @@ ActionButton.OnEnable = function(self)
 		self:RegisterMessage("GP_SPELL_ACTIVATION_OVERLAY_GLOW_SHOW", UpdateActionButton)
 		self:RegisterMessage("GP_SPELL_ACTIVATION_OVERLAY_GLOW_HIDE", UpdateActionButton)
 	end
-	
+
+	if (IsClassic or IsTBC or IsRetailShadowlands) then
+		self:RegisterEvent("CURSOR_UPDATE", UpdateActionButton)
+	end
+
 	if (IsRetail) then
 		self:RegisterEvent("ARCHAEOLOGY_CLOSED", UpdateActionButton)
 		self:RegisterEvent("COMPANION_UPDATE", UpdateActionButton)
@@ -1738,14 +1794,8 @@ ActionButton.OnDisable = function(self)
 	self:UnregisterEvent("ACTIONBAR_UPDATE_USABLE", UpdateActionButton)
 	self:UnregisterEvent("ACTIONBAR_HIDEGRID", UpdateActionButton)
 	self:UnregisterEvent("ACTIONBAR_SHOWGRID", UpdateActionButton)
-	self:UnregisterEvent("CURSOR_UPDATE", UpdateActionButton)
 	self:UnregisterEvent("LOSS_OF_CONTROL_ADDED", UpdateActionButton)
 	self:UnregisterEvent("LOSS_OF_CONTROL_UPDATE", UpdateActionButton)
-	if (IsRetail) then
-		self:UnregisterEvent("PET_BAR_HIDEGRID", UpdateActionButton)
-		self:UnregisterEvent("PET_BAR_SHOWGRID", UpdateActionButton)
-		self:UnregisterEvent("PET_BAR_UPDATE", UpdateActionButton)
-	end
 	self:UnregisterEvent("PLAYER_ENTER_COMBAT", UpdateActionButton)
 	self:UnregisterEvent("PLAYER_ENTERING_WORLD", UpdateActionButton)
 	self:UnregisterEvent("PLAYER_LEAVE_COMBAT", UpdateActionButton)
@@ -1753,56 +1803,80 @@ ActionButton.OnDisable = function(self)
 	self:UnregisterEvent("PLAYER_TARGET_CHANGED", UpdateActionButton)
 	self:UnregisterEvent("SPELL_UPDATE_CHARGES", UpdateActionButton)
 	self:UnregisterEvent("SPELL_UPDATE_ICON", UpdateActionButton)
+	self:UnregisterEvent("SPELLS_CHANGED", UpdateActionButton)
 	self:UnregisterEvent("TRADE_SKILL_CLOSE", UpdateActionButton)
 	self:UnregisterEvent("TRADE_SKILL_SHOW", UpdateActionButton)
 	self:UnregisterEvent("UPDATE_BINDINGS", UpdateActionButton)
 	self:UnregisterEvent("UPDATE_MACROS", UpdateActionButton)
 	self:UnregisterEvent("UPDATE_SHAPESHIFT_FORM", UpdateActionButton)
+
+	if (IsClassic or IsTBC) then
+		self:UnregisterMessage("GP_SPELL_ACTIVATION_OVERLAY_GLOW_SHOW", UpdateActionButton)
+		self:UnregisterMessage("GP_SPELL_ACTIVATION_OVERLAY_GLOW_HIDE", UpdateActionButton)
+	end
+
+	if (IsClassic or IsTBC or IsRetailShadowlands) then
+		self:UnregisterEvent("CURSOR_UPDATE", UpdateActionButton)
+	end
+
+	if (IsRetail) then
+		self:UnregisterEvent("ARCHAEOLOGY_CLOSED", UpdateActionButton)
+		self:UnregisterEvent("COMPANION_UPDATE", UpdateActionButton)
+		self:UnregisterEvent("PET_BAR_HIDEGRID", UpdateActionButton)
+		self:UnregisterEvent("PET_BAR_SHOWGRID", UpdateActionButton)
+		self:UnregisterEvent("PET_BAR_UPDATE", UpdateActionButton)
+		self:UnregisterEvent("SPELL_ACTIVATION_OVERLAY_GLOW_HIDE", UpdateActionButton)
+		self:UnregisterEvent("SPELL_ACTIVATION_OVERLAY_GLOW_SHOW", UpdateActionButton)
+		self:UnregisterEvent("UNIT_ENTERED_VEHICLE", UpdateActionButton)
+		self:UnregisterEvent("UNIT_EXITED_VEHICLE", UpdateActionButton)
+		self:UnregisterEvent("UPDATE_SUMMONPETS_ACTION", UpdateActionButton)
+		self:UnregisterEvent("UPDATE_VEHICLE_ACTIONBAR", UpdateActionButton)
+	end
 end
 
 ActionButton.OnEvent = function(self, event, ...)
-	if (self:IsVisible() and Callbacks[self] and Callbacks[self][event]) then 
+	if (self:IsVisible() and Callbacks[self] and Callbacks[self][event]) then
 		local events = Callbacks[self][event]
 		for i = 1, #events do
 			events[i](self, event, ...)
 		end
-	end 
+	end
 end
 
-ActionButton.OnEnter = function(self) 
+ActionButton.OnEnter = function(self)
 	self.isMouseOver = true
 
 	-- Don't fire off tooltip updates if the button has no content
-	if (not HasAction(self.buttonAction)) or (self:GetSpellID() == 0) then 
+	if (not HasAction(self.buttonAction)) or (self:GetSpellID() == 0) then
 		self.UpdateTooltip = nil
 		self:GetTooltip():Hide()
 	else
 		self.UpdateTooltip = UpdateTooltip
 		self:UpdateTooltip()
-	end 
+	end
 
-	if self.PostEnter then 
+	if self.PostEnter then
 		self:PostEnter()
-	end 
+	end
 end
 
-ActionButton.OnLeave = function(self) 
+ActionButton.OnLeave = function(self)
 	self.isMouseOver = nil
 	self.UpdateTooltip = nil
 
 	local tooltip = self:GetTooltip()
 	tooltip:Hide()
 
-	if self.PostLeave then 
+	if self.PostLeave then
 		self:PostLeave()
-	end 
+	end
 end
 
-ActionButton.PreClick = function(self) 
+ActionButton.PreClick = function(self)
 	self:SetChecked(false)
 end
 
-ActionButton.PostClick = function(self) 
+ActionButton.PostClick = function(self)
 end
 
 -- PetButton Template
@@ -1824,14 +1898,14 @@ PetButton.RegisterMessage = ActionButton.RegisterMessage
 PetButton.Update = function(self)
 	local name, texture, isToken, isActive, autoCastAllowed, autoCastEnabled, spellID = GetPetActionInfo(self.id)
 
-	if (name) then 
+	if (name) then
 		self.hasAction = true
 		self.Icon:SetTexture((not isToken) and texture or _G[texture])
 		self:SetAlpha(1)
 	else
 		self.hasAction = false
-		self.Icon:SetTexture(nil) 
-	end 
+		self.Icon:SetTexture(nil)
+	end
 	if isActive then
 		self:SetChecked(true)
 
@@ -1854,33 +1928,33 @@ PetButton.Update = function(self)
 	--self:UpdateGrid()
 	self:UpdateAutoCast()
 
-	if (self.PostUpdate) then 
+	if (self.PostUpdate) then
 		self:PostUpdate()
-	end 
+	end
 
 end
 
 PetButton.UpdateAutoCast = function(self)
 	local name, texture, isToken, isActive, autoCastAllowed, autoCastEnabled, spellID = GetPetActionInfo(self.id)
 
-	if (name and autoCastAllowed) then 
-		if (autoCastEnabled) then 
+	if (name and autoCastAllowed) then
+		if (autoCastEnabled) then
 			if (not self.SpellAutoCast.Ants.Anim:IsPlaying()) then
 				self.SpellAutoCast.Ants.Anim:Play()
 				self.SpellAutoCast.Glow.Anim:Play()
 			end
 			self.SpellAutoCast:SetAlpha(1)
-		else 
+		else
 			if (self.SpellAutoCast.Ants.Anim:IsPlaying()) then
 				self.SpellAutoCast.Ants.Anim:Pause()
 				self.SpellAutoCast.Glow.Anim:Pause()
 			end
 			self.SpellAutoCast:SetAlpha(.5)
-		end 
+		end
 		self.SpellAutoCast:Show()
-	else 
+	else
 		self.SpellAutoCast:Hide()
-	end 
+	end
 end
 
 PetButton.UpdateCooldown = function(self)
@@ -1889,9 +1963,9 @@ PetButton.UpdateCooldown = function(self)
 		local start, duration, enable = GetPetActionCooldown(self.id)
 		SetCooldown(Cooldown, start, duration, enable, false, 1)
 
-		if (self.PostUpdateCooldown) then 
+		if (self.PostUpdateCooldown) then
 			return self:PostUpdateCooldown(self.Cooldown)
-		end 
+		end
 	end
 end
 
@@ -1899,7 +1973,7 @@ end
 PetButton.HasContent = function(self)
 	if (self.hasAction) then
 		return true
-	else 
+	else
 		return false
 	end
 end
@@ -1958,33 +2032,33 @@ PetButton.OnDisable = function(self)
 	self:UnregisterEvent("UPDATE_BINDINGS", UpdatePetButton)
 end
 
-PetButton.OnEnter = function(self) 
+PetButton.OnEnter = function(self)
 	self.isMouseOver = true
 
 	-- Don't fire off tooltip updates if the button has no content
-	if (not GetPetActionInfo(self.id)) then 
+	if (not GetPetActionInfo(self.id)) then
 		self.UpdateTooltip = nil
 		self:GetTooltip():Hide()
 	else
 		self.UpdateTooltip = UpdatePetTooltip
 		self:UpdateTooltip()
-	end 
+	end
 
-	if self.PostEnter then 
+	if self.PostEnter then
 		self:PostEnter()
-	end 
+	end
 end
 
-PetButton.OnLeave = function(self) 
+PetButton.OnLeave = function(self)
 	self.isMouseOver = nil
 	self.UpdateTooltip = nil
 
 	local tooltip = self:GetTooltip()
 	tooltip:Hide()
 
-	if self.PostLeave then 
+	if self.PostLeave then
 		self:PostLeave()
-	end 
+	end
 end
 
 PetButton.OnDragStart = function(self)
@@ -1995,7 +2069,7 @@ PetButton.OnReceiveDrag = function(self)
 	self:SetChecked(false)
 end
 
-PetButton.PreClick = function(self) 
+PetButton.PreClick = function(self)
 	self:SetChecked(false)
 end
 
@@ -2053,33 +2127,33 @@ end
 local ExitButton = LibSecureButton:CreateFrame("CheckButton")
 local ExitButton_MT = { __index = ExitButton }
 
-ExitButton.OnEnter = function(self) 
+ExitButton.OnEnter = function(self)
 	self.isMouseOver = true
 
-	if (self.PostEnter) then 
+	if (self.PostEnter) then
 		self:PostEnter()
-	end 
+	end
 end
 
-ExitButton.OnLeave = function(self) 
+ExitButton.OnLeave = function(self)
 	self.isMouseOver = nil
 	self.UpdateTooltip = nil
 
 	local tooltip = self:GetTooltip()
 	tooltip:Hide()
 
-	if (self.PostLeave) then 
+	if (self.PostLeave) then
 		self:PostLeave()
-	end 
+	end
 end
 
 ExitButton.PreClick = function(self) end
-ExitButton.PostClick = function(self, button) 
+ExitButton.PostClick = function(self, button)
 	if (UnitOnTaxi("player") and (not InCombatLockdown())) then
 		TaxiRequestEarlyLanding()
 
-	-- No possess bar in classic. Don't check for it!
-	elseif (IsRetail) and (IsPossessBarVisible() and PetCanBeDismissed()) then
+	-- No possess bar in vanilla or TBC.
+	elseif (IsRetail or IsWrath) and (IsPossessBarVisible() and PetCanBeDismissed()) then
 		PetDismiss()
 	end
 end
@@ -2131,7 +2205,7 @@ LibSecureButton.CreateButtonOverlay = function(self, button)
 	overlay:SetAllPoints()
 	overlay:SetFrameLevel(button:GetFrameLevel() + 15)
 	button.Overlay = overlay
-end 
+end
 
 LibSecureButton.CreateButtonKeybind = function(self, button)
 	local keybind = (button.Overlay or button):CreateFontString()
@@ -2144,7 +2218,7 @@ LibSecureButton.CreateButtonKeybind = function(self, button)
 	keybind:SetShadowColor(0, 0, 0, 0)
 	keybind:SetTextColor(230/255, 230/255, 230/255, .75)
 	button.Keybind = keybind
-end 
+end
 
 LibSecureButton.CreateButtonCount = function(self, button)
 	local count = (button.Overlay or button):CreateFontString()
@@ -2157,7 +2231,7 @@ LibSecureButton.CreateButtonCount = function(self, button)
 	count:SetShadowColor(0, 0, 0, 0)
 	count:SetTextColor(250/255, 250/255, 250/255, .85)
 	button.Count = count
-end 
+end
 
 LibSecureButton.CreateButtonRank = function(self, button)
 	local rank = (button.Overlay or button):CreateFontString()
@@ -2170,7 +2244,7 @@ LibSecureButton.CreateButtonRank = function(self, button)
 	rank:SetShadowColor(0, 0, 0, 0)
 	rank:SetTextColor(250/255, 250/255, 250/255, .85)
 	button.Rank = count
-end 
+end
 
 LibSecureButton.CreateButtonAutoCast = function(self, button)
 	local autoCast = button:CreateFrame("Frame")
@@ -2207,12 +2281,12 @@ LibSecureButton.CreateButtonCooldowns = function(self, button)
 	cooldown:SetFrameLevel(button:GetFrameLevel() + 1)
 	cooldown:SetReverse(false)
 	cooldown:SetSwipeColor(0, 0, 0, .75)
-	cooldown:SetBlingTexture(BLING_TEXTURE, .3, .6, 1, .75) 
+	cooldown:SetBlingTexture(BLING_TEXTURE, .3, .6, 1, .75)
 	cooldown:SetEdgeTexture(EDGE_NORMAL_TEXTURE)
 	cooldown:SetDrawSwipe(true)
 	cooldown:SetDrawBling(true)
 	cooldown:SetDrawEdge(false)
-	cooldown:SetHideCountdownNumbers(true) 
+	cooldown:SetHideCountdownNumbers(true)
 	button.Cooldown = cooldown
 
 	local cooldownCount = (button.Overlay or button):CreateFontString()
@@ -2232,12 +2306,12 @@ LibSecureButton.CreateButtonCooldowns = function(self, button)
 	chargeCooldown:SetFrameLevel(button:GetFrameLevel() + 2)
 	chargeCooldown:SetReverse(false)
 	chargeCooldown:SetSwipeColor(0, 0, 0, .75)
-	chargeCooldown:SetBlingTexture(BLING_TEXTURE, .3, .6, 1, .75) 
+	chargeCooldown:SetBlingTexture(BLING_TEXTURE, .3, .6, 1, .75)
 	chargeCooldown:SetEdgeTexture(EDGE_NORMAL_TEXTURE)
 	chargeCooldown:SetDrawEdge(true)
 	chargeCooldown:SetDrawSwipe(true)
 	chargeCooldown:SetDrawBling(false)
-	chargeCooldown:SetHideCountdownNumbers(true) 
+	chargeCooldown:SetHideCountdownNumbers(true)
 	button.ChargeCooldown = chargeCooldown
 end
 
@@ -2254,7 +2328,7 @@ LibSecureButton.CreateFlyoutArrow = function(self, button)
 	-- blizzard code bugs out without these
 	button.FlyoutBorder = button:CreateTexture()
 	button.FlyoutBorderShadow = button:CreateTexture()
-end 
+end
 
 LibSecureButton.CreateButtonSpellHighlight = function(self, button)
 	local spellHighlight = button:CreateFrame("Frame")
@@ -2275,7 +2349,7 @@ LibSecureButton.CreateButtonSpellHighlight = function(self, button)
 		model:SetPoint("CENTER", 0, 0)
 		model:EnableMouse(false)
 		model:ClearModel()
-		model:SetDisplayInfo(26501) 
+		model:SetDisplayInfo(26501)
 		model:SetCamDistanceScale(3)
 		model:SetPortraitZoom(0)
 		model:SetPosition(0, 0, 0)
@@ -2325,19 +2399,19 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 	check(buttonTemplate, 3, "table", "string", "function", "nil")
 
 	-- Store the button
-	if (not Buttons[self]) then 
+	if (not Buttons[self]) then
 		Buttons[self] = {}
-	end 
+	end
 
 	-- Increase the button count
 	LibSecureButton.numButtons = LibSecureButton.numButtons + 1
 
 	-- Count the total number of buttons
 	-- belonging to the addon that spawned it.
-	local count = 0 
-	for button in pairs(Buttons[self]) do 
+	local count = 0
+	for button in pairs(Buttons[self]) do
 		count = count + 1
-	end 
+	end
 
 	-- Make up an unique name
 	local name = nameHelper(count + 1, buttonType)
@@ -2347,16 +2421,16 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 	visibility:Hide() -- driver will show it later on
 	visibility:SetAttribute("_onattributechanged", [=[
 		if (name == "state-vis") then
-			if (value == "show") then 
-				self:Show(); 
-			elseif (value == "hide") then 
-				self:Hide(); 
-			end 
+			if (value == "show") then
+				self:Show();
+			elseif (value == "hide") then
+				self:Hide();
+			end
 		end
 	]=])
 
 	local button
-	if (buttonType == "pet") then 
+	if (buttonType == "pet") then
 		local buttonID = ...
 
 		-- Add a page driver layer, basically a fake bar for the current button
@@ -2391,28 +2465,28 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 		button:SetScript("OnReceiveDrag", PetButton.OnReceiveDrag)
 		button:SetScript("OnUpdate", OnUpdatePet)
 
-		-- This allows drag functionality, but stops the casting, 
-		-- thus allowing us to drag spells even with cast on down, wohoo! 
-		-- Doesn't currently appear to be a way to make this work without the modifier, though, 
-		-- since the override bindings we use work by sending mouse events to the listeners, 
-		-- meaning there's no way to separate keys and mouse buttons. 
+		-- This allows drag functionality, but stops the casting,
+		-- thus allowing us to drag spells even with cast on down, wohoo!
+		-- Doesn't currently appear to be a way to make this work without the modifier, though,
+		-- since the override bindings we use work by sending mouse events to the listeners,
+		-- meaning there's no way to separate keys and mouse buttons.
 		button:SetAttribute("alt-ctrl-shift-type*", "stop")
-		
+
 		button:SetAttribute("OnDragStart", [[
-			local id = self:GetID(); 
-			local buttonLock = self:GetAttribute("buttonLock"); 
+			local id = self:GetID();
+			local buttonLock = self:GetAttribute("buttonLock");
 			if ((not buttonLock) or (IsShiftKeyDown() and IsAltKeyDown() and IsControlKeyDown())) then
 				return "petaction", id
 			end
 		]])
-		
+
 		-- When a spell is dragged from a button
-		-- *This never fires when cast on down is enabled. ARGH! 
+		-- *This never fires when cast on down is enabled. ARGH!
 		page:WrapScript(button, "OnDragStart", [[
 			return self:RunAttribute("OnDragStart")
 		]])
 
-		-- Bartender says: 
+		-- Bartender says:
 		-- Wrap twice, because the post-script is not run when the pre-script causes a pickup (doh)
 		-- we also need some phony message, or it won't work =/
 		page:WrapScript(button, "OnDragStart", [[
@@ -2422,15 +2496,15 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 		-- When a spell is dropped onto a button
 		page:WrapScript(button, "OnReceiveDrag", [[
 			local kind, value, subtype, extra = ...
-			if ((not kind) or (not value)) then 
-				return false 
+			if ((not kind) or (not value)) then
+				return false
 			end
-			local button = self:GetFrameRef("Button"); 
-			local buttonLock = button:GetAttribute("buttonLock"); 
-			local id = button:GetID(); 
+			local button = self:GetFrameRef("Button");
+			local buttonLock = button:GetAttribute("buttonLock");
+			local id = button:GetID();
 			if ((not buttonLock) or (IsShiftKeyDown() and IsAltKeyDown() and IsControlKeyDown())) then
 				return "petaction", id
-			end 
+			end
 		]])
 		page:WrapScript(button, "OnReceiveDrag", [[
 			return "message", "update"
@@ -2439,11 +2513,14 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 		local visibilityDriver
 		if (IsClassic or IsTBC) then
 			visibilityDriver = "[@pet,exists]show;hide"
-			
+
+		elseif (IsWrath) then
+			-- UNTESTED!
+			visibilityDriver = "[@pet,exists,nopossessbar,nooverridebar,noshapeshift,novehicleui]show;hide"
+
 		elseif (IsRetail) then
 			-- Experimental change to avoid duplicate bars on some world quests.
 			visibilityDriver = "[@pet,exists,nopossessbar,nooverridebar,noshapeshift,novehicleui]show;hide"
-			--visibilityDriver = "[@pet,exists]show;hide"
 		end
 
 		-- Cross reference everything
@@ -2455,11 +2532,11 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 		page:SetFrameRef("Visibility", visibility)
 		visibility:SetFrameRef("Button", button)
 		visibility:SetFrameRef("Page", page)
-		
+
 		-- not run by a page driver
-		page:SetAttribute("state-page", "0") 
+		page:SetAttribute("state-page", "0")
 		button:SetAttribute("state", "0")
-		
+
 		-- enable the visibility driver
 		RegisterAttributeDriver(visibility, "state-vis", visibilityDriver)
 
@@ -2478,7 +2555,12 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 		if (IsClassic or IsTBC) then
 			macroText = "/dismount [mounted]"
 			visibilityDriver = "[mounted]show;hide"
-		
+
+		elseif (IsWrath) then
+			-- No /leavevehicle in Wrath
+			macroText = "/dismount [mounted]\n/run if CanExitVehicle() then VehicleExit() end"
+			visibilityDriver = "[target=vehicle,exists,canexitvehicle][possessbar][mounted]show;hide"
+
 		elseif (IsRetail) then
 			macroText = "/leavevehicle [target=vehicle,exists,canexitvehicle]\n/dismount [mounted]"
 			visibilityDriver = "[target=vehicle,exists,canexitvehicle][possessbar][mounted]show;hide"
@@ -2497,7 +2579,7 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 				showInPetBattles = false
 			else
 				-- Allow these optional flags to override
-				-- the visibility and driver settings of 
+				-- the visibility and driver settings of
 				-- the buttons used in vehicles and petbattles.
 				hideInVehicles, showInPetBattles = select(3, ...)
 			end
@@ -2510,7 +2592,7 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 		local page = visibility:CreateFrame("Frame", nil, "SecureHandlerAttributeTemplate")
 		page.id = barID
 		page.AddDebugMessage = self.AddDebugMessageFormatted or function() end
-		page:SetID(barID) 
+		page:SetID(barID)
 		page:SetAttribute("_onattributechanged", SECURE.Page_OnAttributeChanged)
 
 		button = setmetatable(page:CreateFrame("CheckButton", name, "SecureHandlerAttributeTemplate,SecureActionButtonTemplate"), ActionButton_MT)
@@ -2532,11 +2614,11 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 		button:RegisterForDrag("LeftButton", "RightButton")
 		button:RegisterForClicks("AnyUp")
 
-		-- This allows drag functionality, but stops the casting, 
-		-- thus allowing us to drag spells even with cast on down, wohoo! 
-		-- Doesn't currently appear to be a way to make this work without the modifier, though, 
-		-- since the override bindings we use work by sending mouse events to the listeners, 
-		-- meaning there's no way to separate keys and mouse buttons. 
+		-- This allows drag functionality, but stops the casting,
+		-- thus allowing us to drag spells even with cast on down, wohoo!
+		-- Doesn't currently appear to be a way to make this work without the modifier, though,
+		-- since the override bindings we use work by sending mouse events to the listeners,
+		-- meaning there's no way to separate keys and mouse buttons.
 		button:SetAttribute("alt-ctrl-shift-type*", "stop")
 
 		button:SetID(buttonID)
@@ -2562,50 +2644,50 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 		-- A little magic to allow us to toggle autocasting of pet abilities
 		-- when placed on one of the regular action bars.
 		page:WrapScript(button, "PreClick", [[
-			if (button ~= "RightButton") then 
-				if (self:GetAttribute("type2")) then 
-					self:SetAttribute("type2", nil); 
-				end 
-				return 
+			if (button ~= "RightButton") then
+				if (self:GetAttribute("type2")) then
+					self:SetAttribute("type2", nil);
+				end
+				return
 			end
-			local actionpage = self:GetAttribute("actionpage"); 
+			local actionpage = self:GetAttribute("actionpage");
 			if (not actionpage) then
-				if (self:GetAttribute("type2")) then 
-					self:SetAttribute("type2", nil); 
-				end 
+				if (self:GetAttribute("type2")) then
+					self:SetAttribute("type2", nil);
+				end
 				return
 			end
-			local id = self:GetID(); 
-			local action = (actionpage > 1) and ((actionpage - 1)*12 + id) or id; 
+			local id = self:GetID();
+			local action = (actionpage > 1) and ((actionpage - 1)*12 + id) or id;
 			local actionType, id, subType = GetActionInfo(action);
-			if (subType == "pet") and (id ~= 0) then 
-				self:SetAttribute("type2", "macro"); 
-			else 
-				if (self:GetAttribute("type2")) then 
-					self:SetAttribute("type2", nil); 
-				end 
-			end 
-		]]) 
+			if (subType == "pet") and (id ~= 0) then
+				self:SetAttribute("type2", "macro");
+			else
+				if (self:GetAttribute("type2")) then
+					self:SetAttribute("type2", nil);
+				end
+			end
+		]])
 
 		button:SetAttribute("OnDragStart", [[
-			local actionpage = self:GetAttribute("actionpage"); 
+			local actionpage = self:GetAttribute("actionpage");
 			if (not actionpage) then
 				return
 			end
-			local id = self:GetID(); 
-			local buttonLock = self:GetAttribute("buttonLock"); 
-			local action = (actionpage > 1) and ((actionpage - 1)*12 + id) or id; 
+			local id = self:GetID();
+			local buttonLock = self:GetAttribute("buttonLock");
+			local action = (actionpage > 1) and ((actionpage - 1)*12 + id) or id;
 			if action and ( (not buttonLock) or (IsShiftKeyDown() and IsAltKeyDown() and IsControlKeyDown()) ) then
 				return "action", action
 			end
 		]])
 
 		-- When a spell is dragged from a button
-		-- *This never fires when cast on down is enabled. ARGH! 
+		-- *This never fires when cast on down is enabled. ARGH!
 		page:WrapScript(button, "OnDragStart", [[
 			return self:RunAttribute("OnDragStart")
 		]])
-		-- Bartender says: 
+		-- Bartender says:
 		-- Wrap twice, because the post-script is not run when the pre-script causes a pickup (doh)
 		-- we also need some phony message, or it won't work =/
 		page:WrapScript(button, "OnDragStart", [[
@@ -2615,17 +2697,17 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 		-- When a spell is dropped onto a button
 		page:WrapScript(button, "OnReceiveDrag", [[
 			local kind, value, subtype, extra = ...
-			if ((not kind) or (not value)) then 
-				return false 
-			end
-			local button = self:GetFrameRef("Button"); 
-			local buttonLock = button and button:GetAttribute("buttonLock"); 
-			local actionpage = self:GetAttribute("actionpage"); 
-			local id = self:GetID(); 
-			local action = actionpage and (actionpage > 1) and ((actionpage - 1)*12 + id) or id; 
+			if ((not kind) or (not value)) then
+				return false
+			end
+			local button = self:GetFrameRef("Button");
+			local buttonLock = button and button:GetAttribute("buttonLock");
+			local actionpage = self:GetAttribute("actionpage");
+			local id = self:GetID();
+			local action = actionpage and (actionpage > 1) and ((actionpage - 1)*12 + id) or id;
 			if action and ((not buttonLock) or (IsShiftKeyDown() and IsAltKeyDown() and IsControlKeyDown())) then
 				return "action", action
-			end 
+			end
 		]])
 		page:WrapScript(button, "OnReceiveDrag", [[
 			return "message", "update"
@@ -2633,7 +2715,7 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 
 		local driver, visibilityDriver
 		if (IsClassic or IsTBC) then
-			if (barID == 1) then 
+			if (barID == 1) then
 				driver = "[form,noform] 0; [bar:2]2; [bar:3]3; [bar:4]4; [bar:5]5; [bar:6]6"
 
 				local _, playerClass = UnitClass("player")
@@ -2647,17 +2729,51 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 					driver = driver .. "; [bonusbar:1] 7"
 
 				elseif (playerClass == "WARRIOR") then
-					driver = driver .. "; [bonusbar:1] 7; [bonusbar:2] 8" 
+					driver = driver .. "; [bonusbar:1] 7; [bonusbar:2] 8"
 				end
 				driver = driver .. "; 1"
 				visibilityDriver = "[@player,exists]show;hide"
-			else 
+			else
 				driver = tostring(barID)
 				visibilityDriver = "[@player,noexists]hide;show"
-			end 
+			end
+
+		elseif (IsWrath) then
+
+			-- Copied directly from retail. Untested.
+			if (barID == 1) then
+
+				local vehicle = string_format("[vehicleui]%d;", GetVehicleBarIndex())
+
+				driver = ("[overridebar]%d; [possessbar]%d; [shapeshift]%d; [vehicleui]%d; [form,noform] 0; [bar:2]2; [bar:3]3; [bar:4]4; [bar:5]5; [bar:6]6"):format(GetOverrideBarIndex(), GetVehicleBarIndex(), GetTempShapeshiftBarIndex(), GetVehicleBarIndex())
+
+				local _, playerClass = UnitClass("player")
+				if (playerClass == "DRUID") then
+					driver = driver .. "; [bonusbar:1,nostealth] 7; [bonusbar:1,stealth] 7; [bonusbar:2] 8; [bonusbar:3] 9; [bonusbar:4] 10"
+
+				elseif (playerClass == "MONK") then
+					driver = driver .. "; [bonusbar:1] 7; [bonusbar:2] 8; [bonusbar:3] 9"
+
+				elseif (playerClass == "PRIEST") then
+					driver = driver .. "; [bonusbar:1] 7"
+
+				elseif (playerClass == "ROGUE") then
+					driver = driver .. "; [bonusbar:1] 7"
+
+				elseif (playerClass == "WARRIOR") then
+					driver = driver .. "; [bonusbar:1] 7; [bonusbar:2] 8"
+				end
+				--driver = driver .. "; [form] 1; 1"
+				driver = driver .. "; 1"
+
+				visibilityDriver = "[@player,exists][overridebar][possessbar][shapeshift][vehicleui]show;hide"
+			else
+				driver = tostring(barID)
+				visibilityDriver = "[overridebar][possessbar][shapeshift][vehicleui][@player,noexists]hide;show"
+			end
 
 		elseif (IsRetail) then
-			if (barID == 1) then 
+			if (barID == 1) then
 
 				local vehicle = string_format("[vehicleui]%d;", GetVehicleBarIndex())
 
@@ -2665,31 +2781,31 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 				-- found in the new 8.1.5 world quest "Cycle of Life" returns positive for both vehicleui and overridebar.
 				-- In other words; do NOT change the order of these, as it really matters!
 				driver = ("[overridebar]%d; [possessbar]%d; [shapeshift]%d; [vehicleui]%d; [form,noform] 0; [bar:2]2; [bar:3]3; [bar:4]4; [bar:5]5; [bar:6]6"):format(GetOverrideBarIndex(), GetVehicleBarIndex(), GetTempShapeshiftBarIndex(), GetVehicleBarIndex())
-		
+
 				local _, playerClass = UnitClass("player")
 				if (playerClass == "DRUID") then
 					driver = driver .. "; [bonusbar:1,nostealth] 7; [bonusbar:1,stealth] 7; [bonusbar:2] 8; [bonusbar:3] 9; [bonusbar:4] 10"
-		
+
 				elseif (playerClass == "MONK") then
 					driver = driver .. "; [bonusbar:1] 7; [bonusbar:2] 8; [bonusbar:3] 9"
-		
+
 				elseif (playerClass == "PRIEST") then
 					driver = driver .. "; [bonusbar:1] 7"
-		
+
 				elseif (playerClass == "ROGUE") then
 					driver = driver .. "; [bonusbar:1] 7"
-		
+
 				elseif (playerClass == "WARRIOR") then
-					driver = driver .. "; [bonusbar:1] 7; [bonusbar:2] 8" 
+					driver = driver .. "; [bonusbar:1] 7; [bonusbar:2] 8"
 				end
 				--driver = driver .. "; [form] 1; 1"
 				driver = driver .. "; 1"
 
 				visibilityDriver = "[@player,exists][overridebar][possessbar][shapeshift][vehicleui]show;hide"
-			else 
+			else
 				driver = tostring(barID)
 				visibilityDriver = "[overridebar][possessbar][shapeshift][vehicleui][@player,noexists]hide;show"
-			end 
+			end
 		end
 
 		-- Cross reference everything
@@ -2701,7 +2817,7 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 		visibility:SetFrameRef("Page", page)
 
 		-- reset the page before applying a new page driver
-		page:SetAttribute("state-page", "0") 
+		page:SetAttribute("state-page", "0")
 
 		-- just in case we're not run by a header, default to state 0
 		button:SetAttribute("state", "0")
@@ -2710,7 +2826,7 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 		RegisterAttributeDriver(visibility, "state-vis", visibilityDriver)
 
 		-- enable the page driver
-		RegisterAttributeDriver(page, "state-page", driver) 
+		RegisterAttributeDriver(page, "state-page", driver)
 
 		-- initial action update
 		button:UpdateAction()
@@ -2743,11 +2859,11 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 	end
 
 	-- Embed forging and chaining directly in the buttons.
-	-- They will all be needing it anyway soon, 
+	-- They will all be needing it anyway soon,
 	-- so no use to go the long way around module embedding.
 	LibForge:Embed(button)
-	
-	-- Call the post create method if it exists, 
+
+	-- Call the post create method if it exists,
 	-- and pass along any remaining arguments.
 	-- This is a good place to add styling.
 	-- This method can assume the custom template
@@ -2761,7 +2877,7 @@ LibSecureButton.SpawnActionButton = function(self, buttonType, parent, buttonTem
 
 	-- Update all elements when shown
 	button:HookScript("OnShow", button.Update)
-	
+
 	-- Enable the newly created button
 	-- This is where events are registered and set up
 	button:OnEnable()
@@ -2779,22 +2895,22 @@ LibSecureButton.GetAllActionButtonsOrdered = function(self)
 	-- return an iterator for all registered buttons,
 	-- regardless of which module they were spawned by.
 	local buttons = (self == LibSecureButton) and AllButtons or Buttons[self]
-	if (not buttons) then 
+	if (not buttons) then
 		return function() return nil end
-	end 
+	end
 
 	local sorted = {}
-	for button,type in pairs(buttons) do 
+	for button,type in pairs(buttons) do
 		sorted[#sorted + 1] = button
-	end 
+	end
 	table_sort(sorted, sortByID)
 
 	local counter = 0
-	return function() 
+	return function()
 		counter = counter + 1
 		return sorted[counter]
-	end 
-end 
+	end
+end
 
 -- Returns an iterator for all buttons of the given type registered to the module.
 -- Buttons are returned as the first return value, and ordered by their IDs.
@@ -2803,24 +2919,24 @@ LibSecureButton.GetAllActionButtonsByType = function(self, buttonType)
 	-- return an iterator for all registered buttons of the type,
 	-- regardless of which module they were spawned by.
 	local buttons = (self == LibSecureButton) and AllButtons or Buttons[self]
-	if (not buttons) then 
+	if (not buttons) then
 		return function() return nil end
-	end 
+	end
 
 	local sorted = {}
-	for button,type in pairs(buttons) do 
-		if (type == buttonType) then 
+	for button,type in pairs(buttons) do
+		if (type == buttonType) then
 			sorted[#sorted + 1] = button
-		end 
-	end 
+		end
+	end
 	table_sort(sorted, sortByID)
 
 	local counter = 0
-	return function() 
+	return function()
 		counter = counter + 1
 		return sorted[counter]
-	end 
-end 
+	end
+end
 
 LibSecureButton.GetActionButtonTooltip = function(self)
 	return LibSecureButton:GetTooltip("GP_ActionButtonTooltip") or LibSecureButton:CreateTooltip("GP_ActionButtonTooltip")
@@ -2843,12 +2959,12 @@ LibSecureButton.GetActionBarControllerPetBattle = function(self, ...)
 		end
 	end
 
-	if (not Controllers[self]) then 
+	if (not Controllers[self]) then
 		Controllers[self] = {}
 	end
 
-	-- The blizzard petbattle UI gets its keybinds from the primary action bar, 
-	-- so in order for the petbattle UI keybinds to function properly, 
+	-- The blizzard petbattle UI gets its keybinds from the primary action bar,
+	-- so in order for the petbattle UI keybinds to function properly,
 	-- we need to temporarily give the primary action bar backs its keybinds.
 	local petbattle = Controllers[self].petBattle or self:CreateFrame("Frame", nil, UIParent, "SecureHandlerAttributeTemplate")
 	petbattle:SetAttribute("_onattributechanged", [[
@@ -2868,22 +2984,22 @@ LibSecureButton.GetActionBarControllerPetBattle = function(self, ...)
 					local our_button, blizz_button = "CLICK "..primarySix[i]..":LeftButton", "ACTIONBUTTON"..i;
 
 					-- Grab the keybinds from our own primary action bar,
-					-- and assign them to the default blizzard bar. 
-					-- The pet battle system will in turn get its bindings 
+					-- and assign them to the default blizzard bar.
+					-- The pet battle system will in turn get its bindings
 					-- from the default blizzard bar, and the magic works! :)
-					
+
 					for k=1,select("#", GetBindingKey(our_button)) do
 						local key = select(k, GetBindingKey(our_button)) -- retrieve the binding key from our own primary bar
 						self:SetBinding(true, key, blizz_button) -- assign that key to the default bar
 					end
-					
+
 					-- Do the same for the default UIs bindings.
 					-- This is not superflous, as our own bars more often than not
-					-- uses override bindings, not actual bindings. 
+					-- uses override bindings, not actual bindings.
 					for k = 1,select("#", GetBindingKey(blizz_button)) do
 						local key = select(k, GetBindingKey(blizz_button))
 						self:SetBinding(true, key, blizz_button)
-					end	
+					end
 				end
 			else
 				-- Return the key bindings to whatever buttons they were
@@ -2919,12 +3035,12 @@ LibSecureButton.GetActionBarControllerVehicle = function(self, ...)
 		end
 	end
 
-	if (not Controllers[self]) then 
+	if (not Controllers[self]) then
 		Controllers[self] = {}
 	end
 
-	-- The blizzard petbattle UI gets its keybinds from the primary action bar, 
-	-- so in order for the petbattle UI keybinds to function properly, 
+	-- The blizzard petbattle UI gets its keybinds from the primary action bar,
+	-- so in order for the petbattle UI keybinds to function properly,
 	-- we need to temporarily give the primary action bar backs its keybinds.
 	local vehicle = Controllers[self].vehicle or self:CreateFrame("Frame", nil, UIParent, "SecureHandlerAttributeTemplate")
 	vehicle:SetAttribute("_onattributechanged", [[
@@ -2944,22 +3060,22 @@ LibSecureButton.GetActionBarControllerVehicle = function(self, ...)
 					local our_button, blizz_button = "CLICK "..primarySix[i]..":LeftButton", "ACTIONBUTTON"..i;
 
 					-- Grab the keybinds from our own primary action bar,
-					-- and assign them to the default blizzard bar. 
-					-- The pet battle system will in turn get its bindings 
+					-- and assign them to the default blizzard bar.
+					-- The pet battle system will in turn get its bindings
 					-- from the default blizzard bar, and the magic works! :)
-					
+
 					for k=1,select("#", GetBindingKey(our_button)) do
 						local key = select(k, GetBindingKey(our_button)) -- retrieve the binding key from our own primary bar
 						self:SetBinding(true, key, blizz_button) -- assign that key to the default bar
 					end
-					
+
 					-- Do the same for the default UIs bindings.
 					-- This is not superflous, as our own bars more often than not
-					-- uses override bindings, not actual bindings. 
+					-- uses override bindings, not actual bindings.
 					for k = 1,select("#", GetBindingKey(blizz_button)) do
 						local key = select(k, GetBindingKey(blizz_button))
 						self:SetBinding(true, key, blizz_button)
-					end	
+					end
 				end
 			else
 				-- Return the key bindings to whatever buttons they were
@@ -2995,12 +3111,12 @@ LibSecureButton.UpdateActionButtonBindings = function(self)
 	local petBattleUsed, vehicleUsed
 	local primarySix = {}
 
-	for button in self:GetAllActionButtonsByType("action") do 
+	for button in self:GetAllActionButtonsByType("action") do
 
 		local pager = button:GetPager()
 
 		-- clear current overridebindings
-		ClearOverrideBindings(pager) 
+		ClearOverrideBindings(pager)
 
 		-- retrieve page and button id
 		local buttonID = button:GetID()
@@ -3018,27 +3134,27 @@ LibSecureButton.UpdateActionButtonBindings = function(self)
 				mainBarUsed = true
 			end
 
-		elseif (barID == BOTTOMLEFT_ACTIONBAR_PAGE) then 
+		elseif (barID == BOTTOMLEFT_ACTIONBAR_PAGE) then
 			bindingAction = ("MULTIACTIONBAR1BUTTON%d"):format(buttonID)
 
-		elseif (barID == BOTTOMRIGHT_ACTIONBAR_PAGE) then 
+		elseif (barID == BOTTOMRIGHT_ACTIONBAR_PAGE) then
 			bindingAction = ("MULTIACTIONBAR2BUTTON%d"):format(buttonID)
 
-		elseif (barID == RIGHT_ACTIONBAR_PAGE) then 
+		elseif (barID == RIGHT_ACTIONBAR_PAGE) then
 			bindingAction = ("MULTIACTIONBAR3BUTTON%d"):format(buttonID)
 
-		elseif (barID == LEFT_ACTIONBAR_PAGE) then 
+		elseif (barID == LEFT_ACTIONBAR_PAGE) then
 			bindingAction = ("MULTIACTIONBAR4BUTTON%d"):format(buttonID)
-		end 
+		end
 
 		-- store the binding action name on the button
 		button.bindingAction = bindingAction
 
 		-- iterate through the registered keys for the action
-		for keyNumber = 1, select("#", GetBindingKey(bindingAction)) do 
+		for keyNumber = 1, select("#", GetBindingKey(bindingAction)) do
 
 			-- get a key for the action
-			local key = select(keyNumber, GetBindingKey(bindingAction)) 
+			local key = select(keyNumber, GetBindingKey(bindingAction))
 			if (key and (key ~= "")) then
 				-- this is why we need named buttons
 				--SetOverrideBindingClick(pager, false, key, button:GetName(), "CLICK: LeftButton") -- assign the key to our own button
@@ -3052,7 +3168,7 @@ LibSecureButton.UpdateActionButtonBindings = function(self)
 		local pager = button:GetPager()
 
 		-- clear current overridebindings
-		ClearOverrideBindings(pager) 
+		ClearOverrideBindings(pager)
 
 		-- retrieve button id
 		local buttonID = button:GetID()
@@ -3064,35 +3180,35 @@ LibSecureButton.UpdateActionButtonBindings = function(self)
 		button.bindingAction = bindingAction
 
 		-- iterate through the registered keys for the action
-		for keyNumber = 1, select("#", GetBindingKey(bindingAction)) do 
+		for keyNumber = 1, select("#", GetBindingKey(bindingAction)) do
 
 			-- get a key for the action
 			local key = select(keyNumber, GetBindingKey(bindingAction))
 			if (key and (key ~= "")) then
 				-- We need both right- and left click functionality on pet buttons
 				SetOverrideBindingClick(pager, false, key, button:GetName()) -- assign the key to our own button
-			end	
+			end
 		end
-		
+
 	end
 
 	if (mainBarUsed) then
-		if (not petBattleUsed) then 
+		if (not petBattleUsed) then
 			-- Pass the global names of the primary six buttons if available.
 			if (#primarySix == 6) then
 				self:GetActionBarControllerPetBattle(unpack(primarySix))
 			else
 				self:GetActionBarControllerPetBattle()
 			end
-		end 
-		
+		end
+
 		-- Generally not needed, as the main bar displays these just fine.
 		-- And even in cases where the main bar is set to hide in vehicles,
 		-- the assumption is that the modules are making their own vehicle bars if so.
 		-- In a situation where custom bars are hidden in vehicles, and no alternative given,
 		-- the modules would need to call :GetActionBarControllerVehicle(button1, button2, ...) themselves.
 		-- Leaving this code here just for reference, not meant to be used.
-		--if (not vehicleUsed) then 
+		--if (not vehicleUsed) then
 		--	-- Pass the global names of the primary six buttons if available.
 		--	if (#primarySix == 6) then
 		--		self:GetActionBarControllerVehicle(unpack(primarySix))
@@ -3112,26 +3228,26 @@ LibSecureButton.HookMaxDps = function(self, event, ...)
 			return
 		end
 		LibSecureButton:UnregisterEvent("ADDON_LOADED", "HookMaxDps")
-	end 
+	end
 
 	if (LibSecureButton.maxDPSHooked) or (not MaxDps) then
 		return
 	end
-	
+
 	MaxDps.FetchAzeriteUI = function()
-		for button in LibSecureButton:GetAllActionButtonsByType("action") do 
+		for button in LibSecureButton:GetAllActionButtonsByType("action") do
 			if (button:HasContent()) then
 				MaxDps:AddButton(button:GetSpellID(), button)
 			end
 		end
-		for button in LibSecureButton:GetAllActionButtonsByType("pet") do 
+		for button in LibSecureButton:GetAllActionButtonsByType("pet") do
 			if (button:HasContent()) then
 				MaxDps:AddButton(button:GetSpellID(), button)
 			end
 		end
 	end
-	
-	-- This is called in their :Fetch() method, 
+
+	-- This is called in their :Fetch() method,
 	-- so it should be automatically updated for us too.
 	local UpdateButtonGlow = function()
 		if (not MaxDps.db) then
@@ -3145,11 +3261,11 @@ LibSecureButton.HookMaxDps = function(self, event, ...)
 	end
 	hooksecurefunc(MaxDps, "UpdateButtonGlow", UpdateButtonGlow)
 
-	-- ToDo: 
-	-- Hook this into our own highlight system, 
+	-- ToDo:
+	-- Hook this into our own highlight system,
 	-- allowing the buttons to use their own glows
 	-- instead of what is decided by MaxDps.
-	-- This is because our buttons more often than not 
+	-- This is because our buttons more often than not
 	-- have specific shapes and borders that does not fit
 	-- the general assumptions made by MaxDps and other addons.
 	-- Will probably need to make this optional through the API.
@@ -3196,11 +3312,13 @@ LibSecureButton.HookMaxDps = function(self, event, ...)
 end
 
 -- This will cause multiple updates when library is updated. Hmm....
-hooksecurefunc("ActionButton_UpdateFlyout", function(self, ...)
-	if AllButtons[self] then
-		self:UpdateFlyout()
-	end
-end)
+if (ActionButton_UpdateFlyout) then
+	hooksecurefunc("ActionButton_UpdateFlyout", function(self, ...)
+		if AllButtons[self] then
+			self:UpdateFlyout()
+		end
+	end)
+end
 
 -- Module embedding
 local embedMethods = {
@@ -3236,7 +3354,7 @@ if (IsAddOnEnabled("MaxDps")) then
 		LibSecureButton:RegisterEvent("ADDON_LOADED", "HookMaxDps")
 	end
 else
-	-- Let's just kill this off if it's not needed, 
+	-- Let's just kill this off if it's not needed,
 	-- to avoid anybody calling it wrongly.
 	LibSecureButton.HookMaxDps = function() end
 end
diff --git a/SimpleClassPower/back-end/libraries/aura.lua b/SimpleClassPower/back-end/libraries/aura.lua
index 92e8477..7661d02 100644
--- a/SimpleClassPower/back-end/libraries/aura.lua
+++ b/SimpleClassPower/back-end/libraries/aura.lua
@@ -56,17 +56,20 @@ local UnitInRaid = UnitInRaid
 local UnitIsUnit = UnitIsUnit
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
+
 -- Shortcuts
 local AuraInfoFlags = LibAuraData:GetAllAuraInfoFlags()
 local BitFilters = LibAuraData:GetAllAuraInfoBitFilters()
 
 -- Sourced from FrameXML/BuffFrame.lua
 local BUFF_MAX_DISPLAY = BUFF_MAX_DISPLAY
-local DEBUFF_MAX_DISPLAY = DEBUFF_MAX_DISPLAY 
+local DEBUFF_MAX_DISPLAY = DEBUFF_MAX_DISPLAY
 
 -- Add in support for LibClassicDurations.
 local LCD
@@ -90,17 +93,17 @@ if (LibAura.frame) then
 	LibAura.frame:SetScript("OnEvent",nil)
 	LibAura.frame:UnregisterAllEvents()
 	LibAura.frame:Hide()
-	LibAura.frame = nil 
+	LibAura.frame = nil
 end
 
 -- Utility Functions
 --------------------------------------------------------------------------
--- Syntax check 
+-- Syntax check
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -108,12 +111,12 @@ local check = function(value, num, ...)
 	error(string_format("Bad argument #%.0f to '%s': %s expected, got %s", num, name, types, type(value)), 3)
 end
 
--- Utility function to parse and order a filter, 
--- to make sure we avoid duplicate caches. 
+-- Utility function to parse and order a filter,
+-- to make sure we avoid duplicate caches.
 local parseFilter = function(filter, harmful)
-	
+
 	-- speed it up for default situations
-	if ((not filter) or (filter == "")) then 
+	if ((not filter) or (filter == "")) then
 		return harmful and "HARMFUL" or "HELPFUL"
 	end
 
@@ -126,65 +129,65 @@ local parseFilter = function(filter, harmful)
 	local helpful = string_match(filter, "HELPFUL")
 
 	-- auras that were applied by the player
-	local player = string_match(filter, "PLAYER") 
+	local player = string_match(filter, "PLAYER")
 
 	-- auras that can be applied (if HELPFUL) or dispelled (if HARMFUL) by the player
-	local raid = string_match(filter, "RAID") 
+	local raid = string_match(filter, "RAID")
 
 	-- buffs that cannot be removed
-	local not_cancelable = string_match(filter, "NOT_CANCELABLE") 
+	local not_cancelable = string_match(filter, "NOT_CANCELABLE")
 	if (not_cancelable) then
 		-- Dumb way to avoid NOT_CANCELABLE also firing for CANCELABLE
 		filter = string_gsub(filter, "NOT_CANCELABLE", "")
 	end
 
 	-- buffs that can be removed (such as by right-clicking or using the /cancelaura command)
-	local cancelable = string_match(filter, "CANCELABLE") 
+	local cancelable = string_match(filter, "CANCELABLE")
 
-	-- return a nil value for invalid filters. 
+	-- return a nil value for invalid filters.
 	-- *this might cause an error, but that is the intention.
-	if (harmful and helpful) or (cancelable and not_cancelable) then 
-		return 
+	if (harmful and helpful) or (cancelable and not_cancelable) then
+		return
 	end
 
 	-- Always include these, as we're always using UnitAura() to retrieve buffs/debuffs.
-	-- Default to buffs when no help/harm is mentioned. 
+	-- Default to buffs when no help/harm is mentioned.
 	local parsedFilter = (harmful) and "HARMFUL" or "HELPFUL"
 
 	-- Return a parsed filter with arguments separated by spaces, and in our preferred order.
 	-- This way filters with the same arguments can be directly compared later on.
-	return parsedFilter .. (player and " PLAYER" or "") 
-						.. (raid and " RAID" or "") 
-						.. (cancelable and " CANCELABLE" or "") 
-						.. (not_cancelable and " NOT_CANCELABLE" or "") 
-end 
+	return parsedFilter .. (player and " PLAYER" or "")
+						.. (raid and " RAID" or "")
+						.. (cancelable and " CANCELABLE" or "")
+						.. (not_cancelable and " NOT_CANCELABLE" or "")
+end
 
 LibAura.GetUnitAura = function(self, unit, auraID, filter)
 	local filter = parseFilter(filter)
-	if (not filter) then 
-		return 
+	if (not filter) then
+		return
 	end
 
 	local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId, canApplyAura, isBossDebuff, isCastByPlayer, nameplateShowAll, timeMod, value1, value2, value3 = UnitAura(unit, auraID, filter)
 
 	if (name) then
-		
+
 		-- Add Classic aura duration info
-		if (IsClassic) and (LCD) then 
+		if (IsClassic) and (LCD) then
 			local durationNew, expirationTimeNew = LCD:GetAuraDurationByUnit(unit, spellId, caster)
 			if ((not duration) or (duration == 0)) and (durationNew) then
 				duration = durationNew
 				expirationTime = expirationTimeNew
 			end
 		end
-		
+
 		-- Add boss flags. Applies to both classic and retail.
 		if (AuraInfoFlags[spellId]) and (not isBossDebuff) and (LibAura:HasAuraInfoFlags(spellId, BitFilters.IsBoss)) then
 			isBossDebuff = true
 		end
-		
+
 		-- This just makes more sense, and it works.
-		-- The blizzard flag just shows if the player CAN cast it, 
+		-- The blizzard flag just shows if the player CAN cast it,
 		-- while we're interested if in the player ACTUALLY did it.
 		isCastByPlayer = unitCaster == "player"
 	end
@@ -194,30 +197,30 @@ end
 
 LibAura.GetUnitBuff = function(self, unit, auraID, filter)
 	--local filter = parseFilter(filter)
-	--if (not filter) then 
-	--	return 
+	--if (not filter) then
+	--	return
 	--end
 
 	local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId, canApplyAura, isBossDebuff, isCastByPlayer, nameplateShowAll, timeMod, value1, value2, value3 = UnitBuff(unit, auraID, filter)
 
 	if (name) then
-		
+
 		-- Add Classic aura duration info
-		if (IsClassic) and (LCD) then 
+		if (IsClassic) and (LCD) then
 			local durationNew, expirationTimeNew = LCD:GetAuraDurationByUnit(unit, spellId, caster)
 			if ((not duration) or (duration == 0)) and (durationNew) then
 				duration = durationNew
 				expirationTime = expirationTimeNew
 			end
 		end
-		
+
 		-- Add boss flags. Applies to both classic and retail.
 		if (AuraInfoFlags[spellId]) and (not isBossDebuff) and (LibAura:HasAuraInfoFlags(spellId, BitFilters.IsBoss)) then
 			isBossDebuff = true
 		end
-		
+
 		-- This just makes more sense, and it works.
-		-- The blizzard flag just shows if the player CAN cast it, 
+		-- The blizzard flag just shows if the player CAN cast it,
 		-- while we're interested if in the player ACTUALLY did it.
 		isCastByPlayer = unitCaster == "player"
 	end
@@ -227,30 +230,30 @@ end
 
 LibAura.GetUnitDebuff = function(self, unit, auraID, filter)
 	--local filter = parseFilter(filter, true)
-	--if (not filter) then 
-	--	return 
+	--if (not filter) then
+	--	return
 	--end
 
 	local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId, canApplyAura, isBossDebuff, isCastByPlayer, nameplateShowAll, timeMod, value1, value2, value3 = UnitDebuff(unit, auraID, filter)
 
 	if (name) then
-		
+
 		-- Add Classic aura duration info
-		if (IsClassic) and (LCD) then 
+		if (IsClassic) and (LCD) then
 			local durationNew, expirationTimeNew = LCD:GetAuraDurationByUnit(unit, spellId, caster)
 			if ((not duration) or (duration == 0)) and (durationNew) then
 				duration = durationNew
 				expirationTime = expirationTimeNew
 			end
 		end
-		
+
 		-- Add boss flags. Applies to both classic and retail.
 		if (AuraInfoFlags[spellId]) and (not isBossDebuff) and (LibAura:HasAuraInfoFlags(spellId, BitFilters.IsBoss)) then
 			isBossDebuff = true
 		end
-		
+
 		-- This just makes more sense, and it works.
-		-- The blizzard flag just shows if the player CAN cast it, 
+		-- The blizzard flag just shows if the player CAN cast it,
 		-- while we're interested if in the player ACTUALLY did it.
 		isCastByPlayer = unitCaster == "player"
 	end
diff --git a/SimpleClassPower/back-end/libraries/bagbutton.lua b/SimpleClassPower/back-end/libraries/bagbutton.lua
index 75e5ef6..48d895f 100644
--- a/SimpleClassPower/back-end/libraries/bagbutton.lua
+++ b/SimpleClassPower/back-end/libraries/bagbutton.lua
@@ -1,5 +1,17 @@
-local LibBagButton = Wheel:Set("LibBagButton", 57)
-if (not LibBagButton) then	
+-- WoW Client versions
+local currentClientPatch, currentClientBuild = GetBuildInfo()
+currentClientBuild = tonumber(currentClientBuild)
+
+local MAJOR,MINOR,PATCH = string.split(".", currentClientPatch)
+MAJOR = tonumber(MAJOR)
+
+-- Bail out if this is Dragonflight
+if (MAJOR >= 10) then
+	return
+end
+
+local LibBagButton = Wheel:Set("LibBagButton", 58)
+if (not LibBagButton) then
 	return
 end
 
@@ -75,8 +87,13 @@ local SpellIsTargeting = SpellIsTargeting
 -- Constants
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWotLK = LibClientBuild:IsTBC()
 local IsRetail = LibClientBuild:IsRetail()
 
+-- No 'ItemButton' frameType in the classics.
+local USE_OLD_API = MAJOR < 9
+
+
 -- Library registries
 LibBagButton.embeds = LibBagButton.embeds or {}
 LibBagButton.buttons = LibBagButton.buttons or {} -- cache of buttons spawned
@@ -90,8 +107,8 @@ LibBagButton.buttonSlots = LibBagButton.buttonSlots or {} -- cache of actual usa
 LibBagButton.containers = LibBagButton.containers or {} -- cache of virtual containers spawned
 LibBagButton.elements = LibBagButton.elements or {} -- global container element registry
 LibBagButton.contents = LibBagButton.contents or {} -- cache of actual bank and bag contents
-LibBagButton.queuedContainerIDs = LibBagButton.queuedContainerIDs or {} -- Queue system for uncached items 
-LibBagButton.queuedItemIDs = LibBagButton.queuedItemIDs or {} -- Queue system for uncached items 
+LibBagButton.queuedContainerIDs = LibBagButton.queuedContainerIDs or {} -- Queue system for uncached items
+LibBagButton.queuedItemIDs = LibBagButton.queuedItemIDs or {} -- Queue system for uncached items
 LibBagButton.callbacks = LibBagButton.callbacks or {} -- button callback registry
 LibBagButton.messages = LibBagButton.messages or {} -- library callback message cache
 LibBagButton.blizzardMethods = LibBagButton.blizzardMethods or {}
@@ -110,11 +127,11 @@ local QueuedItemIDs = LibBagButton.queuedItemIDs
 local BlizzardMethods = LibBagButton.blizzardMethods
 
 -- Blizzard FontObjects
--- Main idea about sticking to these, 
+-- Main idea about sticking to these,
 -- is that they are font families adjusting
--- themselves to whatever locale the client is using. 
+-- themselves to whatever locale the client is using.
 -- This combined with global strings for text
--- makes the whole library work for all locales by default. 
+-- makes the whole library work for all locales by default.
 local TextFontTiny = Game11Font_o1 -- 11
 local TextFontSmall = Game13Font_o1 -- 13
 local TextFontNormal = Game15Font_o1 --15
@@ -125,15 +142,15 @@ local NumberFontNormal = NumberFont_Outline_Large -- 16
 local NumberFontHuge = NumberFont_Outline_Huge -- 30
 
 -- Color table assigned to buttons. Can be replaced.
--- Note that replacements should follow the same structure, 
--- as my color handling assumes the methods to be there. 
+-- Note that replacements should follow the same structure,
+-- as my color handling assumes the methods to be there.
 -----------------------------------------------------------------
 -- Color Template
 local ColorTemplate = {}
 
--- Emulate some of the Blizzard methods, 
--- since they too do colors this way now. 
--- Goal is not to be fully interchangeable. 
+-- Emulate some of the Blizzard methods,
+-- since they too do colors this way now.
+-- Goal is not to be fully interchangeable.
 ColorTemplate.GetRGB = function(self)
 	return self[1], self[2], self[3]
 end
@@ -150,13 +167,13 @@ ColorTemplate.GenerateHexColorMarkup = function(self)
 	return "|c" .. self:GenerateHexColor()
 end
 
--- Convert a Blizzard Color or RGB value set 
--- into our own custom color table format. 
+-- Convert a Blizzard Color or RGB value set
+-- into our own custom color table format.
 local createColor = function(...)
 	local tbl
 	if (select("#", ...) == 1) then
 		local old = ...
-		if (old.r) then 
+		if (old.r) then
 			tbl = {}
 			tbl[1] = old.r or 1
 			tbl[2] = old.g or 1
@@ -168,7 +185,7 @@ local createColor = function(...)
 		tbl = { ... }
 	end
 	-- Do NOT use a metatable, just embed.
-	for name,method in pairs(ColorTemplate) do 
+	for name,method in pairs(ColorTemplate) do
 		tbl[name] = method
 	end
 	if (#tbl == 3) then
@@ -215,28 +232,29 @@ Colors.class.MAGE = createColor(105/255, 204/255, 240/255)
 Colors.class.MONK = createColor(0/255, 255/255, 150/255)
 Colors.class.PALADIN = createColor(225/255, 160/255, 226/255)
 Colors.class.PRIEST = createColor(176/255, 200/255, 225/255)
-Colors.class.ROGUE = createColor(255/255, 225/255, 95/255) 
-Colors.class.SHAMAN = createColor(32/255, 122/255, 222/255) 
-Colors.class.WARLOCK = createColor(148/255, 130/255, 201/255) 
-Colors.class.WARRIOR = createColor(229/255, 156/255, 110/255) 
+Colors.class.ROGUE = createColor(255/255, 225/255, 95/255)
+Colors.class.SHAMAN = createColor(32/255, 122/255, 222/255)
+Colors.class.WARLOCK = createColor(148/255, 130/255, 201/255)
+Colors.class.WARRIOR = createColor(229/255, 156/255, 110/255)
 Colors.class.UNKNOWN = createColor(195/255, 202/255, 217/255)
 
 -- Button Creation Templates
 -----------------------------------------------------------------
 -- Sourced from FrameXML/BankFrame.lua
--- Bag containing the 7 (or 6 in classic) bank bag buttons. 
+-- Bag containing the 7 (or 6 in classic) bank bag buttons.
 local BANK_SLOT_CONTAINER = -4
 
 -- This one does not exist. We made it up.
 local BAG_SLOT_CONTAINER = -100
 
 -- Frame type of slot buttons.
-local BUTTON_TYPE = (IsClassic or IsTBC) and "Button" or "ItemButton" 
+-- *the classics have yet to include the ItemButton frametype.
+local BUTTON_TYPE = USE_OLD_API and "Button" or "ItemButton"
 
 -- Frame template of itembuttons in each bagType.
--- This table will have both the bagTypes and all bagIDs as keys, 
+-- This table will have both the bagTypes and all bagIDs as keys,
 -- making it a good tool to compare slot button compatibility on bagID changes.
--- Since these templates can only be set on itembutton creation, 
+-- Since these templates can only be set on itembutton creation,
 -- we can only ever change between bagIDs using the same button templates.
 local ButtonTemplates = {
 	Bag = "ContainerFrameItemButtonTemplate", -- bag itembutton
@@ -247,21 +265,21 @@ local ButtonTemplates = {
 	BankSlot = "BankItemButtonBagTemplate" -- equippable bank container slot
 }
 
--- Localized display names for the bags. 
--- Note that some names can be generated on-the-fly, 
+-- Localized display names for the bags.
+-- Note that some names can be generated on-the-fly,
 -- so we're intentionally avoiding to list a few here.
 local BagNames = { [BACKPACK_CONTAINER] = BACKPACK_TOOLTIP, [BANK_CONTAINER] = BANK }
 
 -- Simple lookup table to get bagType from a provided bagID.
-local BagTypesFromID = { 
-	[BACKPACK_CONTAINER] = "Bag", 
-	[BANK_CONTAINER] = "Bank", 
-	[BAG_SLOT_CONTAINER] = "BagSlot", 
-	[BANK_SLOT_CONTAINER] = "BankSlot" 
+local BagTypesFromID = {
+	[BACKPACK_CONTAINER] = "Bag",
+	[BANK_CONTAINER] = "Bank",
+	[BAG_SLOT_CONTAINER] = "BagSlot",
+	[BANK_SLOT_CONTAINER] = "BankSlot"
 }
 
 -- Setup all bagID lookup tables.
-local bagIDs = { BACKPACK_CONTAINER } -- indexed 
+local bagIDs = { BACKPACK_CONTAINER } -- indexed
 local isBagID = { [BACKPACK_CONTAINER] = true } -- hashed
 for id = BACKPACK_CONTAINER + 1, NUM_BAG_SLOTS do
 	isBagID[id] = true
@@ -272,7 +290,7 @@ end
 ButtonTemplates[BACKPACK_CONTAINER] = ButtonTemplates.Bag
 
 -- Setup all bankBagID lookup tables.
-local bankIDs = { BANK_CONTAINER } -- indexed 
+local bankIDs = { BANK_CONTAINER } -- indexed
 local isBankID = { [BANK_CONTAINER] = true } -- hashed
 for id = NUM_BAG_SLOTS + 1, NUM_BAG_SLOTS + NUM_BANKBAGSLOTS do
 	isBankID[id] = true
@@ -282,7 +300,7 @@ for id = NUM_BAG_SLOTS + 1, NUM_BAG_SLOTS + NUM_BANKBAGSLOTS do
 end
 ButtonTemplates[BANK_CONTAINER] = ButtonTemplates.Bank
 
--- The keyring only exists in classic, 
+-- The keyring only exists in classic,
 -- but we leave the empty tables for a simpler API.
 local isKeyRingID = {} -- hashed
 if (IsClassic or IsTBC) then
@@ -294,7 +312,7 @@ if (IsClassic or IsTBC) then
 	BagTypesFromID[KEYRING_CONTAINER] = "KeyRing"
 end
 
--- The reagant bank only exists in retail, 
+-- The reagant bank only exists in retail,
 -- but we leave the empty tables for a simpler API.
 local isReagentBankID = {} -- hashed
 if (IsRetail) then
@@ -306,18 +324,18 @@ if (IsRetail) then
 	BagTypesFromID[REAGENTBANK_CONTAINER] = "ReagentBank"
 end
 
--- Half-truths. We need numbers to index both. 
+-- Half-truths. We need numbers to index both.
 ButtonTemplates[BAG_SLOT_CONTAINER] = ButtonTemplates.BagSlot
 ButtonTemplates[BANK_SLOT_CONTAINER] = ButtonTemplates.BankSlot
 
 -- Utility Functions
 -----------------------------------------------------------------
--- Syntax check 
+-- Syntax check
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -393,7 +411,7 @@ Button.UnregisterEvent = function(self, event, func)
 			if events[i] == func then
 				table_remove(events, i)
 				if #events == 0 then
-					UnregisterEvent(self, event) 
+					UnregisterEvent(self, event)
 					break
 				end
 			end
@@ -402,7 +420,7 @@ Button.UnregisterEvent = function(self, event, func)
 end
 
 Button.UnregisterAllEvents = function(self)
-	if not Callbacks[self] then 
+	if not Callbacks[self] then
 		return
 	end
 	for event, funcs in pairs(Callbacks[self]) do
@@ -474,8 +492,8 @@ Button.SetHeight = function(self, ...)
 end
 
 -- ItemButton ID Handling
--- Don't use these for blizz buttons, 
--- we should just let them keep what they have. 
+-- Don't use these for blizz buttons,
+-- we should just let them keep what they have.
 ----------------------------------------------------
 -- Set the bagID of the button.
 -- Only accept changes within the same bagType range,
@@ -521,21 +539,21 @@ end
 
 -- Retrieve the button's current bagID.
 -- This method is meant for 3rd party access,
--- our own method uses button flags for faster parsing. 
+-- our own method uses button flags for faster parsing.
 Button.GetBagID = function(self)
 	return self.bagID
 end
 
 -- Retrieve the button's current slotID.
 -- This method is meant for 3rd party access,
--- our own method uses button flags for faster parsing. 
+-- our own method uses button flags for faster parsing.
 Button.GetSlotID = function(self)
 	return self.slotID
 end
 
 -- Retrieve the button's current bagID and slotID.
 -- This method is meant for 3rd party access,
--- our own method uses button flags for faster parsing. 
+-- our own method uses button flags for faster parsing.
 Button.GetBagAndSlotID = function(self)
 	return self.bagID, self.slotID
 end
@@ -557,7 +575,7 @@ Button.UpdateCount = function(self)
 			if (previous) and ((previous > 99) and (previous <= 999)) then
 				self.Count:SetFontObject(NumberFontNormal)
 			end
-			self.Count:SetText("*")  
+			self.Count:SetText("*")
 		elseif (count > 99) then
 			if (not previous) or ((previous <= 99) or (previous > 999)) then
 				self.Count:SetFontObject(NumberFontSmall)
@@ -578,7 +596,7 @@ end
 -- Updates item level.
 Button.UpdateItemLevel = function(self)
 	if (self.isBattlePet) -- Always show the level of battle pets.
-	or ((self.itemRarity) and (self.itemRarity > 1) and (self.itemLevel) and (self.itemLevel > 1)) then 
+	or ((self.itemRarity) and (self.itemRarity > 1) and (self.itemLevel) and (self.itemLevel > 1)) then
 		local color
 		if (self.isLocked) then
 			color = self.colors.quest.gray
@@ -643,8 +661,8 @@ end
 
 -- Updates the junk coin icon of a slot button.
 Button.UpdateJunk = function(self)
-	-- This method requires the 'isMerchantFrameShown' flag to be set correctly, 
-	-- so it is important that we only call this method after it has been updated, 
+	-- This method requires the 'isMerchantFrameShown' flag to be set correctly,
+	-- so it is important that we only call this method after it has been updated,
 	-- and also that we specifically recall this method after changes to that flag.
 	if (self.itemRarity) and (self.itemRarity == 0) and (not self.noValue) and (LibBagButton.isMerchantFrameShown) and (MerchantFrame.selectedTab == 1) then
 		self.CoinIcon:Show()
@@ -656,7 +674,7 @@ end
 Button.UpdateCooldown = function(self)
 end
 
--- All the following are applied to all button types, 
+-- All the following are applied to all button types,
 -- and thus should need to do relevant checks themselves.
 -----------------------------------------------------------------
 
@@ -784,22 +802,22 @@ end
 -- Basically a tooltip function that needs regular updates.
 -- Used only with OnUpdate, OnEnter and OnLeave.
 Button.OnUpdate = function(self)
-	-- Avoid nil bugs. 
+	-- Avoid nil bugs.
 	local hasSlot = self.bagID and self.slotID and self.hasItem
 
-	-- Is it a classic keyring? Add code. 
+	-- Is it a classic keyring? Add code.
 
-	-- If an item is transformed while hovering, 
+	-- If an item is transformed while hovering,
 	-- there will be a short moment when the button has no points it seems.
 	-- A better workaround with flags can be made, this is a hotfix.
 	local tooltip = self:GetTooltip()
 	if (hasSlot) then
 		local Item = LibBagButton:GetBlizzardContainerSlotCache(self.bagID, self.slotID)
 		if (Item) and (Item.itemName) and (self.UpdateTooltip) then -- (self:GetPoint()) not needed now?
-			-- Note that we are not using our available cache here, 
+			-- Note that we are not using our available cache here,
 			-- this is to avoid display bugs related to the repair cost of newly repaired items.
-			tooltip:SetSmartItemAnchor(self, tooltip.tooltipAnchorX or 4, tooltip.tooltipAnchorY or 0) 
-			tooltip:SetBagItem(self.bagID, self.slotID) 
+			tooltip:SetSmartItemAnchor(self, tooltip.tooltipAnchorX or 4, tooltip.tooltipAnchorY or 0)
+			tooltip:SetBagItem(self.bagID, self.slotID)
 		else
 			hasSlot = nil
 		end
@@ -814,7 +832,7 @@ Button.OnUpdate = function(self)
 
 	-- check for modified clicks, show compare tips if need be.
 	if (IsModifiedClick("COMPAREITEMS")) or (GetCVarBool("alwaysCompareItems")) then
-		-- Show compare item. 
+		-- Show compare item.
 		-- We will use our own system here.
 	end
 
@@ -856,7 +874,7 @@ Button.OnLeave = function(self)
 	end
 
 	if (not SpellIsTargeting()) then
-		ResetCursor()		
+		ResetCursor()
 	end
 end
 
@@ -866,7 +884,7 @@ end
 Button.OnPostClick = function(self)
 end
 
--- The button's actual event handler, 
+-- The button's actual event handler,
 -- as we are routing all our own callbacks to this one.
 local UpdateButton = function(self, event, ...)
 	local arg1, arg2 = ...
@@ -885,18 +903,18 @@ local UpdateButton = function(self, event, ...)
 	elseif (event == "ITEM_LOCK_CHANGED") then
 		-- Update item lock desaturation and darkening.
 		if (arg1 and arg2 and (self.bagID == arg1) and (self.slotID == arg2)) then
-	
+
 			-- Get the item lock status
 			local _, _, locked = GetContainerItemInfo(self.bagID, self.slotID)
 			self.isLocked = locked
-	
+
 			-- Update the icon.
 			self:UpdateIcon()
 			self:UpdateItemLevel()
 			self:UpdateItemBind()
 			self:UpdateJunk()
 			self:UpdateQuest()
-		
+
 			-- Run user post updates
 			if (self.PostUpdate) then
 				self:PostUpdate()
@@ -948,12 +966,12 @@ Button.OnHide = function(self)
 end
 
 Button.OnEvent = function(self, event, ...)
-	if (self:IsVisible() and Callbacks[self] and Callbacks[self][event]) then 
+	if (self:IsVisible() and Callbacks[self] and Callbacks[self][event]) then
 		local events = Callbacks[self][event]
 		for i = 1, #events do
 			events[i](self, event, ...)
 		end
-	end 
+	end
 end
 
 Button.GetTooltip = function(self)
@@ -998,7 +1016,7 @@ Container.Update = function(self)
 
 	-- Retrieve all buttons matching the container's bagType,
 	-- and insert them into our freshly wiped display cache.
-	local bagType = Containers[self] 
+	local bagType = Containers[self]
 	for i,bagID in ipairs(bagIDs) do
 		if (BagTypesFromID[bagID] == bagType) then
 			local container = LibBagButton:GetBlizzardContainerCache(bagID)
@@ -1033,7 +1051,7 @@ Container.Update = function(self)
 	-- Start ordering buttons
 		-- Add extra when needed
 		-- Hide empty buttons
-	
+
 	-- Update all visible buttons
 	for slot,button in pairs(self.buttons) do
 		if (button.isShown) then
@@ -1056,7 +1074,7 @@ Container.SpawnItemButton = function(self, ...)
 	end
 
 	-- Insert the virtual button slot object into the correct cache.
-	table_insert(self.buttons, button) 
+	table_insert(self.buttons, button)
 
 	return button
 end
@@ -1092,9 +1110,9 @@ LibBagButton.GetBagButtonCompareTooltips = function(self)
 			LibBagButton:GetTooltip("GP_BagButtonCompareTooltip2") or LibBagButton:CreateTooltip("GP_BagButtonCompareTooltip2")
 end
 
---[[-- 
+--[[--
 	local numberOfFreeSlots, bagType = GetContainerNumFreeSlots(bagID)
-	bagType = 2^(bitfield-1) 
+	bagType = 2^(bitfield-1)
 	(https://wow.gamepedia.com/ItemFamily)
 
 		bit category
@@ -1116,7 +1134,7 @@ end
 		24 	First Aid
 		25 	Jewelcrafting
 		26 	Skinning
-		27 	Tailoring 
+		27 	Tailoring
 --]]--
 
 -- Retrieve the existing or create a blank cache for this blizzard container.
@@ -1149,7 +1167,7 @@ LibBagButton.ClearBlizzardContainerSlot = function(self, bagID, slotID)
 	end
 end
 
--- Parse and cache a specific slot in a blizzard container. 
+-- Parse and cache a specific slot in a blizzard container.
 LibBagButton.ParseBlizzardContainerSlot = function(self, bagID, slotID, forceUpdate)
 
 	local isQuestItem, questID, isActive
@@ -1163,7 +1181,7 @@ LibBagButton.ParseBlizzardContainerSlot = function(self, bagID, slotID, forceUpd
 		-- or create an empty cache table if none exist.
 		local Item = self:GetBlizzardContainerSlotCache(bagID, slotID)
 
-		-- Compare the cache's itemlink to the blizzard itemlink, 
+		-- Compare the cache's itemlink to the blizzard itemlink,
 		-- and update or retrieve the contents to our cache if need be.
 		if (Item.itemLink ~= itemLink) or (forceUpdate) then
 
@@ -1173,13 +1191,13 @@ LibBagButton.ParseBlizzardContainerSlot = function(self, bagID, slotID, forceUpd
 			Item.itemLink = itemLink
 
 
-			if (Item.itemName) then 
+			if (Item.itemName) then
 
 				-- No quest item info in classic
 				if (IsRetail) then
 					isQuestItem, questID, isActive = GetContainerItemQuestInfo(bagID, slotID)
 				end
-				
+
 				Item.isUsable = IsUsableItem(Item.itemID)
 				Item.isQuestItem = isQuestItem or (Item.itemClassID == LE_ITEM_CLASS_QUESTITEM)
 				Item.isQuestActive = isActive
@@ -1195,7 +1213,7 @@ LibBagButton.ParseBlizzardContainerSlot = function(self, bagID, slotID, forceUpd
 					QueuedContainerIDs[bagID][slotID] = itemID
 				end
 				self:RegisterEvent("GET_ITEM_INFO_RECEIVED", "OnEvent")
-	
+
 				-- Use the client-only API for faster lookups here
 				Item.itemID,
 				Item.itemType,
@@ -1203,14 +1221,14 @@ LibBagButton.ParseBlizzardContainerSlot = function(self, bagID, slotID, forceUpd
 				Item.itemEquipLoc,
 				Item.itemIcon,
 				Item.itemClassID,
-				Item.itemSubClassID = GetItemInfoInstant(itemLink) 
+				Item.itemSubClassID = GetItemInfoInstant(itemLink)
 
 			end
 		end
 
-		-- This is implicit by the existence of all the other values, 
+		-- This is implicit by the existence of all the other values,
 		-- but for the sake of semantics and simplicity, we use a separate value for this.
-		-- We need to do this AFTER the tooltip parsing, as that clears all entries. 
+		-- We need to do this AFTER the tooltip parsing, as that clears all entries.
 		Item.hasItem = true
 
 	else
@@ -1219,7 +1237,7 @@ LibBagButton.ParseBlizzardContainerSlot = function(self, bagID, slotID, forceUpd
 	end
 end
 
--- Parse and cache all the slots of a blizzard container, and the container itself. 
+-- Parse and cache all the slots of a blizzard container, and the container itself.
 LibBagButton.ParseSingleBlizzardContainer = function(self, bagID, forceUpdate)
 
 	local numberOfSlots = GetContainerNumSlots(bagID) or 0 -- returns 0 before the BAG_UPDATE for the bagID has fired.
@@ -1228,7 +1246,7 @@ LibBagButton.ParseSingleBlizzardContainer = function(self, bagID, forceUpdate)
 	if (numberOfSlots > 0) then
 		local cache = self:GetBlizzardContainerCache(bagID)
 		cache.bagType = bagType or 0 -- any other value than 0 means profession bag.
-		cache.freeSlots = numberOfFreeSlots 
+		cache.freeSlots = numberOfFreeSlots
 		cache.totalSlots = numberOfSlots
 		cache.name = BagNames[bagID] or GetBagName(bagID)
 
@@ -1238,7 +1256,7 @@ LibBagButton.ParseSingleBlizzardContainer = function(self, bagID, forceUpdate)
 	end
 end
 
--- Parse and cache specific multiple blizzard containers. 
+-- Parse and cache specific multiple blizzard containers.
 -- Note that this method always uses the forceUpdate flag.
 LibBagButton.ParseMultipleBlizzardContainers = function(self, ...)
 	local bagID
@@ -1255,7 +1273,7 @@ end
 -- Suppresses the blizzard method if 'true' is returned.
 LibBagButton.ShowBags = function(self, forceUpdate)
 	-- Set this flag before we start showing.
-	-- The idea is to prevent buttons from calling this function, 
+	-- The idea is to prevent buttons from calling this function,
 	-- as button updates are many and frequent, and we want low performance impact.
 	self.isMerchantFrameShown = MerchantFrame:IsShown()
 	local hasBags
@@ -1287,8 +1305,8 @@ end
 -- *This one is called when Esc is clicked and bags forcehidden.
 -- Suppresses the blizzard method if 'true' is returned.
 LibBagButton.HideBags = function(self, forceUpdate)
-	--if (self:IsAtBank()) then 
-	--	CloseBankFrame() 
+	--if (self:IsAtBank()) then
+	--	CloseBankFrame()
 	--end
 
 	local hasBags
@@ -1319,11 +1337,11 @@ LibBagButton.ToggleBags = function(self, ...)
 	for container, bagType in pairs(Containers) do
 		if (bagType == "Bag") then
 			-- We have bag containers.
-			hasBags = true 
-			if (container:IsShown()) then 
+			hasBags = true
+			if (container:IsShown()) then
 				-- they are visible, so this is a hide operation.
-				shouldHide = true 
-				-- If both flags are true, 
+				shouldHide = true
+				-- If both flags are true,
 				-- no further iteration is needed.
 				if (hasBags) then
 					break
@@ -1332,7 +1350,7 @@ LibBagButton.ToggleBags = function(self, ...)
 		end
 	end
 	-- Set this flag before we start toggling.
-	-- The idea is to prevent buttons from calling this function, 
+	-- The idea is to prevent buttons from calling this function,
 	-- as button updates are many and frequent, and we want low performance impact.
 	if (not shouldHide) then
 		self.isMerchantFrameShown = MerchantFrame:IsShown()
@@ -1369,7 +1387,7 @@ LibBagButton.ToggleBags = function(self, ...)
 end
 
 -- Displays your bank frames.
--- Will use stored information when available, 
+-- Will use stored information when available,
 -- making it possible to track bank contents when not at the bank.
 -- TODO: Add API to assign a cache at container creation!
 LibBagButton.ShowBank = function(self)
@@ -1383,7 +1401,7 @@ end
 LibBagButton.ToggleBank = function(self)
 end
 
--- Global function names, 
+-- Global function names,
 -- and our library equivalents.
 -- Note: We should check for library version if we change this!
 local methodByGlobal = {
@@ -1395,9 +1413,9 @@ local methodByGlobal = {
 	["ToggleAllBags"] = "ToggleBags"
 }
 
--- Can't replace these, that'll backtrack to ToggleAllBags, 
--- and by association taint the click function of the item buttons in the bag, 
--- making the game block /use attempts from items appearing in your bags during combat. 
+-- Can't replace these, that'll backtrack to ToggleAllBags,
+-- and by association taint the click function of the item buttons in the bag,
+-- making the game block /use attempts from items appearing in your bags during combat.
 -- Fun, right?
 local hooksByGlobal = {
 	["CloseBackpack"] = "HideBags",
@@ -1413,8 +1431,8 @@ LibBagButton.HookBlizzardBagFunctions = function(self)
 	--BankFrame:SetScript("OnHide", nil)
 	--BankFrame:Hide()
 
-	-- Replace the global funcs, or update the replacements 
-	-- if this was a library upgrade. 
+	-- Replace the global funcs, or update the replacements
+	-- if this was a library upgrade.
 	-- Note: We should check for library version if we change this!
 	for globalName,method in pairs(methodByGlobal) do
 		local globalFunc = _G[globalName]
@@ -1438,7 +1456,7 @@ LibBagButton.HookBlizzardBagFunctions = function(self)
 		local globalFunc = _G[globalName]
 		if (globalFunc) then
 			local method = method
-			LibBagButton:SetSecureHook(globalName, function(...) 
+			LibBagButton:SetSecureHook(globalName, function(...)
 				if (LibBagButton.IsBlizzardHooked) then
 					return LibBagButton[method](LibBagButton, ...)
 				end
@@ -1488,7 +1506,7 @@ LibBagButton.OnEvent = function(self, event, ...)
 		self:HideBank()
 		self:HideBags()
 		self:SendMessage("GP_BANKFRAME_CLOSED")
-		
+
 	elseif (event == "BAG_OPEN") then
 		local bagID = ...
 		if (bagID) and (BagTypesFromID[bagID]) then
@@ -1504,7 +1522,7 @@ LibBagButton.OnEvent = function(self, event, ...)
 	elseif (event == "BAG_UPDATE") then
 		local bagID = ...
 
-		-- This is where the actual magic happens. 
+		-- This is where the actual magic happens.
 		self.parsingRequired = true
 		--self:ParseSingleBlizzardContainer(bagID, true)
 		self:ParseSingleBlizzardContainer(bagID)
@@ -1543,7 +1561,7 @@ LibBagButton.OnEvent = function(self, event, ...)
 			for slotID, itemID in pairs(QueuedContainerIDs[bagID]) do
 				-- If anything is found, just return.
 				-- We still need the event.
-				return 
+				return
 			end
 		end
 		-- Kill off the event if no more itemslots are queued
@@ -1573,7 +1591,7 @@ LibBagButton.OnEvent = function(self, event, ...)
 		self:ParseMultipleBlizzardContainers(unpack(bagIDs))
 
 		-- Fire off some semi-fake events.
-		-- The idea is to have the front-end only rely on custom messages, 
+		-- The idea is to have the front-end only rely on custom messages,
 		-- so we need these here instead of the Blizzard events.
 		for _,bagID in ipairs(bagIDs) do
 			self:SendMessage("GP_BAG_UPDATE", bagID)
@@ -1585,7 +1603,7 @@ LibBagButton.OnEvent = function(self, event, ...)
 			for bagID in pairs(QueuedContainerIDs) do
 				for slotID, itemID in pairs(QueuedContainerIDs[bagID]) do
 					-- If anything is found, break here
-					stillWaiting = true 
+					stillWaiting = true
 				end
 			end
 		end
@@ -1600,7 +1618,7 @@ end
 
 LibBagButton.OnMerchantFrameUpdate = function(self, id, ...)
 	if (MerchantFrame:IsShown()) then
-		-- The idea is to prevent buttons from calling the above function, 
+		-- The idea is to prevent buttons from calling the above function,
 		-- as button updates are many and frequent, and we want low performance impact.
 		LibBagButton.isMerchantFrameShown = true
 		if (LibBagButton.selectedMerchantTab ~= MerchantFrame.selectedTab) then
@@ -1620,7 +1638,7 @@ LibBagButton.Start = function(self)
 	-- Hook the blizzard bag toggling.
 	-- It is preferable to get this done as early as possible.
 	self:HookBlizzardBagFunctions()
-	
+
 	-- Always kill off all events here.
 	self:UnregisterAllEvents()
 
@@ -1629,7 +1647,7 @@ LibBagButton.Start = function(self)
 
 	-- Could be a library upgrade, or forced restart.
 	if (IsLoggedIn()) then
-		-- If we restarted the engine after login, 
+		-- If we restarted the engine after login,
 		-- we need to manually trigger this event as though
 		-- it was the initial login, to enable event tracking.
 		self:OnEvent("PLAYER_ENTERING_WORLD", true)
@@ -1641,7 +1659,7 @@ LibBagButton.Start = function(self)
 	local tooltip = self:GetBagButtonTooltip()
 	tooltip:SetCValue("backdrop", {
 		bgFile = [[Interface\Tooltips\UI-Tooltip-Background]],
-		edgeFile = [[Interface\Tooltips\UI-Tooltip-Border]], 
+		edgeFile = [[Interface\Tooltips\UI-Tooltip-Border]],
 		edgeSize = 16,
 		insets = {
 			left = 3.5,
@@ -1683,17 +1701,17 @@ LibBagButton.SpawnItemContainer = function(self, ...)
 		end
 	end)
 
-	-- Allow clicking the frame to raise it, the WorldMapFrame does it too. 
+	-- Allow clicking the frame to raise it, the WorldMapFrame does it too.
 	-- Requires that they have the same strata.
 	frame:SetFrameStrata(WorldMapFrame:GetFrameStrata() or "MEDIUM")
-	frame:SetToplevel(true) 
+	frame:SetToplevel(true)
 	frame:EnableMouse(true)
 	frame:Hide()
 
 	frame.buttons = {}
 	frame.slots = {}
 
-	-- It just makes life easier if we simply hide it, 
+	-- It just makes life easier if we simply hide it,
 	-- or we will have to forceUpdate everything on zoning.
 	frame:RegisterEvent("PLAYER_ENTERING_WORLD", frame.Hide, true)
 
@@ -1761,14 +1779,14 @@ LibBagButton.SpawnItemButton = function(self, ...)
 	button.slotID = slotID
 	button.colors = Colors
 
-	-- This is basically a bag for all intents and purposes, 
-	-- except that it totally isn't that at all. 
+	-- This is basically a bag for all intents and purposes,
+	-- except that it totally isn't that at all.
 	-- We just need a parent for the slot with and ID for the template to work.
 	parent = button:CreateFrame("Frame")
 	parent:EnableMouse(false)
 	parent:SetID(bagID or 100)
 
-	-- Need to clear away blizzard layers from this one, 
+	-- Need to clear away blizzard layers from this one,
 	-- as they interfere with anything we do.
 	slot = self:GetBlizzardSlotButton(bagID, slotID) or parent:CreateFrame(BUTTON_TYPE, nil, ButtonTemplates[bagType])
 	slot:SetParent(parent) -- in case it's a blizz button. need to grab it.
@@ -1778,7 +1796,7 @@ LibBagButton.SpawnItemButton = function(self, ...)
 	slot:EnableMouse(true)
 
 	-- BlizzKill
-	-- We're oversimplifying this 
+	-- We're oversimplifying this
 	-- by just disabling all the draw layers.
 	slot.UpdateTooltip = nil
 	slot:DisableDrawLayer("BACKDROP")
@@ -1786,7 +1804,7 @@ LibBagButton.SpawnItemButton = function(self, ...)
 	slot:DisableDrawLayer("ARTWORK")
 	slot:DisableDrawLayer("OVERLAY")
 
-	-- Sometimes on the first login on the initial startup of the game, 
+	-- Sometimes on the first login on the initial startup of the game,
 	-- these aren't set so hiding the textures will cause a nil bug.
 	slot:SetNormalTexture(nil)
 	slot:SetPushedTexture(nil)
@@ -1803,7 +1821,7 @@ LibBagButton.SpawnItemButton = function(self, ...)
 	slot:SetScript("PreClick", function(slot) button:OnPreClick() end)
 	slot:HookScript("OnClick", function(slot) button:OnPostClick() end)
 
-	-- We'll just let the button object handle this instead, 
+	-- We'll just let the button object handle this instead,
 	-- as the visibilities should be linked anyway.
 	--slot:SetScript("OnHide", function(slot) button:OnHide() end)
 	--slot:SetScript("OnShow", function(slot) button:OnShow() end)
@@ -1815,12 +1833,12 @@ LibBagButton.SpawnItemButton = function(self, ...)
 	button:SetScript("OnShow", button.OnShow)
 	button:SetScript("OnEvent", button.OnEvent)
 
-	-- Cache up our elements 
+	-- Cache up our elements
 	ButtonParents[button] = parent
 	ButtonSlots[button] = slot
 
 	-- Insert the virtual button slot object into the correct cache.
-	table_insert(Buttons[bagType], button) 
+	table_insert(Buttons[bagType], button)
 
 	-- Button Scaffolds
 	-----------------------------------------------------------
@@ -1831,7 +1849,7 @@ LibBagButton.SpawnItemButton = function(self, ...)
 
 	-- Button Layers
 	-----------------------------------------------------------
-	-- Slot backdrop visible on empty buttons 
+	-- Slot backdrop visible on empty buttons
 	local slot = button:CreateTexture()
 	slot:SetDrawLayer("BACKGROUND", -1)
 	slot:SetAllPoints()
@@ -1915,11 +1933,11 @@ LibBagButton.GetFreeBagSpaceInBag = function(self, bagID)
 end
 
 -- Returns the free bag space.
--- @input <number> query a certain bagType only. 
--- @return <number,number> currentFree, totalFree 
+-- @input <number> query a certain bagType only.
+-- @return <number,number> currentFree, totalFree
 LibBagButton.GetFreeBagSpace = function(self, bagType)
 	local freeSlots, totalSlots = 0, 0
-	if (not bagType) then 
+	if (not bagType) then
 		bagType = 0 -- 0 means regular non-profession containers
 	end
 	if (not LibBagButton.freeSlots) then
@@ -1932,7 +1950,7 @@ LibBagButton.GetFreeBagSpace = function(self, bagType)
 		for i,bagID in pairs(bagIDs) do
 			if (BagTypesFromID[bagID] == "Bag") then
 				local cache = Contents[bagID]
-				if (cache) and (cache.bagType == bagType) then 
+				if (cache) and (cache.bagType == bagType) then
 					totalSlots = totalSlots + cache.totalSlots
 					freeSlots = freeSlots + cache.freeSlots
 				end
@@ -1942,16 +1960,16 @@ LibBagButton.GetFreeBagSpace = function(self, bagType)
 		end
 		LibBagButton.parsingRequired = nil
 	end
-	return LibBagButton.freeSlots[bagType] or 0, LibBagButton.totalSlots[bagType] or 0	
+	return LibBagButton.freeSlots[bagType] or 0, LibBagButton.totalSlots[bagType] or 0
 end
 
 -- Returns the free bank space.
 -- *Will returned a cached value if not currently at the bank,
--- @input <number> query a certain bagType only. 
--- @return <number,number> currentFree, totalFree 
+-- @input <number> query a certain bagType only.
+-- @return <number,number> currentFree, totalFree
 LibBagButton.GetFreeBankSpace = function(self, bagType)
 	local freeSlots, totalSlots = 0, 0
-	if (not bagType) then 
+	if (not bagType) then
 		bagType = 0 -- 0 means regular non-profession containers
 	end
 	if (not LibBagButton.freeBankSlots) then
@@ -1964,7 +1982,7 @@ LibBagButton.GetFreeBankSpace = function(self, bagType)
 		for i,bagID in pairs(bankIDs) do
 			if (BagTypesFromID[bagID] == "Bank") then
 				local cache = Contents[bagID]
-				if (cache) and (cache.bagType == bagType) then 
+				if (cache) and (cache.bagType == bagType) then
 					totalSlots = totalSlots + cache.totalSlots
 					freeSlots = freeSlots + cache.freeSlots
 				end
@@ -2035,7 +2053,7 @@ local embedMethods = {
 	GetIteratorForBankIDs = true,
 	GetIteratorForReagentBankIDs = true,
 	GetFreeBagSpace = true,
-	GetFreeBagSpaceInBag = true, 
+	GetFreeBagSpaceInBag = true,
 	GetFreeBankSpace = true,
 	IsAnyBagOpen = true,
 	IsAtBank = true,
diff --git a/SimpleClassPower/back-end/libraries/blizzard.lua b/SimpleClassPower/back-end/libraries/blizzard.lua
index 362f71c..c1c8ff0 100644
--- a/SimpleClassPower/back-end/libraries/blizzard.lua
+++ b/SimpleClassPower/back-end/libraries/blizzard.lua
@@ -1,5 +1,5 @@
-local LibBlizzard = Wheel:Set("LibBlizzard", 103)
-if (not LibBlizzard) then 
+local LibBlizzard = Wheel:Set("LibBlizzard", 113)
+if (not LibBlizzard) then
 	return
 end
 
@@ -52,9 +52,13 @@ local TargetofTarget_Update = TargetofTarget_Update
 local UIParent = UIParent
 
 -- Constants for client version
+local ClientVersion = LibClientBuild:GetCurrentClientVersion()
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
+local IsDragonflight = LibClientBuild:IsDragonflight()
 
 LibBlizzard.embeds = LibBlizzard.embeds or {}
 LibBlizzard.queue = LibBlizzard.queue or {}
@@ -82,12 +86,12 @@ local UIWidgetDependency = {} -- Dependencies, applies to all
 
 -- Utility Functions
 -----------------------------------------------------------------
--- Syntax check 
+-- Syntax check
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -95,8 +99,8 @@ local check = function(value, num, ...)
 	error(string_format("Bad argument #%.0f to '%s': %s expected, got %s", num, name, types, type(value)), 3)
 end
 
--- Proxy function to retrieve the actual frame whether 
--- the input is a frame or a global frame name 
+-- Proxy function to retrieve the actual frame whether
+-- the input is a frame or a global frame name
 local getFrame = function(baseName)
 	if (type(baseName) == "string") then
 		return _G[baseName]
@@ -172,304 +176,225 @@ local killUnitFrame = function(baseName, keepParent, keepEvents, keepVisible)
 	end
 end
 
--- Widget Pool
------------------------------------------------------------------
--- ActionBars (Classic)
-UIWidgetsDisable["ActionBars"] = (IsClassic or IsTBC) and function(self)
-
-	for _,object in pairs({
-		"MainMenuBarVehicleLeaveButton",
-		"MainMenuExpBar",
-		"PetActionBarFrame",
-		"ReputationWatchBar",
-		"StanceBarFrame",
-		"TutorialFrameAlertButton1",
-		"TutorialFrameAlertButton2",
-		"TutorialFrameAlertButton3",
-		"TutorialFrameAlertButton4",
-		"TutorialFrameAlertButton5",
-		"TutorialFrameAlertButton6",
-		"TutorialFrameAlertButton7",
-		"TutorialFrameAlertButton8",
-		"TutorialFrameAlertButton9",
-		"TutorialFrameAlertButton10",
-	}) do 
-		if (_G[object]) then 
-			_G[object]:UnregisterAllEvents()
-		else 
-			if (self.AddDebugMessageFormatted) then
-				self:AddDebugMessageFormatted(string_format("LibBlizzard: The object '%s' wasn't found, tell Goldpaw!", object))
-			end
-		end
-	end 
-	for _,object in pairs({
-		"FramerateLabel",
-		"FramerateText",
-		"MainMenuBarArtFrame",
-		"MainMenuBarOverlayFrame",
-		"MainMenuExpBar",
-		"MainMenuBarVehicleLeaveButton",
-		"MultiBarBottomLeft",
-		"MultiBarBottomRight",
-		"MultiBarLeft",
-		"MultiBarRight",
-		"PetActionBarFrame",
-		"ReputationWatchBar",
-		"StanceBarFrame",
-		"StreamingIcon"
-	}) do 
-		if (_G[object]) then 
-			_G[object]:SetParent(UIHider)
-		else 
-			if (self.AddDebugMessageFormatted) then
-				self:AddDebugMessageFormatted(string_format("LibBlizzard: The object '%s' wasn't found, tell Goldpaw!", object))
-			end
+local handleActionBar = function(frame, clearEvents, reanchor, noAnchorChanges)
+	if (frame) then
+		if (clearEvents) then
+			frame:UnregisterAllEvents()
 		end
-	end 
-	for _,object in pairs({
-		"MainMenuBarArtFrame",
-		"PetActionBarFrame",
-		"StanceBarFrame"
-	}) do 
-		if (_G[object]) then 
-			_G[object]:Hide()
-		else 
-			if (self.AddDebugMessageFormatted) then
-				self:AddDebugMessageFormatted(string_format("LibBlizzard: The object '%s' wasn't found, tell Goldpaw!", object))
+		frame:Hide()
+		frame:SetParent(UIHider)
+
+		-- Setup faux anchors so the frame position data returns valid
+		if (reanchor) and (not noAnchorChanges) then
+			local left, right, top, bottom = frame:GetLeft(), frame:GetRight(), frame:GetTop(), frame:GetBottom()
+			frame:ClearAllPoints()
+			if (left) and (right) and (top) and (bottom) then
+				frame:SetPoint("TOPLEFT", UIParent, "BOTTOMLEFT", left, top)
+				frame:SetPoint("BOTTOMRIGHT", UIParent, "BOTTOMLEFT", right, bottom)
+			else
+				frame:SetPoint("TOPLEFT", UIParent, "BOTTOMLEFT", 10, 10)
+				frame:SetPoint("BOTTOMRIGHT", UIParent, "BOTTOMLEFT", 20, 20)
 			end
+		elseif (not noAnchorChanges) then
+			frame:ClearAllPoints()
 		end
-	end 
-	for _,object in pairs({
-		"ActionButton", 
-		"MultiBarBottomLeftButton", 
-		"MultiBarBottomRightButton", 
-		"MultiBarRightButton",
-		"MultiBarLeftButton"
-	}) do 
-		for i = 1,NUM_ACTIONBAR_BUTTONS do
-			local button = _G[object..i]
-			button:Hide()
-			button:UnregisterAllEvents()
-			button:SetAttribute("statehidden", true)
-		end
-	end 
-
-	MainMenuBar:EnableMouse(false)
-	MainMenuBar:SetAlpha(0)
-	MainMenuBar:UnregisterEvent("DISPLAY_SIZE_CHANGED")
-	MainMenuBar:UnregisterEvent("UI_SCALE_CHANGED")
-	MainMenuBar.slideOut:GetAnimations():SetOffset(0,0)
+	end
+end
 
-	-- Gets rid of the loot anims
-	MainMenuBarBackpackButton:UnregisterEvent("ITEM_PUSH") 
-	for slot = 0,3 do
-		_G["CharacterBag"..slot.."Slot"]:UnregisterEvent("ITEM_PUSH") 
+-- Removes a frame from the Dragonflight layout system
+local handleManagedFrame = function(frame)
+	if (frame and frame.layoutParent) then
+		frame:SetScript("OnShow", nil) -- prevents the frame from being added
+		frame:OnHide() -- calls the script to remove the frame
+		-- The following is called by the method above,
+		-- with a little luck, this will be true for all managed frames.
+		--frame.layoutParent:RemoveManagedFrame(frame)
 	end
+end
 
-	UIPARENT_MANAGED_FRAME_POSITIONS["MainMenuBar"] = nil
-	UIPARENT_MANAGED_FRAME_POSITIONS["StanceBarFrame"] = nil
-	UIPARENT_MANAGED_FRAME_POSITIONS["PETACTIONBAR_YPOS"] = nil
-	UIPARENT_MANAGED_FRAME_POSITIONS["MultiCastActionBarFrame"] = nil
-	UIPARENT_MANAGED_FRAME_POSITIONS["MULTICASTACTIONBAR_YPOS"] = nil
+-- Widget Pool
+-----------------------------------------------------------------
+UIWidgetsDisable["ActionBars"] = function(self)
 
-	--UIWidgetsDisable["ActionBarsMainBar"](self)
-	--UIWidgetsDisable["ActionBarsBagBarAnims"](self)
-end
+	local NPE_LoadUI = function(self)
+		if not (Tutorials and Tutorials.AddSpellToActionBar) then return end
 
--- ActionBars (Retail)
-or IsRetail and function(self)
+		-- Action Bar drag tutorials
+		Tutorials.AddSpellToActionBar:Disable()
+		Tutorials.AddClassSpellToActionBar:Disable()
 
-	local SpellBookTooltipOnUpdate, SpellButtonOnEnter, SpellButtonOnLeave, UpdateSpellBookTooltip
-	local SpellBookTooltip = GP_SpellBookTooltip or CreateFrame("GameTooltip", "GP_SpellBookTooltip", UIParent, "GameTooltipTemplate, BackdropTemplate")
+		-- these tutorials rely on finding valid action bar buttons, and error otherwise
+		Tutorials.Intro_CombatTactics:Disable()
 
-	SpellBookTooltipOnUpdate = function(self, elapsed)
-		self.elapsed = (self.elapsed or 0) + elapsed
-		if (self.elapsed < TOOLTIP_UPDATE_TIME) then 
-			return 
-		end
-		self.elapsed = 0
-		local owner = self:GetOwner()
-		if (owner) then 
-			SpellButtonOnEnter(owner) 
-		end
+		-- enable spell pushing because the drag tutorial is turned off
+		Tutorials.AutoPushSpellWatcher:Complete()
 	end
 
-	SpellButtonOnEnter = function(self, _, tooltip)
-		-- Copied from SpellBookFrame to remove:
-		--- ActionBarController_UpdateAll, PetActionHighlightMarks, and BarHighlightMarks
-		if (not tt) then 
-			tooltip = SpellBookTooltip 
-		end
-		if (tooltip:IsForbidden()) then 
-			return 
-		end
-		tooltip:SetOwner(self, "ANCHOR_RIGHT")
+	-- Dragonflight
+	if (ClientVersion >= 100000) then
 
-		local slot = SpellBook_GetSpellBookSlot(self)
-		local needsUpdate = tooltip:SetSpellBookItem(slot, SpellBookFrame.bookType)
+		handleActionBar(MultiBarBottomLeft, true)
+		handleActionBar(MultiBarBottomRight, true)
+		handleActionBar(MultiBarLeft, true)
+		handleActionBar(MultiBarRight, true)
 
-		ClearOnBarHighlightMarks()
-		ClearPetActionHighlightMarks()
+		-- Hide MultiBar Buttons, but keep the bars alive
+		for i=1,12 do
+			_G["ActionButton" .. i]:Hide()
+			_G["ActionButton" .. i]:UnregisterAllEvents()
+			_G["ActionButton" .. i]:SetAttribute("statehidden", true)
 
-		local slotType, actionID = GetSpellBookItemInfo(slot, SpellBookFrame.bookType)
-		if (slotType == "SPELL") then
-			UpdateOnBarHighlightMarksBySpell(actionID)
+			_G["MultiBarBottomLeftButton" .. i]:Hide()
+			_G["MultiBarBottomLeftButton" .. i]:UnregisterAllEvents()
+			_G["MultiBarBottomLeftButton" .. i]:SetAttribute("statehidden", true)
 
-		elseif (slotType == "FLYOUT") then
-			UpdateOnBarHighlightMarksByFlyout(actionID)
+			_G["MultiBarBottomRightButton" .. i]:Hide()
+			_G["MultiBarBottomRightButton" .. i]:UnregisterAllEvents()
+			_G["MultiBarBottomRightButton" .. i]:SetAttribute("statehidden", true)
 
-		elseif (slotType == "PETACTION") then
-			UpdateOnBarHighlightMarksByPetAction(actionID)
-			UpdatePetActionHighlightMarks(actionID)
-		end
+			_G["MultiBarRightButton" .. i]:Hide()
+			_G["MultiBarRightButton" .. i]:UnregisterAllEvents()
+			_G["MultiBarRightButton" .. i]:SetAttribute("statehidden", true)
 
-		local highlight = self.SpellHighlightTexture
-		if ((highlight) and (highlight:IsShown())) then
-			local color = LIGHTBLUE_FONT_COLOR
-			tooltip:AddLine(SPELLBOOK_SPELL_NOT_ON_ACTION_BAR, color.r, color.g, color.b)
+			_G["MultiBarLeftButton" .. i]:Hide()
+			_G["MultiBarLeftButton" .. i]:UnregisterAllEvents()
+			_G["MultiBarLeftButton" .. i]:SetAttribute("statehidden", true)
 		end
 
-		if (tooltip == SpellBookTooltip) then
-			tooltip:SetScript("OnUpdate", (needsUpdate and SpellBookTooltipOnUpdate) or nil)
+		--MainMenuBar:UnregisterAllEvents()
+		MainMenuBar:SetParent(UIHider)
+		MainMenuBar:Hide()
+		--MainMenuBar:EnableMouse(false)
+
+		handleActionBar(MicroButtonAndBagsBar, false, false, true)
+		handleActionBar(StanceBar, true)
+		handleActionBar(PossessActionBar, true)
+		handleActionBar(MultiCastActionBarFrame, false, false, true)
+		handleActionBar(PetActionBar, true)
+		handleActionBar(StatusTrackingBarManager, false)
+
+		if (IsAddOnLoaded("Blizzard_NewPlayerExperience")) then
+			NPE_LoadUI()
+		elseif (_G.NPE_LoadUI ~= nil) then
+			hooksecurefunc("NPE_LoadUI", NPE_LoadUI)
 		end
-
-		tooltip:Show()
 	end
 
-	UpdateSpellBookTooltip = function(self, event)
-		-- only need to check the shown state when its not called from TT:MODIFIER_STATE_CHANGED which already checks the shown state
-		local button = (not event or SpellBookTooltip:IsShown()) and SpellBookTooltip:GetOwner()
-		if button then SpellButtonOnEnter(button) end
-	end
+	-- Shadowlands, Wrath, Vanilla
+	if (ClientVersion < 100000) then
 
-	SpellButtonOnLeave = function()
-		ClearOnBarHighlightMarks()
-		ClearPetActionHighlightMarks()
+		MultiBarBottomLeft:SetParent(UIHider)
+		MultiBarBottomRight:SetParent(UIHider)
+		MultiBarLeft:SetParent(UIHider)
+		MultiBarRight:SetParent(UIHider)
 
-		SpellBookTooltip:Hide()
-		SpellBookTooltip:SetScript("OnUpdate", nil)
-	end
+		-- Hide MultiBar Buttons, but keep the bars alive
+		for i=1,12 do
+			_G["ActionButton" .. i]:Hide()
+			_G["ActionButton" .. i]:UnregisterAllEvents()
+			_G["ActionButton" .. i]:SetAttribute("statehidden", true)
 
-	-- Let spell book button tooltips work without tainting,
-	-- by replacing the script handlers with safer methods.
-	for i = 1, SPELLS_PER_PAGE do
-		local button = _G["SpellButton"..i]
-		button:SetScript("OnEnter", SpellButtonOnEnter)
-		button:SetScript("OnLeave", SpellButtonOnLeave)
-	end
+			_G["MultiBarBottomLeftButton" .. i]:Hide()
+			_G["MultiBarBottomLeftButton" .. i]:UnregisterAllEvents()
+			_G["MultiBarBottomLeftButton" .. i]:SetAttribute("statehidden", true)
 
-	-- These calls are tainted when accessed by ValidateActionBarTransition.
-	-- Thank you ElvUI!
-	local noop = function() end
-	local noops = { "ClearAllPoints", "SetPoint", "SetScale", "SetShown" }
-	local noopthis = function(frame)
-		for _,method in ipairs(noops) do
-			if (frame[method] ~= noop) then
-				frame[method] = noop
-			end
+			_G["MultiBarBottomRightButton" .. i]:Hide()
+			_G["MultiBarBottomRightButton" .. i]:UnregisterAllEvents()
+			_G["MultiBarBottomRightButton" .. i]:SetAttribute("statehidden", true)
+
+			_G["MultiBarRightButton" .. i]:Hide()
+			_G["MultiBarRightButton" .. i]:UnregisterAllEvents()
+			_G["MultiBarRightButton" .. i]:SetAttribute("statehidden", true)
+
+			_G["MultiBarLeftButton" .. i]:Hide()
+			_G["MultiBarLeftButton" .. i]:UnregisterAllEvents()
+			_G["MultiBarLeftButton" .. i]:SetAttribute("statehidden", true)
 		end
-	end
-	for i,object in ipairs({
-		"OverrideActionBar", 
-		"StanceBarFrame", 
-		"PossessBarFrame", 
-		"PetActionBarFrame", 
-		"MultiCastActionBarFrame"
-	}) do
-		local frame = _G[object]
-		if (frame) then
-			frame:UnregisterAllEvents()
-		else
-			if (self.AddDebugMessageFormatted) then
-				self:AddDebugMessageFormatted(string_format("LibBlizzard: The object '%s' wasn't found, tell Goldpaw!", object))
+		UIPARENT_MANAGED_FRAME_POSITIONS["MainMenuBar"] = nil
+		UIPARENT_MANAGED_FRAME_POSITIONS["StanceBarFrame"] = nil
+		UIPARENT_MANAGED_FRAME_POSITIONS["PossessBarFrame"] = nil
+		UIPARENT_MANAGED_FRAME_POSITIONS["MultiCastActionBarFrame"] = nil
+		UIPARENT_MANAGED_FRAME_POSITIONS["PETACTIONBAR_YPOS"] = nil
+		UIPARENT_MANAGED_FRAME_POSITIONS["ExtraAbilityContainer"] = nil
+
+		--MainMenuBar:UnregisterAllEvents()
+		--MainMenuBar:SetParent(UIHider)
+		--MainMenuBar:Hide()
+		MainMenuBar:EnableMouse(false)
+		MainMenuBar:UnregisterEvent("DISPLAY_SIZE_CHANGED")
+		MainMenuBar:UnregisterEvent("UI_SCALE_CHANGED")
+
+
+		local animations = {MainMenuBar.slideOut:GetAnimations()}
+		animations[1]:SetOffset(0,0)
+
+		if (OverrideActionBar) then -- classic doesn't have this
+			animations = {OverrideActionBar.slideOut:GetAnimations()}
+			animations[1]:SetOffset(0,0)
+		end
+
+		handleActionBar(MainMenuBarArtFrame, false, true)
+		handleActionBar(MainMenuBarArtFrameBackground)
+		handleActionBar(MicroButtonAndBagsBar, false, false, true)
+
+		if (StatusTrackingBarManager) then
+			StatusTrackingBarManager:Hide()
+			StatusTrackingBarManager:UnregisterAllEvents()
+			--StatusTrackingBarManager:SetParent(UIHider)
+			if (IsRetail) then
+				ActionBarController:RegisterEvent('UPDATE_EXTRA_ACTIONBAR') -- this is needed to let the ExtraActionBar show
 			end
 		end
-	end
-	for i,object in ipairs({
-		"OverrideActionBar", 
-		"StanceBarFrame", 
-		"PossessBarFrame", 
-		"PetActionBarFrame", 
-		"MultiCastActionBarFrame",
-		"MainMenuBar", 
-		"MainMenuBarArtFrame",
-		"MainMenuBarArtFrameBackground",
-		"MicroButtonAndBagsBar", 
-		"MultiBarBottomLeft", 
-		"MultiBarBottomRight", 
-		"MultiBarLeft", 
-		"MultiBarRight"
-	}) do
-		local frame = _G[object]
-		if (frame) then
-			frame:SetParent(UIHider)
-			noopthis(frame)
-		else			
-			if (self.AddDebugMessageFormatted) then
-				self:AddDebugMessageFormatted(string_format("LibBlizzard: The object '%s' wasn't found, tell Goldpaw!", object))
+
+		handleActionBar(StanceBarFrame, true, true)
+		handleActionBar(PossessBarFrame, false, true)
+		handleActionBar(MultiCastActionBarFrame, false, false, true)
+		handleActionBar(PetActionBarFrame, true, true)
+		handleActionBar(OverrideActionBar, true)
+		ShowPetActionBar = function() end
+
+		--BonusActionBarFrame:UnregisterAllEvents()
+		--BonusActionBarFrame:Hide()
+		--BonusActionBarFrame:SetParent(UIHider)
+
+		if (not IsClassic) then
+			if (PlayerTalentFrame) then
+				PlayerTalentFrame:UnregisterEvent("ACTIVE_TALENT_GROUP_CHANGED")
+			else
+				hooksecurefunc("TalentFrame_LoadUI", function() PlayerTalentFrame:UnregisterEvent("ACTIVE_TALENT_GROUP_CHANGED") end)
 			end
 		end
+
+		handleActionBar(MainMenuBarVehicleLeaveButton, true)
+		handleActionBar(MainMenuBarPerformanceBarFrame, false, false, true)
+		handleActionBar(MainMenuExpBar, false, false, true)
+		handleActionBar(ReputationWatchBar, false, false, true)
+		handleActionBar(MainMenuBarMaxLevelBar, false, false, true)
+
+		if (IsAddOnLoaded("Blizzard_NewPlayerExperience")) then
+			NPE_LoadUI()
+		elseif (_G.NPE_LoadUI ~= nil) then
+			hooksecurefunc("NPE_LoadUI", NPE_LoadUI)
+		end
+
+		-- Gets rid of the loot anims
+		MainMenuBarBackpackButton:UnregisterEvent("ITEM_PUSH")
+		for slot = 0,3 do
+			_G["CharacterBag"..slot.."Slot"]:UnregisterEvent("ITEM_PUSH")
+		end
+
 	end
-	
-	-- MainMenuBar:ClearAllPoints() taint during combat. *CHECK*
-	MainMenuBar.SetPositionForStatusBars = noop
-
-	-- Spellbook open in combat taint, only happens sometimes.
-	-- This appears to CAUSE taint, rather than solve it.
-	-- Been getting multiple taints on this after adding it. 
-	--MultiActionBar_HideAllGrids = noop
-	--MultiActionBar_ShowAllGrids = noop
-
-	-- Try to shutdown the container movement and taints.
-	UIPARENT_MANAGED_FRAME_POSITIONS.ExtraAbilityContainer = nil
-	ExtraAbilityContainer.SetSize = noop
-	
-	-- With this method we might don't taint anything. 
-	MainMenuBarPerformanceBar:SetAlpha(0)
-	MainMenuBarPerformanceBar:SetScale(.00001)
-
-	-- Clear out crap we don't need.
-	noopthis(MainMenuBarArtFrame)
-	noopthis(MainMenuBarArtFrameBackground)
-	MainMenuBarArtFrame:UnregisterAllEvents()
-	StatusTrackingBarManager:UnregisterAllEvents()
-	ActionBarButtonEventsFrame:UnregisterAllEvents()
-	ActionBarButtonEventsFrame:RegisterEvent("ACTIONBAR_SLOT_CHANGED") -- This is needed for ExtraActionButton to show.
-	ActionBarButtonEventsFrame:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN") -- This is needed for ExtraActionBar cooldown.
-	ActionBarActionEventsFrame:UnregisterAllEvents()
-	ActionBarController:UnregisterAllEvents()
-	ActionBarController:RegisterEvent("UPDATE_EXTRA_ACTIONBAR") -- This is needed for ExtraActionBar to show.
-
-	-- Lets only keep ExtraActionButtons in here.
-	local ButtonEventsRegisterFrame = function(self, added)
-		local frames = ActionBarButtonEventsFrame.frames
-		for index = #frames,1,-1 do
-			local frame = frames[index]
-			local wasAdded = frame == added
-			if (not added) or (wasAdded) then
-				if (not string_match(frame:GetName(), "ExtraActionButton%d")) then
-					ActionBarButtonEventsFrame.frames[index] = nil
-				end
-				if (wasAdded) then
-					break
-				end
+
+	-- Disable annoying yellow popup alerts.
+	if (MainMenuMicroButton_ShowAlert) then
+		local HideAlerts = function()
+			if (HelpTip) then
+				HelpTip:HideAllSystem("MicroButtons")
 			end
 		end
+		hooksecurefunc("MainMenuMicroButton_ShowAlert", HideAlerts)
 	end
-	hooksecurefunc(ActionBarButtonEventsFrame, "RegisterFrame", ButtonEventsRegisterFrame)
-	ButtonEventsRegisterFrame()
-
-	-- This would taint along with the same path as the SetNoopers: ValidateActionBarTransition
-	VerticalMultiBarsContainer:SetSize(10,10) -- dummy values so GetTop etc doesnt fail without replacing
-	noopthis(VerticalMultiBarsContainer)
 
-	if (PlayerTalentFrame) then
-		PlayerTalentFrame:UnregisterEvent("ACTIVE_TALENT_GROUP_CHANGED")
-	else
-		hooksecurefunc("TalentFrame_LoadUI", function()
-			PlayerTalentFrame:UnregisterEvent("ACTIVE_TALENT_GROUP_CHANGED")
-		end)
-	end
 end
 
 UIWidgetsDisable["Alerts"] = function(self)
@@ -479,18 +404,18 @@ UIWidgetsDisable["Alerts"] = function(self)
 	AlertFrame:UnregisterAllEvents()
 	AlertFrame:SetScript("OnEvent", nil)
 	AlertFrame:SetParent(UIHider)
-end 
+end
 
 UIWidgetsEnable["Alerts"] = function(self)
 	if (not AlertFrame) then
 		return
 	end
-	if (AlertFrame:GetParent() ~= UIParent) then 
+	if (AlertFrame:GetParent() ~= UIParent) then
 		AlertFrame:SetParent(UIParent)
 		AlertFrame:SetScript("OnEvent", AlertFrame.OnEvent)
 		AlertFrame:OnLoad()
 	end
-end 
+end
 
 UIWidgetsDisable["Auras"] = function(self)
 	BuffFrame:SetScript("OnLoad", nil)
@@ -498,11 +423,11 @@ UIWidgetsDisable["Auras"] = function(self)
 	BuffFrame:SetScript("OnEvent", nil)
 	BuffFrame:SetParent(UIHider)
 	BuffFrame:UnregisterAllEvents()
-	if (TemporaryEnchantFrame) then 
+	if (TemporaryEnchantFrame) then
 		TemporaryEnchantFrame:SetScript("OnUpdate", nil)
 		TemporaryEnchantFrame:SetParent(UIHider)
-	end 
-end 
+	end
+end
 
 UIWidgetsDisable["BuffTimer"] = function(self)
 	if (not PlayerBuffTimerManager) then
@@ -515,17 +440,19 @@ end
 
 UIWidgetsDisable["CastBars"] = function(self)
 	-- player's castbar
-	CastingBarFrame:SetScript("OnEvent", nil)
-	CastingBarFrame:SetScript("OnUpdate", nil)
-	CastingBarFrame:SetParent(UIHider)
-	CastingBarFrame:UnregisterAllEvents()
-	
+	if (CastingBarFrame) then
+		CastingBarFrame:SetScript("OnEvent", nil)
+		CastingBarFrame:SetScript("OnUpdate", nil)
+		CastingBarFrame:SetParent(UIHider)
+		CastingBarFrame:UnregisterAllEvents()
+	end
+
 	-- player's pet's castbar
 	PetCastingBarFrame:SetScript("OnEvent", nil)
 	PetCastingBarFrame:SetScript("OnUpdate", nil)
 	PetCastingBarFrame:SetParent(UIHider)
 	PetCastingBarFrame:UnregisterAllEvents()
-end 
+end
 
 UIWidgetDependency["CaptureBar"] = "Blizzard_UIWidgets"
 UIWidgetsDisable["CaptureBar"] = function(self)
@@ -538,7 +465,7 @@ UIWidgetsDisable["CaptureBar"] = function(self)
 end
 
 -- This isn't the actual chat, just the toast button.
--- To make backwards compatibility easier, 
+-- To make backwards compatibility easier,
 -- I'm keeping this old name on this widget.
 UIWidgetsDisable["Chat"] = function(self)
 	if (not QuickJoinToastButton) then
@@ -552,14 +479,14 @@ UIWidgetsDisable["Chat"] = function(self)
 		QuickJoinToastButton:SetAlpha(0)
 		QuickJoinToastButton:EnableMouse(false)
 		QuickJoinToastButton:SetParent(UIHider)
-	end 
+	end
 	killQuickToast()
 
 	-- This pops back up on zoning sometimes, so keep removing it
 	LibBlizzard:RegisterEvent("PLAYER_ENTERING_WORLD", killQuickToast)
-end 
+end
 
--- This will kill off the chat system. Dangerous! 
+-- This will kill off the chat system. Dangerous!
 UIWidgetsDisable["ChatWindows"] = function(self)
 
 	local nuke = function(method, frame)
@@ -572,9 +499,9 @@ UIWidgetsDisable["ChatWindows"] = function(self)
 	end
 
 	local antisocial = function()
-		for _,frameName in LibBlizzard:GetAllChatWindows() do 
+		for _,frameName in LibBlizzard:GetAllChatWindows() do
 			local frame = _G[frameName]
-			if (frame) then 
+			if (frame) then
 				frame:SetParent(UIHider)
 				for i,method in ipairs({
 					"GetChatWindowButtonFrame",
@@ -589,7 +516,7 @@ UIWidgetsDisable["ChatWindows"] = function(self)
 				}) do
 					nuke(method, frame)
 				end
-				
+
 				print("hiding",frameName)
 			end
 		end
@@ -623,8 +550,8 @@ UIWidgetsDisable["Durability"] = function(self)
 	DurabilityFrame:SetScript("OnShow", nil)
 	DurabilityFrame:SetScript("OnHide", nil)
 
-	-- Will this taint? 
-	-- This is to prevent the durability frame size 
+	-- Will this taint?
+	-- This is to prevent the durability frame size
 	-- affecting other anchors
 	DurabilityFrame:SetParent(UIHider)
 	DurabilityFrame:Hide()
@@ -669,7 +596,7 @@ end
 
 UIWidgetsDisable["BossBanners"] = function(self)
 	local frame = BossBanner
-	BossBanner_Stop(frame)	
+	BossBanner_Stop(frame)
 	--frame.PlayBanner = nil
 	--frame.StopBanner = nil
 	frame:UnregisterAllEvents()
@@ -689,16 +616,16 @@ UIWidgetsDisable["Minimap"] = function(self)
 	for _,object in pairs({
 		"GameTimeFrame",
 		"GarrisonLandingPageMinimapButton"
-	}) do 
-		if (_G[object]) then 
+	}) do
+		if (_G[object]) then
 			_G[object]:UnregisterAllEvents()
 		else
 			-- Spammy, it's too many expansion differences(?)
 			--if (self.AddDebugMessageFormatted) then
 			--	self:AddDebugMessageFormatted(string_format("LibBlizzard: The object '%s' wasn't found, tell Goldpaw!", object))
 			--end
-		end 
-	end 
+		end
+	end
 	for _,object in pairs({
 		"GameTimeFrame",
 		"GarrisonLandingPageMinimapButton",
@@ -709,7 +636,7 @@ UIWidgetsDisable["Minimap"] = function(self)
 		"MinimapCluster",
 		"MiniMapMailBorder",
 		"MiniMapMailFrame",
-		"MinimapBackdrop", 
+		"MinimapBackdrop",
 		"MinimapNorthTag",
 		"MiniMapTracking",
 		"MiniMapTrackingButton",
@@ -718,15 +645,15 @@ UIWidgetsDisable["Minimap"] = function(self)
 		"MinimapZoomIn",
 		"MinimapZoomOut",
 		"MinimapZoneTextButton"
-	}) do 
-		if (_G[object]) then 
+	}) do
+		if (_G[object]) then
 			_G[object]:SetParent(UIHider)
 		else
 			--if (self.AddDebugMessageFormatted) then
 			--	self:AddDebugMessageFormatted(string_format("LibBlizzard: The object '%s' wasn't found, tell Goldpaw!", object))
 			--end
-		end 
-	end 
+		end
+	end
 
 	-- Ugly hack to keep the keybind functioning
 	if (GarrisonLandingPageMinimapButton) then
@@ -736,7 +663,7 @@ UIWidgetsDisable["Minimap"] = function(self)
 
 	-- Can't really be destroyed safely, just hiding it instead.
 	if (QueueStatusMinimapButton) then
-		QueueStatusMinimapButton:SetHighlightTexture("") 
+		QueueStatusMinimapButton:SetHighlightTexture("")
 		QueueStatusMinimapButtonBorder:SetAlpha(0)
 		QueueStatusMinimapButtonBorder:SetTexture(nil)
 		QueueStatusMinimapButton.Highlight:SetAlpha(0)
@@ -745,7 +672,7 @@ UIWidgetsDisable["Minimap"] = function(self)
 
 	-- Classic Battleground Queue Button
 	-- Killing fully now prevents it from being remade(?)
-	if (MiniMapBattlefieldFrame) then 
+	if (MiniMapBattlefieldFrame) then
 		MiniMapBattlefieldIcon:SetAlpha(0)
 		MiniMapBattlefieldIcon:SetTexture(nil)
 		MiniMapBattlefieldBorder:SetAlpha(0)
@@ -760,10 +687,10 @@ end
 
 UIWidgetDependency["MinimapClock"] = "Blizzard_TimeManager"
 UIWidgetsDisable["MinimapClock"] = function(self)
-	if TimeManagerClockButton then 
+	if TimeManagerClockButton then
 		TimeManagerClockButton:SetParent(UIHider)
 		TimeManagerClockButton:UnregisterAllEvents()
-	end 
+	end
 end
 
 UIWidgetsDisable["MirrorTimer"] = function(self)
@@ -774,7 +701,7 @@ UIWidgetsDisable["MirrorTimer"] = function(self)
 		timer:SetParent(UIHider)
 		timer:UnregisterAllEvents()
 	end
-end 
+end
 
 UIWidgetDependency["ObjectiveTracker"] = "Blizzard_ObjectiveTracker"
 UIWidgetsDisable["ObjectiveTracker"] = function(self)
@@ -948,7 +875,7 @@ UIWidgetsDisable["UnitFramePlayer"] = function(self)
 	killUnitFrame("PlayerFrame")
 
 	-- A lot of blizz modules relies on PlayerFrame.unit
-	-- This includes the aura frame and several others. 
+	-- This includes the aura frame and several others.
 	_G.PlayerFrame:RegisterEvent("PLAYER_ENTERING_WORLD")
 
 	-- User placed frames don't animate
@@ -980,7 +907,7 @@ end
 UIWidgetsDisable["UnitFrameFocus"] = function(self)
 	killUnitFrame("FocusFrame")
 	killUnitFrame("TargetofFocusFrame")
-end 
+end
 
 UIWidgetsDisable["UnitFrameParty"] = function(self)
 	for i = 1,5 do
@@ -988,15 +915,17 @@ UIWidgetsDisable["UnitFrameParty"] = function(self)
 	end
 
 	-- Kill off the party background
-	_G.PartyMemberBackground:SetParent(UIHider)
-	_G.PartyMemberBackground:Hide()
-	_G.PartyMemberBackground:SetAlpha(0)
+	if (_G.PartyMemberBackground) then
+		_G.PartyMemberBackground:SetParent(UIHider)
+		_G.PartyMemberBackground:Hide()
+		_G.PartyMemberBackground:SetAlpha(0)
+	end
 
-	--hooksecurefunc("CompactPartyFrame_Generate", function() 
+	--hooksecurefunc("CompactPartyFrame_Generate", function()
 	--	killUnitFrame(_G.CompactPartyFrame)
 	--	for i=1, _G.MEMBERS_PER_RAID_GROUP do
 	--		killUnitFrame(_G["CompactPartyFrameMember" .. i])
-	--	end	
+	--	end
 	--end)
 end
 
@@ -1041,17 +970,17 @@ UIWidgetsDisable["ZoneText"] = function(self)
 	ZoneTextFrame:UnregisterAllEvents()
 	ZoneTextFrame:SetScript("OnUpdate", nil)
 	-- ZoneTextFrame:Hide()
-	
+
 	SubZoneTextFrame:SetParent(UIHider)
 	SubZoneTextFrame:UnregisterAllEvents()
 	SubZoneTextFrame:SetScript("OnUpdate", nil)
 	-- SubZoneTextFrame:Hide()
-	
+
 	AutoFollowStatus:SetParent(UIHider)
 	AutoFollowStatus:UnregisterAllEvents()
 	AutoFollowStatus:SetScript("OnUpdate", nil)
 	-- AutoFollowStatus:Hide()
-end 
+end
 
 -- Widget Styling Pool
 -----------------------------------------------------------------
@@ -1060,82 +989,94 @@ UIWidgetStyling["BagButtons"] = function(self, ...)
 	-- Retrieve the first slot button and the backpack
 	local firstSlot = CharacterBag0Slot
 	local backpack = ContainerFrame1
+	local reagentSlot = CharacterReagentBag0Slot -- >= 10.0.0
 
-	-- Try to avoid the potential error with anima deposit animations. 
-	-- Just give it a simplified version of the default position it is given, 
+	-- Try to avoid the potential error with anima deposit animations.
+	-- Just give it a simplified version of the default position it is given,
 	-- it will be replaced by UpdateContainerFrameAnchors() later on anyway.
 	if (not backpack:GetPoint()) then
 		backpack:SetPoint("BOTTOMRIGHT", backpack:GetParent(), "BOTTOMRIGHT", -14, 93 )
 	end
 
 	-- These should always exist, but Blizz do have a way of changing things,
-	-- and I prefer having functionality not be applied in a future update 
-	-- rather than having the UI break from nil bugs. 
-	if (firstSlot and backpack) then 
+	-- and I prefer having functionality not be applied in a future update
+	-- rather than having the UI break from nil bugs.
+	if (firstSlot and backpack) then
 		firstSlot:ClearAllPoints()
 		firstSlot:SetPoint("TOPRIGHT", backpack, "BOTTOMRIGHT", -6, 0)
+
 		local strata = backpack:GetFrameStrata()
 		local level = backpack:GetFrameLevel()
-		local slotSize = 30
+
+		-- Rearrange slots
+		-- *Dragonflight features a reagent bag slot
+		local slotSize = reagentSlot and 24 or 30
 		local previous
-		for i = 0,3 do 
-			-- Always check for existence, 
-			-- because nothing is ever guaranteed. 
-			local slot = _G["CharacterBag"..i.."Slot"]
-			local tex = _G["CharacterBag"..i.."SlotNormalTexture"]
-			if slot then 
+		for i,slotName in ipairs({
+			"CharacterBag0Slot",
+			"CharacterBag1Slot",
+			"CharacterBag2Slot",
+			"CharacterBag3Slot",
+			"CharacterReagentBag0Slot" -- >= 10.0.0
+		}) do
+
+			-- Always check for existence,
+			-- because nothing is ever guaranteed.
+			local slot = _G[slotName]
+			if slot then
 				slot:SetParent(backpack)
-				slot:SetSize(slotSize,slotSize) 
+				slot:SetSize(slotSize,slotSize)
 				slot:SetFrameStrata(strata)
 				slot:SetFrameLevel(level)
 
 				-- Remove that fugly outer border
-				if tex then 
+				local tex = _G[slotName.."NormalTexture"]
+				if tex then
 					tex:SetTexture("")
 					tex:SetAlpha(0)
 				end
-				
+
 				-- Re-anchor the slots to remove space
-				if (i == 0) then
+				if (not previous) then
 					slot:ClearAllPoints()
 					slot:SetPoint("TOPRIGHT", backpack, "BOTTOMRIGHT", -6, 4)
-				else 
+				else
 					slot:ClearAllPoints()
 					slot:SetPoint("RIGHT", previous, "LEFT", 0, 0)
 				end
 				previous = slot
-			end 
-		end 
+			end
+		end
 
 		local keyring = KeyRingButton
-		if (keyring) then 
+		if (keyring) then
 			keyring:SetParent(backpack)
-			keyring:SetHeight(slotSize) 
+			keyring:SetHeight(slotSize)
 			keyring:SetFrameStrata(strata)
 			keyring:SetFrameLevel(level)
 			keyring:ClearAllPoints()
 			keyring:SetPoint("RIGHT", previous, "LEFT", 0, 0)
 			previous = keyring
 		end
-	end 
+	end
 end
 
 UIWidgetStyling["GameMenu"] = function(self, ...)
 end
 
-UIWidgetStyling["ObjectiveTracker"] = (IsClassic or IsTBC) and function(self, ...)
+UIWidgetStyling["ObjectiveTracker"] = (IsClassic or IsTBC or IsWrath) and function(self, ...)
 end
 or IsRetail and function(self, ...)
 end
 
 UIWidgetDependency["WorldMap"] = "Blizzard_WorldMap"
-UIWidgetStyling["WorldMap"] = (IsClassic or IsTBC) and function(self, ...)
+UIWidgetStyling["WorldMap"] = (IsClassic or IsTBC or IsWrath) and function(self, ...)
 	local Canvas = WorldMapFrame
 	Canvas.BlackoutFrame:Hide()
 	Canvas:SetIgnoreParentScale(false)
 	Canvas:RefreshDetailLayers()
 
-	-- Contains the actual map. 
+	-- Contains the actual map.
 	local Container = WorldMapFrame.ScrollContainer
 	Container.GetCanvasScale = function(self)
 		return self:GetScale()
@@ -1150,9 +1091,9 @@ UIWidgetStyling["WorldMap"] = (IsClassic or IsTBC) and function(self, ...)
 	Container.GetCursorPosition = function(self)
 		local currentX, currentY = GetCursorPosition()
 		local scale = UIParent:GetScale()
-		if not(currentX and currentY and scale) then 
+		if not(currentX and currentY and scale) then
 			return 0,0
-		end 
+		end
 		local scaledX, scaledY = currentX/scale, currentY/scale
 		return scaledX, scaledY
 	end
@@ -1169,51 +1110,54 @@ UIWidgetStyling["WorldMap"] = (IsClassic or IsTBC) and function(self, ...)
 	frame.stepIn = .05
 	frame.stepOut = .05
 	frame.throttle = .02
-	frame:SetScript("OnEvent", function(selv, event) 
-		if (event == "PLAYER_STARTED_MOVING") then 
+	frame:SetScript("OnEvent", function(selv, event)
+		if (event == "PLAYER_STARTED_MOVING") then
 			frame.alpha = Canvas:GetAlpha()
 			frame:SetScript("OnUpdate", frame.Starting)
 
-		elseif (event == "PLAYER_STOPPED_MOVING") or (event == "PLAYER_ENTERING_WORLD") then 
+		elseif (event == "PLAYER_STOPPED_MOVING") or (event == "PLAYER_ENTERING_WORLD") then
 			frame.alpha = Canvas:GetAlpha()
 			frame:SetScript("OnUpdate", frame.Stopping)
 		end
 	end)
 
-	frame.Stopping = function(self, elapsed) 
+	frame.Stopping = function(self, elapsed)
 		self.elapsed = self.elapsed + elapsed
 		if (self.elapsed < frame.throttle) then
-			return 
-		end 
-		if (frame.alpha + frame.stepIn < frame.stopAlpha) then 
+			return
+		end
+		if (frame.alpha + frame.stepIn < frame.stopAlpha) then
 			frame.alpha = frame.alpha + frame.stepIn
-		else 
+		else
 			frame.alpha = frame.stopAlpha
 			frame:SetScript("OnUpdate", nil)
-		end 
+		end
 		Canvas:SetAlpha(frame.alpha)
 	end
 
-	frame.Starting = function(self, elapsed) 
+	frame.Starting = function(self, elapsed)
 		self.elapsed = self.elapsed + elapsed
 		if (self.elapsed < frame.throttle) then
-			return 
-		end 
-		if (frame.alpha - frame.stepOut > frame.moveAlpha) then 
+			return
+		end
+		if (frame.alpha - frame.stepOut > frame.moveAlpha) then
 			frame.alpha = frame.alpha - frame.stepOut
-		else 
+		else
 			frame.alpha = frame.moveAlpha
 			frame:SetScript("OnUpdate", nil)
-		end 
+		end
 		Canvas:SetAlpha(frame.alpha)
 	end
 
 	frame:RegisterEvent("PLAYER_ENTERING_WORLD")
 	frame:RegisterEvent("PLAYER_STARTED_MOVING")
 	frame:RegisterEvent("PLAYER_STOPPED_MOVING")
-end 
+end
 
 or IsRetail and function(self, ...)
+	if (IsDragonflight) then
+		return
+	end
 
 	-- War on Taint!
 	-----------------------------------------------------------------
@@ -1245,8 +1189,8 @@ or IsRetail and function(self, ...)
 	local GetFormattedCoordinates = function(x, y)
 		return 	string_gsub(string_format("|cfff0f0f0%.2f|r", x*100), "%.(.+)", "|cffa0a0a0.%1|r"),
 				string_gsub(string_format("|cfff0f0f0%.2f|r", y*100), "%.(.+)", "|cffa0a0a0.%1|r")
-	end 
-	
+	end
+
 	-- Coordinate frame
 	local coords = CreateFrame("Frame", nil, WorldMapFrame)
 	coords:SetFrameStrata(WorldMapFrame.BorderFrame:GetFrameStrata())
@@ -1255,7 +1199,7 @@ or IsRetail and function(self, ...)
 
 	-- Player coordinates
 	local player = coords:CreateFontString()
-	player:SetFontObject(Game13Font_o1) 
+	player:SetFontObject(Game13Font_o1)
 	player:SetTextColor(255/255, 234/255, 137/255)
 	player:SetAlpha(.85)
 	player:SetDrawLayer("OVERLAY")
@@ -1273,11 +1217,11 @@ or IsRetail and function(self, ...)
 	cursor:SetJustifyV("BOTTOM")
 	coords.cursor = cursor
 
-	-- Please note that this is NOT supposed to be a list of all zones, 
+	-- Please note that this is NOT supposed to be a list of all zones,
 	-- so don't dig into this code and assume anything is missing.
-	-- This is a list for the custom styling element, 
+	-- This is a list for the custom styling element,
 	-- telling which zone maps have a free bottom left corner.
-	-- 
+	--
 	-- /dump WorldMapFrame.mapID
 	coords.bottomLeft = {
 
@@ -1362,276 +1306,276 @@ or IsRetail and function(self, ...)
 
 		-- Shadowlands Zones
 		-- https://wow.gamepedia.com/UiMapID
-		[1643] = true, 
-		[1645] = true, 
-		[1647] = true, 
-		[1658] = true, 
-		[1666] = true, 
-		[1705] = true, 
-		[1726] = true, 
-		[1727] = true, 
-		[1728] = true, 
-		[1762] = true, 
-		[1525] = true, 
-		[1533] = true, 
-		[1536] = true, 
-		[1543] = true, 
-		[1565] = true, 
-		[1569] = true, 
-		[1603] = true, 
-		[1648] = true, 
-		[1656] = true, 
-		[1659] = true, 
-		[1661] = true, 
-		[1670] = true, 
-		[1671] = true, 
-		[1672] = true, 
-		[1673] = true, 
-		[1688] = true, 
-		[1689] = true, 
-		[1734] = true, 
-		[1738] = true, 
-		[1739] = true, 
-		[1740] = true, 
-		[1741] = true, 
-		[1742] = true, 
-		[1813] = true, 
-		[1814] = true, 
-		[1615] = true, 
-		[1616] = true, 
-		[1617] = true, 
-		[1618] = true, 
-		[1619] = true, 
-		[1620] = true, 
-		[1621] = true, 
-		[1623] = true, 
-		[1624] = true, 
-		[1627] = true, 
-		[1628] = true, 
-		[1629] = true, 
-		[1630] = true, 
-		[1631] = true, 
-		[1632] = true, 
-		[1635] = true, 
-		[1636] = true, 
-		[1641] = true, 
-		[1712] = true, 
-		[1716] = true, 
-		[1720] = true, 
-		[1721] = true, 
-		[1736] = true, 
-		[1749] = true, 
-		[1751] = true, 
-		[1752] = true, 
-		[1753] = true, 
-		[1754] = true, 
-		[1756] = true, 
-		[1757] = true, 
-		[1758] = true, 
-		[1759] = true, 
-		[1760] = true, 
-		[1761] = true, 
-		[1763] = true, 
-		[1764] = true, 
-		[1765] = true, 
-		[1766] = true, 
-		[1767] = true, 
-		[1768] = true, 
-		[1769] = true, 
-		[1770] = true, 
-		[1771] = true, 
-		[1772] = true, 
-		[1773] = true, 
-		[1774] = true, 
-		[1776] = true, 
-		[1777] = true, 
-		[1778] = true, 
-		[1779] = true, 
-		[1780] = true, 
-		[1781] = true, 
-		[1782] = true, 
-		[1783] = true, 
-		[1784] = true, 
-		[1785] = true, 
-		[1786] = true, 
-		[1787] = true, 
-		[1788] = true, 
-		[1789] = true, 
-		[1791] = true, 
-		[1792] = true, 
-		[1793] = true, 
-		[1794] = true, 
-		[1795] = true, 
-		[1796] = true, 
-		[1797] = true, 
-		[1798] = true, 
-		[1799] = true, 
-		[1800] = true, 
-		[1801] = true, 
-		[1802] = true, 
-		[1803] = true, 
-		[1804] = true, 
-		[1805] = true, 
-		[1806] = true, 
-		[1807] = true, 
-		[1808] = true, 
-		[1809] = true, 
-		[1810] = true, 
-		[1811] = true, 
-		[1812] = true, 
-		[1820] = true, 
-		[1821] = true, 
-		[1822] = true, 
-		[1823] = true, 
-		[1833] = true, 
-		[1834] = true, 
-		[1835] = true, 
-		[1836] = true, 
-		[1837] = true, 
-		[1838] = true, 
-		[1839] = true, 
-		[1840] = true, 
-		[1841] = true, 
-		[1842] = true, 
-		[1843] = true, 
-		[1844] = true, 
-		[1845] = true, 
-		[1846] = true, 
-		[1847] = true, 
-		[1848] = true, 
-		[1849] = true, 
-		[1850] = true, 
-		[1851] = true, 
-		[1852] = true, 
-		[1853] = true, 
-		[1854] = true, 
-		[1855] = true, 
-		[1856] = true, 
-		[1857] = true, 
-		[1858] = true, 
-		[1859] = true, 
-		[1860] = true, 
-		[1861] = true, 
-		[1862] = true, 
-		[1863] = true, 
-		[1864] = true, 
-		[1865] = true, 
-		[1867] = true, 
-		[1868] = true, 
-		[1869] = true, 
-		[1870] = true, 
-		[1871] = true, 
-		[1872] = true, 
-		[1873] = true, 
-		[1874] = true, 
-		[1875] = true, 
-		[1876] = true, 
-		[1877] = true, 
-		[1878] = true, 
-		[1879] = true, 
-		[1880] = true, 
-		[1881] = true, 
-		[1882] = true, 
-		[1883] = true, 
-		[1884] = true, 
-		[1885] = true, 
-		[1886] = true, 
-		[1887] = true, 
-		[1888] = true, 
-		[1889] = true, 
-		[1890] = true, 
-		[1891] = true, 
-		[1892] = true, 
-		[1893] = true, 
-		[1894] = true, 
-		[1895] = true, 
-		[1896] = true, 
-		[1897] = true, 
-		[1898] = true, 
-		[1899] = true, 
-		[1900] = true, 
-		[1901] = true, 
-		[1902] = true, 
-		[1903] = true, 
-		[1904] = true, 
-		[1905] = true, 
-		[1907] = true, 
-		[1908] = true, 
-		[1909] = true, 
-		[1910] = true, 
-		[1911] = true, 
-		[1912] = true, 
-		[1913] = true, 
-		[1914] = true, 
-		[1920] = true, 
-		[1921] = true, 
-		[1663] = true, 
-		[1664] = true, 
-		[1665] = true, 
-		[1675] = true, 
-		[1676] = true, 
-		[1699] = true, 
-		[1700] = true, 
-		[1735] = true, 
-		[1744] = true, 
-		[1745] = true, 
-		[1746] = true, 
-		[1747] = true, 
-		[1748] = true, 
-		[1750] = true, 
-		[1755] = true, 
-		[1649] = true, 
-		[1650] = true, 
-		[1651] = true, 
-		[1652] = true, 
-		[1674] = true, 
-		[1683] = true, 
-		[1684] = true, 
-		[1685] = true, 
-		[1686] = true, 
-		[1687] = true, 
-		[1697] = true, 
-		[1698] = true, 
-		[1724] = true, 
-		[1725] = true, 
-		[1667] = true, 
-		[1668] = true, 
-		[1690] = true, 
-		[1692] = true, 
-		[1693] = true, 
-		[1694] = true, 
-		[1695] = true, 
-		[1707] = true, 
-		[1708] = true, 
-		[1711] = true, 
-		[1713] = true, 
-		[1714] = true, 
-		[1662] = true, 
-		[1669] = true, 
-		[1677] = true, 
-		[1678] = true, 
-		[1679] = true, 
-		[1680] = true, 
-		[1701] = true, 
-		[1702] = true, 
-		[1703] = true, 
-		[1709] = true, 
-		[1816] = true, 
-		[1818] = true, 
-		[1819] = true, 
-		[1824] = true, 
-		[1825] = true, 
-		[1826] = true, 
-		[1827] = true, 
-		[1829] = true, 
-		[1917] = true 
+		[1643] = true,
+		[1645] = true,
+		[1647] = true,
+		[1658] = true,
+		[1666] = true,
+		[1705] = true,
+		[1726] = true,
+		[1727] = true,
+		[1728] = true,
+		[1762] = true,
+		[1525] = true,
+		[1533] = true,
+		[1536] = true,
+		[1543] = true,
+		[1565] = true,
+		[1569] = true,
+		[1603] = true,
+		[1648] = true,
+		[1656] = true,
+		[1659] = true,
+		[1661] = true,
+		[1670] = true,
+		[1671] = true,
+		[1672] = true,
+		[1673] = true,
+		[1688] = true,
+		[1689] = true,
+		[1734] = true,
+		[1738] = true,
+		[1739] = true,
+		[1740] = true,
+		[1741] = true,
+		[1742] = true,
+		[1813] = true,
+		[1814] = true,
+		[1615] = true,
+		[1616] = true,
+		[1617] = true,
+		[1618] = true,
+		[1619] = true,
+		[1620] = true,
+		[1621] = true,
+		[1623] = true,
+		[1624] = true,
+		[1627] = true,
+		[1628] = true,
+		[1629] = true,
+		[1630] = true,
+		[1631] = true,
+		[1632] = true,
+		[1635] = true,
+		[1636] = true,
+		[1641] = true,
+		[1712] = true,
+		[1716] = true,
+		[1720] = true,
+		[1721] = true,
+		[1736] = true,
+		[1749] = true,
+		[1751] = true,
+		[1752] = true,
+		[1753] = true,
+		[1754] = true,
+		[1756] = true,
+		[1757] = true,
+		[1758] = true,
+		[1759] = true,
+		[1760] = true,
+		[1761] = true,
+		[1763] = true,
+		[1764] = true,
+		[1765] = true,
+		[1766] = true,
+		[1767] = true,
+		[1768] = true,
+		[1769] = true,
+		[1770] = true,
+		[1771] = true,
+		[1772] = true,
+		[1773] = true,
+		[1774] = true,
+		[1776] = true,
+		[1777] = true,
+		[1778] = true,
+		[1779] = true,
+		[1780] = true,
+		[1781] = true,
+		[1782] = true,
+		[1783] = true,
+		[1784] = true,
+		[1785] = true,
+		[1786] = true,
+		[1787] = true,
+		[1788] = true,
+		[1789] = true,
+		[1791] = true,
+		[1792] = true,
+		[1793] = true,
+		[1794] = true,
+		[1795] = true,
+		[1796] = true,
+		[1797] = true,
+		[1798] = true,
+		[1799] = true,
+		[1800] = true,
+		[1801] = true,
+		[1802] = true,
+		[1803] = true,
+		[1804] = true,
+		[1805] = true,
+		[1806] = true,
+		[1807] = true,
+		[1808] = true,
+		[1809] = true,
+		[1810] = true,
+		[1811] = true,
+		[1812] = true,
+		[1820] = true,
+		[1821] = true,
+		[1822] = true,
+		[1823] = true,
+		[1833] = true,
+		[1834] = true,
+		[1835] = true,
+		[1836] = true,
+		[1837] = true,
+		[1838] = true,
+		[1839] = true,
+		[1840] = true,
+		[1841] = true,
+		[1842] = true,
+		[1843] = true,
+		[1844] = true,
+		[1845] = true,
+		[1846] = true,
+		[1847] = true,
+		[1848] = true,
+		[1849] = true,
+		[1850] = true,
+		[1851] = true,
+		[1852] = true,
+		[1853] = true,
+		[1854] = true,
+		[1855] = true,
+		[1856] = true,
+		[1857] = true,
+		[1858] = true,
+		[1859] = true,
+		[1860] = true,
+		[1861] = true,
+		[1862] = true,
+		[1863] = true,
+		[1864] = true,
+		[1865] = true,
+		[1867] = true,
+		[1868] = true,
+		[1869] = true,
+		[1870] = true,
+		[1871] = true,
+		[1872] = true,
+		[1873] = true,
+		[1874] = true,
+		[1875] = true,
+		[1876] = true,
+		[1877] = true,
+		[1878] = true,
+		[1879] = true,
+		[1880] = true,
+		[1881] = true,
+		[1882] = true,
+		[1883] = true,
+		[1884] = true,
+		[1885] = true,
+		[1886] = true,
+		[1887] = true,
+		[1888] = true,
+		[1889] = true,
+		[1890] = true,
+		[1891] = true,
+		[1892] = true,
+		[1893] = true,
+		[1894] = true,
+		[1895] = true,
+		[1896] = true,
+		[1897] = true,
+		[1898] = true,
+		[1899] = true,
+		[1900] = true,
+		[1901] = true,
+		[1902] = true,
+		[1903] = true,
+		[1904] = true,
+		[1905] = true,
+		[1907] = true,
+		[1908] = true,
+		[1909] = true,
+		[1910] = true,
+		[1911] = true,
+		[1912] = true,
+		[1913] = true,
+		[1914] = true,
+		[1920] = true,
+		[1921] = true,
+		[1663] = true,
+		[1664] = true,
+		[1665] = true,
+		[1675] = true,
+		[1676] = true,
+		[1699] = true,
+		[1700] = true,
+		[1735] = true,
+		[1744] = true,
+		[1745] = true,
+		[1746] = true,
+		[1747] = true,
+		[1748] = true,
+		[1750] = true,
+		[1755] = true,
+		[1649] = true,
+		[1650] = true,
+		[1651] = true,
+		[1652] = true,
+		[1674] = true,
+		[1683] = true,
+		[1684] = true,
+		[1685] = true,
+		[1686] = true,
+		[1687] = true,
+		[1697] = true,
+		[1698] = true,
+		[1724] = true,
+		[1725] = true,
+		[1667] = true,
+		[1668] = true,
+		[1690] = true,
+		[1692] = true,
+		[1693] = true,
+		[1694] = true,
+		[1695] = true,
+		[1707] = true,
+		[1708] = true,
+		[1711] = true,
+		[1713] = true,
+		[1714] = true,
+		[1662] = true,
+		[1669] = true,
+		[1677] = true,
+		[1678] = true,
+		[1679] = true,
+		[1680] = true,
+		[1701] = true,
+		[1702] = true,
+		[1703] = true,
+		[1709] = true,
+		[1816] = true,
+		[1818] = true,
+		[1819] = true,
+		[1824] = true,
+		[1825] = true,
+		[1826] = true,
+		[1827] = true,
+		[1829] = true,
+		[1917] = true
 	}
 
 	coords:SetScript("OnUpdate", function(self, elapsed)
 		self.elapsed = self.elapsed + elapsed
-		if (self.elapsed < .1) then 
-			return 
-		end 
+		if (self.elapsed < .1) then
+			return
+		end
 
 		if (not self.mapID) or (self.mapID ~= WorldMapFrame.mapID) then
 			self.player:ClearAllPoints()
@@ -1640,7 +1584,7 @@ or IsRetail and function(self, ...)
 			local mapID = WorldMapFrame.mapID
 			if (mapID) and (self.bottomLeft[mapID]) then
 
-				-- This is fine in Shadowlands, but fully fails in BfA of Legion. 
+				-- This is fine in Shadowlands, but fully fails in BfA of Legion.
 				self.player:SetPoint("BOTTOMLEFT", WorldMapFrame.ScrollContainer, "BOTTOMLEFT", 16, 12)
 				self.cursor:SetPoint("BOTTOMLEFT", self.player, "TOPLEFT", 0, 1)
 
@@ -1664,28 +1608,28 @@ or IsRetail and function(self, ...)
 
 		local pX, pY, cX, cY
 		local mapID = GetBestMapForUnit("player")
-		if (mapID) then 
+		if (mapID) then
 			local mapPosObject = GetPlayerMapPosition(mapID, "player")
-			if (mapPosObject) then 
+			if (mapPosObject) then
 				pX, pY = mapPosObject:GetXY()
-			end 
-		end 
+			end
+		end
 
-		if (WorldMapFrame.ScrollContainer:IsMouseOver()) then 
+		if (WorldMapFrame.ScrollContainer:IsMouseOver()) then
 			cX, cY = WorldMapFrame.ScrollContainer:GetNormalizedCursorPosition()
 		end
 
-		if (pX and pY) then 
+		if (pX and pY) then
 			self.player:SetFormattedText("%s:|r   %s, %s", L_PLAYER, GetFormattedCoordinates(pX, pY))
-		else 
+		else
 			self.player:SetFormattedText("%s:|r   |cfff0f0f0%s|r", L_PLAYER, L_NA)
-		end 
+		end
 
-		if (cX and cY) then 
+		if (cX and cY) then
 			self.cursor:SetFormattedText("%s:|r   %s, %s", L_MOUSE, GetFormattedCoordinates(cX, cY))
 		else
 			self.cursor:SetFormattedText("%s:|r   |cfff0f0f0%s|r", L_MOUSE, L_NA)
-		end 
+		end
 
 		self.elapsed = 0
 	end)
@@ -1706,7 +1650,7 @@ or IsRetail and function(self, ...)
 
 	-- WorldMap Size
 	-----------------------------------------------------------------
-	local getScale = function() 
+	local getScale = function()
 		local min, max = 0.65, 0.95 -- our own scale limits
 		local uiMin, uiMax = 0.65, 1.15 -- blizzard uiScale slider limits
 		local uiScale = UIParent:GetEffectiveScale() -- current blizzard uiScale
@@ -1765,17 +1709,17 @@ or IsRetail and function(self, ...)
 		WorldMapFrame:SetSize((width * scale) - (magicNumber + 2), (height * scale) - 2)
 		WorldMapFrame:OnCanvasSizeChanged()
 	end
-	
+
 	-- Old fashioned way.
 	hooksecurefunc(WorldMapFrame, "Maximize", Maximize)
 	hooksecurefunc(WorldMapFrame, "Minimize", Minimize)
 	hooksecurefunc(WorldMapFrame, "SynchronizeDisplayState", SyncState)
 	hooksecurefunc(WorldMapFrame, "UpdateMaximizedSize", UpdateSize)
 
-	-- Do NOT use HookScript on the WorldMapFrame, 
+	-- Do NOT use HookScript on the WorldMapFrame,
 	-- as it WILL taint it after the 3rd opening in combat.
 	-- Super weird, but super important. Do it this way instead.
-	-- *Note that this even though seemingly identical, 
+	-- *Note that this even though seemingly identical,
 	--  is in fact NOT the same taint as that occurring when
 	--  a new quest item button is spawned in the tracker in combat.
 	local OnShow
@@ -1801,127 +1745,127 @@ LibBlizzard.OnEvent = function(self, event, ...)
 	if (event == "ADDON_LOADED") then
 		local found, hasQueued
 
-		-- Iterate widgets queued for disabling after their loading 
-		for widgetName,widgetData in pairs(self.queue) do 
-			if (widgetData.addonName == arg1) then 
+		-- Iterate widgets queued for disabling after their loading
+		for widgetName,widgetData in pairs(self.queue) do
+			if (widgetData.addonName == arg1) then
 				UIWidgetsDisable[widgetName](self, unpack(widgetData.args))
 				self.queue[widgetName] = nil
 				found = true
-			else 
+			else
 				hasQueued = true
-			end 
+			end
 			-- Definitely not the fastest way, but sufficient for our purpose
 			if (found) and (hasQueued) then
 				break
 			end
-		end 
+		end
 
-		-- Iterate widgets queued for enabling after their loading 
-		for widgetName,widgetData in pairs(self.enableQueue) do 
-			if (widgetData.addonName == arg1) then 
+		-- Iterate widgets queued for enabling after their loading
+		for widgetName,widgetData in pairs(self.enableQueue) do
+			if (widgetData.addonName == arg1) then
 				UIWidgetsEnable[widgetName](self, unpack(widgetData.args))
 				self.enableQueue[widgetName] = nil
 				found = true
-			else 
+			else
 				hasQueued = true
-			end 
+			end
 			-- Definitely not the fastest way, but sufficient for our purpose
 			if (found) and (hasQueued) then
 				break
 			end
-		end 
-		
+		end
+
 		-- Iterate widgets queued for styling after their loading
-		for widgetName, widgetData in pairs(self.stylingQueue) do 
-			if (widgetData.addonName == arg1) then 
+		for widgetName, widgetData in pairs(self.stylingQueue) do
+			if (widgetData.addonName == arg1) then
 				UIWidgetStyling[widgetName](self, unpack(widgetData.args))
 				self.stylingQueue[widgetName] = nil
 				found = true
-			else 
+			else
 				hasQueued = true
-			end 
+			end
 			if (found) and (hasQueued) then
 				break
 			end
-		end 
+		end
 
 		-- Nothing queued, kill off this event
-		if (not hasQueued) then 
-			if self:IsEventRegistered("ADDON_LOADED", "OnEvent") then 
+		if (not hasQueued) then
+			if self:IsEventRegistered("ADDON_LOADED", "OnEvent") then
 				self:UnregisterEvent("ADDON_LOADED", "OnEvent")
-			end 
-		end 
-	end 
-end 
+			end
+		end
+	end
+end
 
 -- Library Public API
 -----------------------------------------------------------------
 LibBlizzard.EnableUIWidget = function(self, name, ...)
 	-- Just silently fail for widgets that don't exist.
-	-- Makes it much simpler during development, 
+	-- Makes it much simpler during development,
 	-- and much easier in the future to upgrade.
-	if (not UIWidgetsEnable[name]) then 
+	if (not UIWidgetsEnable[name]) then
 		if (self.AddDebugMessageFormatted) then
 			self:AddDebugMessageFormatted(("LibBlizzard: The UI widget '%s' does not have an Enable method."):format(name))
 		end
-		return 
-	end 
+		return
+	end
 	local dependency = UIWidgetDependency[name]
-	if (dependency) then 
-		if (not IsAddOnLoaded(dependency)) then 
+	if (dependency) then
+		if (not IsAddOnLoaded(dependency)) then
 			LibBlizzard.enableQueue[name] = { addonName = dependency, args = { ... } }
-			if (not LibBlizzard:IsEventRegistered("ADDON_LOADED", "OnEvent")) then 
+			if (not LibBlizzard:IsEventRegistered("ADDON_LOADED", "OnEvent")) then
 				LibBlizzard:RegisterEvent("ADDON_LOADED", "OnEvent")
-			end 
-			return 
-		end 
-	end 
+			end
+			return
+		end
+	end
 	UIWidgetsEnable[name](LibBlizzard, ...)
 end
 
 LibBlizzard.DisableUIWidget = function(self, name, ...)
 	-- Just silently fail for widgets that don't exist.
-	-- Makes it much simpler during development, 
+	-- Makes it much simpler during development,
 	-- and much easier in the future to upgrade.
-	if (not UIWidgetsDisable[name]) then 
+	if (not UIWidgetsDisable[name]) then
 		if (self.AddDebugMessageFormatted) then
 			self:AddDebugMessageFormatted(("LibBlizzard: The UI widget '%s' does not exist."):format(name))
 		end
-		return 
-	end 
+		return
+	end
 	local dependency = UIWidgetDependency[name]
-	if (dependency) then 
-		if (not IsAddOnLoaded(dependency)) then 
+	if (dependency) then
+		if (not IsAddOnLoaded(dependency)) then
 			LibBlizzard.queue[name] = { addonName = dependency, args = { ... } }
-			if (not LibBlizzard:IsEventRegistered("ADDON_LOADED", "OnEvent")) then 
+			if (not LibBlizzard:IsEventRegistered("ADDON_LOADED", "OnEvent")) then
 				LibBlizzard:RegisterEvent("ADDON_LOADED", "OnEvent")
-			end 
-			return 
-		end 
-	end 
+			end
+			return
+		end
+	end
 	UIWidgetsDisable[name](LibBlizzard, ...)
 end
 
 LibBlizzard.StyleUIWidget = function(self, name, ...)
 	-- Just silently fail for widgets that don't exist.
-	-- Makes it much simpler during development, 
+	-- Makes it much simpler during development,
 	-- and much easier in the future to upgrade.
-	if (not UIWidgetStyling[name]) then 
+	if (not UIWidgetStyling[name]) then
 		if (self.AddDebugMessageFormatted) then
 			self:AddDebugMessageFormatted(("LibBlizzard: The UI widget '%s' does not exist."):format(name))
 		end
-		return 
-	end 
+		return
+	end
 	local dependency = UIWidgetDependency[name]
-	if (dependency) then 
-		if (not IsAddOnLoaded(dependency)) then 
+	if (dependency) then
+		if (not IsAddOnLoaded(dependency)) then
 			LibBlizzard.stylingQueue[name] = { addonName = dependency, args = { ... } }
-			if (not LibBlizzard:IsEventRegistered("ADDON_LOADED", "OnEvent")) then 
+			if (not LibBlizzard:IsEventRegistered("ADDON_LOADED", "OnEvent")) then
 				LibBlizzard:RegisterEvent("ADDON_LOADED", "OnEvent")
-			end 
-			return 
-		end 
-	end 
+			end
+			return
+		end
+	end
 	UIWidgetStyling[name](LibBlizzard, ...)
 end
 
@@ -1940,11 +1884,11 @@ LibBlizzard.DisableUIMenuOption = function(self, option_shrink, option_name)
 	if option_shrink then
 		option:SetHeight(0.00001)
 		-- Needed for the options to shrink properly.
-		-- Will mess up alignment for indented options, 
+		-- Will mess up alignment for indented options,
 		-- so only use this when the following options is
 		-- horizontally aligned with the removed one.
 		if (option_shrink == true) then
-			option:SetScale(0.00001) 
+			option:SetScale(0.00001)
 		end
 	end
 	option.cvar = ""
@@ -1957,7 +1901,7 @@ end
 
 LibBlizzard.DisableUIMenuPage = function(self, panel_id, panel_name)
 	local button,window
-	-- remove an entire blizzard options panel, 
+	-- remove an entire blizzard options panel,
 	-- and disable its automatic cancel/okay functionality
 	-- this is needed, or the option will be reset when the menu closes
 	-- it is also a major source of taint related to the Compact group frames!
@@ -1982,23 +1926,23 @@ LibBlizzard.DisableUIMenuPage = function(self, panel_id, panel_name)
 			window = true
 		end
 	end
-	-- By removing the menu panels above we're preventing the blizzard UI from calling it, 
-	-- and for some reason it is required to be called at least once, 
-	-- or the game won't fire off the events that tell the UI that the player has an active pet out. 
+	-- By removing the menu panels above we're preventing the blizzard UI from calling it,
+	-- and for some reason it is required to be called at least once,
+	-- or the game won't fire off the events that tell the UI that the player has an active pet out.
 	-- In other words: without it both the pet bar and pet unitframe will fail after a /reload
-	if (panel_id == 5) or (panel_name == "InterfaceOptionsActionBarsPanel") then 
+	if (panel_id == 5) or (panel_name == "InterfaceOptionsActionBarsPanel") then
 		SetActionBarToggles(nil, nil, nil, nil, nil)
-	end 
+	end
 	if (panel_id and not button) then
 		if (self.AddDebugMessageFormatted) then
 			self:AddDebugMessageFormatted(("LibBlizzard: The panel button with id '%.0f' does not exist."):format(panel_id))
 		end
-	end 
+	end
 	if (panel_name and not window) then
 		if (self.AddDebugMessageFormatted) then
 			self:AddDebugMessageFormatted(("LibBlizzard: The menu panel named '%s' does not exist."):format(panel_name))
 		end
-	end 
+	end
 end
 
 -- Module embedding
diff --git a/SimpleClassPower/back-end/libraries/cast.lua b/SimpleClassPower/back-end/libraries/cast.lua
index 2a5a993..8919383 100644
--- a/SimpleClassPower/back-end/libraries/cast.lua
+++ b/SimpleClassPower/back-end/libraries/cast.lua
@@ -1,4 +1,4 @@
-local LibCast = Wheel:Set("LibCast", 13)
+local LibCast = Wheel:Set("LibCast", 15)
 if (not LibCast) then
 	return
 end
@@ -66,18 +66,20 @@ local UnitCasts = LibCast.unitCastsByGUID
 local playerGUID = UnitGUID("player")
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 -- Utility Functions
 --------------------------------------------------------------------------
--- Syntax check 
+-- Syntax check
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -91,21 +93,21 @@ if (IsClassic) then
 
 	-- @return spellName, spellText, spellIcon, castStart, castEnd, isTradeSkill, notInterruptible, spellID
 	LibCast.UnitCastingInfo = function(self, unit)
-		if (UnitIsUnit(unit, "player")) then 
+		if (UnitIsUnit(unit, "player")) then
 			local spellName, spellText, spellIcon, castStart, castEnd, isTradeSkill, _, notInterruptible = CastingInfo()
-			if (spellName) then 
+			if (spellName) then
 				return spellName, spellText, spellIcon, castStart/1e3, castEnd/1e3, isTradeSkill, notInterruptible, self:GetSpellID(spellName)
-			end 
-		end 
+			end
+		end
 		local unitGUID = UnitGUID(unit)
-		if (not unitGUID) then 
-			return 
+		if (not unitGUID) then
+			return
 		end
 		local castData = UnitCasts[unitGUID]
-		if (not castData) then 
-			return 
-		end 
-		if (not castData.isChanneled) then 
+		if (not castData) then
+			return
+		end
+		if (not castData.isChanneled) then
 			return 	castData.spellName, -- name
 					castData.spellText, -- text
 					castData.spellIcon, -- texture
@@ -116,24 +118,24 @@ if (IsClassic) then
 					castData.spellID 	-- spellID
 		end
 	end
-	
+
 	-- @return spellName, spellText, spellIcon, castStart, castEnd, isTradeSkill, notInterruptible, spellID
 	LibCast.UnitChannelInfo = function(self, unit)
-		if (UnitIsUnit(unit, "player")) then 
+		if (UnitIsUnit(unit, "player")) then
 			local spellName, spellText, spellIcon, castStart, castEnd, isTradeSkill, _, notInterruptible = ChannelInfo()
-			if (spellName) then 
+			if (spellName) then
 				return spellName, spellText, spellIcon, castStart/1e3, castEnd/1e3, isTradeSkill, notInterruptible, self:GetSpellID(spellName)
-			end 
-		end 
+			end
+		end
 		local unitGUID = UnitGUID(unit)
-		if (not unitGUID) then 
-			return 
+		if (not unitGUID) then
+			return
 		end
 		local castData = UnitCasts[unitGUID]
-		if (not castData) then 
-			return 
-		end 
-		if (castData.isChanneled) then 
+		if (not castData) then
+			return
+		end
+		if (castData.isChanneled) then
 			return 	castData.spellName, -- name
 					castData.spellText, -- text
 					castData.spellIcon, -- texture
@@ -146,7 +148,7 @@ if (IsClassic) then
 	end
 
 	LibCast.StoreCast = function(self, unitGUID, spellID, spellName, spellIcon, castTime, isChanneled)
-		if (not UnitCasts[unitGUID]) then 
+		if (not UnitCasts[unitGUID]) then
 			UnitCasts[unitGUID] = {}
 		end
 		local castData = UnitCasts[unitGUID]
@@ -160,13 +162,13 @@ if (IsClassic) then
 		castData.castEnd = castData.castStart + castData.castDuration -- when the cast is scheduled to end
 		castData.castDelay = nil -- any other delays (?)
 		castData.castPushback = nil -- pushbacks registered so far
-		castData.castPushbackNext = nil -- the duration of the next pushback 
+		castData.castPushbackNext = nil -- the duration of the next pushback
 		castData.isChanneled = isChanneled
 		castData.isCasting = not isChanneled
-	end 
-	
+	end
+
 	LibCast.DeleteCast = function(self, unitGUID)
-		if (not UnitCasts[unitGUID]) then 
+		if (not UnitCasts[unitGUID]) then
 			return
 		end
 		local castData = UnitCasts[unitGUID]
@@ -183,45 +185,45 @@ if (IsClassic) then
 		castData.castPushbackNext = nil
 		castData.isChanneled = nil
 		castData.isCasting = nil
-	end 
-	
+	end
+
 	-- Sets a cast delay
 	LibCast.SetCastDelay = function(self, unitGUID, castDelay)
-		if (not UnitCasts[unitGUID]) then 
+		if (not UnitCasts[unitGUID]) then
 			return
 		end
 		local castData = UnitCasts[unitGUID]
-		if (castData.isCasting) or (castData.isChanneled) then 
+		if (castData.isCasting) or (castData.isChanneled) then
 			castData.castDelay = (castData.castDelay or 0) + castDelay
-		end 
-	end 
-	
+		end
+	end
+
 	-- Sets cast pushback.
 	-- This shouldn't affect bar values,
 	-- but rather the current position in the cast.
 	LibCast.SetCastPushback = function(self, unitGUID)
-		if (not UnitCasts[unitGUID]) then 
+		if (not UnitCasts[unitGUID]) then
 			return
 		end
 		local castData = UnitCasts[unitGUID]
 		if (castData.isChanneled) then
-			if (not castData.castDuration) then 
-				return 
+			if (not castData.castDuration) then
+				return
 			end
-	
+
 			-- Channeled spells are reduced by 25% per hit.
 			-- *CHECK: Is it 25% of the remaining or full duration?
 			local reduction = castData.castDuration * .25
 			local now = GetTime()
-	
-			-- Cast time cannot be less than zero. 
+
+			-- Cast time cannot be less than zero.
 			castData.castDuration = math_max(castData.castDuration - reduction, 0)
-	
+
 			-- Cast end cannot suddenly be in the past.
 			castData.castEnd = math_max(castData.castEnd - reduction, now)
-	
+
 		elseif (castData.isCasting) then
-	
+
 			-- (Source: https://wow.gamepedia.com/index.php?title=Interrupt&oldid=305918)
 			--     "The first attack will set your casting time back by 1 sec.
 			--      Any consequent attack will set it back by a lower amount.
@@ -230,152 +232,152 @@ if (IsClassic) then
 			--      However, no attack will actually increase the casting time.
 			--      For example if you cast only 0.2 sec. of a spell,
 			--      it would only be set back by that amount."
-			-- 
+			--
 			--  I'm going to interprete the above as that the pushback can
 			--  only ever push the spell back to the beginning of the cast,
 			--  not before it, meaning the maximum CURRENT pushback will only
 			--  ever be as big as the position of the cast in the castbar.
-			--  
+			--
 			--  This clearly defines a few problems with how castbars traditionally
 			--  have been displayed, as they tend to prolong the duration of the cast
 			--  instead of adjusting/pushing back our own current position in it.
-			--  
+			--
 			--  The problem with this is that this approach increases the maxvalue
 			--  of the cast, and thus giving the illusion that our current position
 			--  is farther ahead relative to the full bar than it actually is.
-			--  
+			--
 			--  I'd prefer going with an approach that respects logic,
 			--  but as it stands, logic doesn't exist in this dojo.
 			--  So we do it their way.
-			--  
+			--
 			--  Goldpaw
-	
+
 			-- Make sure we have an initial pushback value
 			local pushbackValue = castData.castPushbackNext or 1
-	
+
 			-- Retrieve the current position in the cast relative to its start time
-			-- We take the previous delays into consideration here, 
+			-- We take the previous delays into consideration here,
 			-- as this part actually does need to follow the laws of game logic.
 			local currentCastPosition = GetTime() - castData.castStart - (castData.castPushback or 0)
-	
+
 			-- The current pushback can never excede how far the spell
-			-- has currently cast, so we're adding in some magic to ensure that. 
+			-- has currently cast, so we're adding in some magic to ensure that.
 			local currentPushback = math_min(pushbackValue, currentCastPosition)
-	
+
 			-- Move the point in time the cast is scheduled to end forward
 			castData.castDuration = castData.castDuration + currentPushback
 			castData.castEnd = castData.castEnd + currentPushback
-	
+
 			-- Register how much the cast has been delayed so far in total
 			castData.castPushback = (castData.castPushback or 0) + currentPushback
-	
+
 			-- Decrease the pushback value for the next pushback
 			-- The minimum pushback is 0.2 seconds, so keep it at or above that.
 			castData.castPushbackNext = math_max(pushbackValue - .2, .2)
 		end
 	end
-	
+
 	-- CLEU event handler
 	LibCast.OnCombatLogEvent = function(self, timeStamp, eventType, hideCaster, sourceGUID, sourceName, sourceFlags, sourceRaidFlags,
 		destGUID, destName, destFlags, destRaidFlags, ...)
-	
+
 		if (eventType == "SPELL_CAST_START") then
 			local _, spellName = ...
 			local spellID = self:GetSpellID(spellName)
-			if (not spellID) then 
-				return 
+			if (not spellID) then
+				return
 			end
-	
+
 			local _, _, spellIcon, castTime = self:GetSpellInfo(spellID)
-			if ((not castTime) or (castTime == 0)) then 
-				return 
+			if ((not castTime) or (castTime == 0)) then
+				return
 			end
-	
+
 			-- Assume people have talented cast time reductions active
 			local reducedTime = self:GetSpellCastTimeDecrease(spellName)
 			if (reducedTime) then
 				-- Only reduce cast time for player casted ability
-				if (bit_band(sourceFlags, COMBATLOG_OBJECT_TYPE_PLAYER) > 0) then 
+				if (bit_band(sourceFlags, COMBATLOG_OBJECT_TYPE_PLAYER) > 0) then
 					castTime = castTime - (reducedTime * 1000)
 				end
 			end
-	
+
 			-- Store the cast data
 			self:StoreCast(sourceGUID, spellID, spellName, spellIcon, castTime, false)
-	
+
 			-- Tell listeners about the event
 			self:SendMessage("GP_SPELL_CAST_START", sourceGUID)
 			return
-	
-		elseif (eventType == "SPELL_CAST_SUCCESS") then 
-			
+
+		elseif (eventType == "SPELL_CAST_SUCCESS") then
+
 			-- Channeled spells are started on SPELL_CAST_SUCCESS instead of stopped
 			local _, spellName = ...
-			local castTime, spellID = self:GetSpellChannelInfo(spellName) 
+			local castTime, spellID = self:GetSpellChannelInfo(spellName)
 			if (spellID) then
-				if ((not castTime) or (castTime == 0)) then 
-					return 
+				if ((not castTime) or (castTime == 0)) then
+					return
 				end
 				local _, _, spellIcon = self:GetSpellInfo(spellID)
-					
+
 				-- Assume people have talented cast time reductions active
 				local reducedTime = self:GetSpellCastTimeDecrease(spellName)
 				if (reducedTime) then
 					-- Only reduce cast time for player casted ability
-					if (bit_band(sourceFlags, COMBATLOG_OBJECT_TYPE_PLAYER) > 0) then 
+					if (bit_band(sourceFlags, COMBATLOG_OBJECT_TYPE_PLAYER) > 0) then
 						castTime = castTime - (reducedTime * 1000)
 					end
 				end
-	
-				-- Store the channeled data 
+
+				-- Store the channeled data
 				self:StoreCast(sourceGUID, spellID, spellName, spellIcon, castTime, true)
-	
+
 				-- Tell listeners about the event
 				self:SendMessage("GP_SPELL_CAST_CHANNEL_START", sourceGUID)
-				return 
+				return
 			end
-	
+
 			-- Delete the cast data
 			self:DeleteCast(sourceGUID)
-	
+
 			-- Tell listeners about the event
 			self:SendMessage("GP_SPELL_CAST_STOP", sourceGUID)
 			return
-	
-		elseif (eventType == "SPELL_AURA_APPLIED") then 
-	
+
+		elseif (eventType == "SPELL_AURA_APPLIED") then
+
 			local _, spellName = ...
 			local castIncrease = self:GetSpellCastTimeIncrease(spellName)
 			if (castIncrease) then
-	
+
 				-- An aura that slows cast speed was applied
 				self:SetCastDelay(destGUID, castIncrease)
 				return
-	
+
 			elseif (self:CanAuraInterruptSpellCast(spellName)) then
-	
+
 				-- An aura that interrupted the cast was applied
 				self:DeleteCast(destGUID)
-				
+
 				-- Tell listeners about the event
 				self:SendMessage("GP_SPELL_CAST_INTERRUPTED", destGUID)
-				return 
+				return
 			end
-	
-		elseif (eventType == "SPELL_AURA_REMOVED") then 
-	
+
+		elseif (eventType == "SPELL_AURA_REMOVED") then
+
 			-- Channeled spells have no events for channel stop,
 			-- so we're relying on their aura to figure out when it's over.
 			local _, spellName = ...
 			if (self:GetSpellChannelInfo(spellName)) then
-	
-				-- This was a channeled cast, so delete it. 
+
+				-- This was a channeled cast, so delete it.
 				self:DeleteCast(sourceGUID)
-	
+
 				-- Tell listeners about the event
 				self:SendMessage("GP_SPELL_CAST_CHANNEL_STOP", sourceGUID)
 				return
-	
+
 			else
 				local castIncrease = self:GetSpellCastTimeIncrease(spellName)
 				if (castIncrease) then
@@ -384,60 +386,60 @@ if (IsClassic) then
 					return
 				end
 			end
-	
-	
-		elseif (eventType == "SPELL_CAST_FAILED") then 
+
+
+		elseif (eventType == "SPELL_CAST_FAILED") then
 			local _, spellName, _, failedType = ...
-	
+
 			-- Spamming cast keybinds triggers SPELL_CAST_FAILED,
-			-- so make sure we're not deleting active casts here. 
+			-- so make sure we're not deleting active casts here.
 			if ((sourceGUID == playerGUID) and CastingInfo("player")) then
-				return 
-			end 
-	
+				return
+			end
+
 			-- Delete the cast
 			self:DeleteCast(sourceGUID)
-			
+
 			-- Tell listeners about the event
 			self:SendMessage("GP_SPELL_CAST_INTERRUPTED", sourceGUID)
 			return
-	
-		elseif (eventType == "SPELL_INTERRUPT") then 
+
+		elseif (eventType == "SPELL_INTERRUPT") then
 			local _, spellName, _, extraSpellId, extraSpellName, extraSchool = ...
-	
+
 			-- Delete the cast
-			self:DeleteCast(destGUID) -- was sourceGUID. that's wrong. 
-			
+			self:DeleteCast(destGUID) -- was sourceGUID. that's wrong.
+
 			-- Tell listeners about the event
-			self:SendMessage("GP_SPELL_CAST_INTERRUPTED", destGUID) -- was sourceGUID. that's wrong. 
+			self:SendMessage("GP_SPELL_CAST_INTERRUPTED", destGUID) -- was sourceGUID. that's wrong.
 			return
-			
-		elseif (eventType == "PARTY_KILL") or (eventType == "UNIT_DIED") then 
-	
+
+		elseif (eventType == "PARTY_KILL") or (eventType == "UNIT_DIED") then
+
 			-- Figure out if it was channeled or a cast
 			local castData = UnitCasts[sourceGUID]
 			local isChanneled = castData and castData.isChanneled
-	
+
 			-- Delete the cast
 			self:DeleteCast(sourceGUID)
-			
+
 			-- Tell listeners about the event
-			if (isChanneled) then 
+			if (isChanneled) then
 				self:SendMessage("GP_SPELL_CAST_CHANNEL_STOP", sourceGUID)
 			else
 				self:SendMessage("GP_SPELL_CAST_STOP", sourceGUID)
-			end 
+			end
 			return
-	
-		elseif (eventType == "SWING_DAMAGE") or (eventType == "RANGE_DAMAGE") or (eventType == "SPELL_DAMAGE") or (eventType == "ENVIRONMENTAL_DAMAGE") then 
-			
+
+		elseif (eventType == "SWING_DAMAGE") or (eventType == "RANGE_DAMAGE") or (eventType == "SPELL_DAMAGE") or (eventType == "ENVIRONMENTAL_DAMAGE") then
+
 			local environmentalType
 			local spellId, spellName, spellSchool
 			local amount, overkill, school
 			local resisted, blocked, absorbed
 			local critical, glancing, crushing
 			local isOffHand
-	
+
 			if (eventType == "SWING_DAMAGE") then
 				amount, overkill, school, resisted, blocked, absorbed, critical, glancing, crushing, isOffHand = ...
 			elseif (eventType == "ENVIRONMENTAL_DAMAGE") then
@@ -445,16 +447,16 @@ if (IsClassic) then
 			elseif (eventType == "RANGE_DAMAGE") or (eventType == "SPELL_DAMAGE") then
 				spellId, spellName, spellSchool, amount, overkill, school, resisted, blocked, absorbed, critical, glancing, crushing, isOffHand = ...
 			end
-	
-			if (blocked or absorbed) then 
-				return 
+
+			if (blocked or absorbed) then
+				return
 			end
-	
-			if (bit_band(destFlags, COMBATLOG_OBJECT_TYPE_PLAYER) > 0) then 
-	
+
+			if (bit_band(destFlags, COMBATLOG_OBJECT_TYPE_PLAYER) > 0) then
+
 				-- Remove the delay
 				self:SetCastPushback(destGUID)
-	
+
 				-- Tell listeners about the event
 				self:SendMessage("GP_SPELL_CAST_DELAYED", destGUID)
 				return
@@ -464,7 +466,7 @@ if (IsClassic) then
 
 end
 
-if (IsRetail or IsTBC) then
+if (IsRetail or IsTBC or IsWrath) then
 
 	-- @return spellName, spellText, spellIcon, castStart, castEnd, isTradeSkill, notInterruptible, spellID
 	LibCast.UnitCastingInfo = function(self, unit)
@@ -539,15 +541,15 @@ if (IsClassic) then
 		self:RegisterUnitEvent("UNIT_SPELLCAST_CHANNEL_START", "OnEvent", "player")
 		self:RegisterUnitEvent("UNIT_SPELLCAST_CHANNEL_UPDATE", "OnEvent", "player")
 		self:RegisterUnitEvent("UNIT_SPELLCAST_CHANNEL_STOP", "OnEvent", "player")
-	
-		-- Just a little proxy here to make the API easier to work with. 
+
+		-- Just a little proxy here to make the API easier to work with.
 		self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED", function(self, event, ...)
 			return self:OnCombatLogEvent(CombatLogGetCurrentEventInfo())
 		end)
 	end
 end
 
-if (IsRetail or IsTBC) then
+if (IsRetail or IsTBC or IsWrath) then
 	LibCast.OnInit = function(self)
 		self:UnregisterEvent("PLAYER_LOGIN", "OnInit")
 
diff --git a/SimpleClassPower/back-end/libraries/chatbubble.lua b/SimpleClassPower/back-end/libraries/chatbubble.lua
index c5d883b..a1b5f56 100644
--- a/SimpleClassPower/back-end/libraries/chatbubble.lua
+++ b/SimpleClassPower/back-end/libraries/chatbubble.lua
@@ -1,5 +1,5 @@
-local LibChatBubble = Wheel:Set("LibChatBubble", 28)
-if (not LibChatBubble) then	
+local LibChatBubble = Wheel:Set("LibChatBubble", 29)
+if (not LibChatBubble) then
 	return
 end
 
@@ -36,8 +36,10 @@ local SetCVar = SetCVar
 local UnitAffectingCombat = UnitAffectingCombat
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 -- Textures
@@ -93,10 +95,10 @@ local getMaxWidth = function()
 	return 400 + math_floor((LibChatBubble.fontSize - 12)/22 * 260)
 end
 
-local getBackdrop = function(scale) 
+local getBackdrop = function(scale)
 	return {
-		bgFile = [[Interface\Tooltips\CHATBUBBLE-BACKGROUND]], 
-		edgeFile = [[Interface\Tooltips\CHATBUBBLE-BACKDROP]],  
+		bgFile = [[Interface\Tooltips\CHATBUBBLE-BACKGROUND]],
+		edgeFile = [[Interface\Tooltips\CHATBUBBLE-BACKDROP]],
 		edgeSize = 16 * scale,
 		insets = {
 			left = 16 * scale,
@@ -107,10 +109,10 @@ local getBackdrop = function(scale)
 	}
 end
 
-local getBackdropClean = function(scale) 
+local getBackdropClean = function(scale)
 	return {
-		bgFile = BLANK_TEXTURE,  
-		edgeFile = TOOLTIP_BORDER, 
+		bgFile = BLANK_TEXTURE,
+		edgeFile = TOOLTIP_BORDER,
 		edgeSize = 16 * scale,
 		insets = {
 			left = 2.5 * scale,
@@ -128,16 +130,16 @@ local OnUpdate = function(self)
 	local scale = WorldFrame:GetHeight()/UIParent:GetHeight()
 	for _, bubble in pairs(GetAllChatBubbles()) do
 
-		if (not customBubbles[bubble]) then 
+		if (not customBubbles[bubble]) then
 			LibChatBubble:InitBubble(bubble)
-		end 
+		end
 
 		local customBubble = customBubbles[bubble]
 
 		if bubble:IsShown() then
-			-- continuing the fight against overlaps blending into each other! 
+			-- continuing the fight against overlaps blending into each other!
 			customBubbles[bubble]:SetFrameLevel(bubble:GetFrameLevel()) -- this works?
-			
+
 			local blizzTextWidth = math_floor(customBubble.blizzardText:GetWidth())
 			local blizzTextHeight = math_floor(customBubble.blizzardText:GetHeight())
 			local point, anchor, rpoint, blizzX, blizzY = customBubble.blizzardText:GetPoint()
@@ -168,19 +170,19 @@ local OnUpdate = function(self)
 				local ourTextHeight = customBubbles[bubble].text:GetHeight()
 
 				-- chatbubbles are rendered at BOTTOM, WorldFrame, BOTTOMLEFT, x, y
-				local ourX = math_floor(offsetX + (blizzX - blizzTextWidth/2)/scale - (ourTextWidth-blizzTextWidth)/2) 
+				local ourX = math_floor(offsetX + (blizzX - blizzTextWidth/2)/scale - (ourTextWidth-blizzTextWidth)/2)
 				local ourY = math_floor(offsetY + blizzY/scale - (ourTextHeight-blizzTextHeight)/2) -- get correct bottom coordinate
 				local ourWidth = math_floor(ourTextWidth + space*2)
 				local ourHeight = math_floor(ourTextHeight + space*2)
 
 				-- hide while sizing and moving, to gain fps
-				customBubbles[bubble]:Hide() 
+				customBubbles[bubble]:Hide()
 				customBubbles[bubble]:SetSize(ourWidth, ourHeight)
 				customBubbles[bubble]:SetBackdropColor(0, 0, 0, .5)
 				customBubbles[bubble]:SetBackdropBorderColor(0, 0, 0, .5)
 
 				-- show the bubble again
-				customBubbles[bubble]:Show() 
+				customBubbles[bubble]:Show()
 			end
 
 			customBubble.blizzardText:SetAlpha(0)
@@ -192,8 +194,8 @@ local OnUpdate = function(self)
 			end
 		end
 	end
-	for bubble in pairs(customBubbles) do 
-		if (not bubble:IsShown()) and (customBubbles[bubble]:IsShown()) then 
+	for bubble in pairs(customBubbles) do
+		if (not bubble:IsShown()) and (customBubbles[bubble]:IsShown()) then
 			customBubbles[bubble]:Hide()
 		end
 	end
@@ -203,8 +205,8 @@ LibChatBubble.DisableBlizzard = function(self, bubble)
 	local customBubble = customBubbles[bubble]
 
 	-- Grab the original bubble's text color
-	customBubble.blizzardColor[1], 
-	customBubble.blizzardColor[2], 
+	customBubble.blizzardColor[1],
+	customBubble.blizzardColor[2],
 	customBubble.blizzardColor[3] = customBubble.blizzardText:GetTextColor()
 
 	-- Make the original blizzard text transparent
@@ -213,7 +215,7 @@ LibChatBubble.DisableBlizzard = function(self, bubble)
 	-- Remove all the default textures
 	for region, texture in pairs(customBubbles[bubble].blizzardRegions) do
 		-- Needed in classic, as the game keeps resetting the alpha.
-		if (IsClassic or IsTBC) then
+		if (IsClassic or IsTBC or IsWrath) then
 			region:SetTexture(nil)
 		end
 		region:SetAlpha(0)
@@ -277,13 +279,13 @@ LibChatBubble.InitBubble = function(self, bubble)
 		customBubble.blizzardBackdropFrame = customBubble
 		customBubble.blizzardBackdrop = customBubble:GetBackdrop()
 	end
-	
+
 	customBubble.text = customBubble:CreateFontString()
 	customBubble.text:SetPoint("BOTTOMLEFT", 12, 12)
-	customBubble.text:SetFontObject(LibChatBubble:GetFontObject()) 
+	customBubble.text:SetFontObject(LibChatBubble:GetFontObject())
 	customBubble.text:SetShadowOffset(0, 0)
 	customBubble.text:SetShadowColor(0, 0, 0, 0)
-	
+
 	-- Old way, still active in classic.
 	-- Update 22-03-2021: NOT working in classic anymore?!
 	for i = 1, bubble:GetNumRegions() do
@@ -315,44 +317,44 @@ LibChatBubble.InitBubble = function(self, bubble)
 			end
 		end
 	end
-	
+
 	customBubbles[bubble] = customBubble
 
-	-- Only disable the Blizzard bubble outside of instances, 
-	-- and only when any cinematics aren't playing. 
+	-- Only disable the Blizzard bubble outside of instances,
+	-- and only when any cinematics aren't playing.
 	local _, instanceType = IsInInstance()
 	if ((instanceType == "none") and (not MovieFrame:IsShown()) and (not CinematicFrame:IsShown()) and UIParent:IsShown()) then
 		LibChatBubble:DisableBlizzard(bubble)
 	end
 
-	if LibChatBubble.PostCreateBubble then 
+	if LibChatBubble.PostCreateBubble then
 		LibChatBubble.PostCreateBubble(bubble)
-	end 
+	end
 end
 
 LibChatBubble.PostCreateBubble = function(self, bubble)
-	if LibChatBubble.PostCreateBubbleFunc then 
+	if LibChatBubble.PostCreateBubbleFunc then
 		LibChatBubble.PostCreateBubbleFunc(bubble)
-	end 
-end 
+	end
+end
 
 LibChatBubble.SetBubblePostCreateFunc = function(self, func)
 	LibChatBubble.PostCreateBubbleFunc = func
-end 
+end
 
 LibChatBubble.SetBubblePostUpdateFunc = function(self, func)
 	LibChatBubble.PostUpdateBubbleFunc = func
-end 
+end
 
 -- Seems to be some taint when CinematicFrame is shown, in here?
 LibChatBubble.UpdateBubbleVisibility = function(self)
-	-- Add an extra layer of combat protection here, 
+	-- Add an extra layer of combat protection here,
 	-- in case we got here abruptly by a started cinematic.
-	if (InCombatLockdown()) then 
+	if (InCombatLockdown()) then
 		return self:RegisterEvent("PLAYER_REGEN_ENABLED", "OnEvent")
 	end
 	local _, instanceType = IsInInstance()
-	if ((instanceType == "none") and (not MovieFrame:IsShown()) and (not CinematicFrame:IsShown()) and UIParent:IsShown()) then 
+	if ((instanceType == "none") and (not MovieFrame:IsShown()) and (not CinematicFrame:IsShown()) and UIParent:IsShown()) then
 
 		-- Start our updater, this will show our bubbles.
 		bubbleUpdater:SetScript("OnUpdate", OnUpdate)
@@ -403,7 +405,7 @@ LibChatBubble.EnableBubbleStyling = function(self)
 	LibChatBubble:RegisterEvent("PLAYER_REGEN_DISABLED", "OnEvent")
 	LibChatBubble:RegisterEvent("PLAYER_REGEN_ENABLED", "OnEvent")
 	LibChatBubble:OnEvent("PLAYER_ENTERING_WORLD")
-end 
+end
 
 LibChatBubble.DisableBubbleStyling = function(self)
 	LibChatBubble.stylingEnabled = nil
@@ -411,18 +413,18 @@ LibChatBubble.DisableBubbleStyling = function(self)
 	LibChatBubble:UnregisterEvent("PLAYER_REGEN_DISABLED", "OnEvent")
 	LibChatBubble:UnregisterEvent("PLAYER_REGEN_ENABLED", "OnEvent")
 	LibChatBubble:OnEvent("PLAYER_ENTERING_WORLD")
-end 
+end
 
 LibChatBubble.GetAllChatBubbles = function(self)
 	return pairs(GetAllChatBubbles())
 end
 
 LibChatBubble.OnEvent = function(self, event, ...)
-	if (event == "PLAYER_ENTERING_WORLD") then 
+	if (event == "PLAYER_ENTERING_WORLD") then
 
-		-- Don't ever do any of this while in combat. 
-		-- This should never happen, we're just being overly safe here. 
-		if (InCombatLockdown()) then 
+		-- Don't ever do any of this while in combat.
+		-- This should never happen, we're just being overly safe here.
+		if (InCombatLockdown()) then
 			return self:RegisterEvent("PLAYER_REGEN_ENABLED", "OnEvent")
 		end
 
@@ -476,14 +478,14 @@ LibChatBubble.OnEvent = function(self, event, ...)
 			self:ClearHook(CinematicFrame, "OnShow", "UpdateBubbleVisibility", "GP_CINEMATICFRAME_ONSHOW_BUBBLEUPDATE")
 			self:ClearHook(MovieFrame, "OnHide", "UpdateBubbleVisibility", "GP_MOVIEFRAME_ONHIDE_BUBBLEUPDATE")
 			self:ClearHook(MovieFrame, "OnShow", "UpdateBubbleVisibility", "GP_MOVIEFRAME_ONSHOW_BUBBLEUPDATE")
-		end 
+		end
 
 		self:UpdateBubbleVisibility()
 
-	elseif (event == "PLAYER_REGEN_ENABLED") then 
+	elseif (event == "PLAYER_REGEN_ENABLED") then
 		return self:OnEvent("PLAYER_ENTERING_WORLD")
 
-	elseif (event == "PLAYER_REGEN_DISABLED") then 
+	elseif (event == "PLAYER_REGEN_DISABLED") then
 		return self:OnEvent("PLAYER_ENTERING_WORLD")
 
 	end
diff --git a/SimpleClassPower/back-end/libraries/chatframe.lua b/SimpleClassPower/back-end/libraries/chatframe.lua
index 653cce4..b9957e9 100644
--- a/SimpleClassPower/back-end/libraries/chatframe.lua
+++ b/SimpleClassPower/back-end/libraries/chatframe.lua
@@ -1,5 +1,5 @@
-local LibChatWindow, version = Wheel:Set("LibChatWindow", 36)
-if (not LibChatWindow) then	
+local LibChatWindow, version = Wheel:Set("LibChatWindow", 37)
+if (not LibChatWindow) then
 	return
 end
 
@@ -24,11 +24,11 @@ LibEvent:Embed(LibChatWindow)
 LibFrame:Embed(LibChatWindow)
 LibSecureHook:Embed(LibChatWindow)
 
--- Lua API 
+-- Lua API
 local _G = _G
 local assert = assert
 local debugstack = debugstack
-local error = error 
+local error = error
 local ipairs = ipairs
 local pairs = pairs
 local select = select
@@ -49,8 +49,10 @@ local CHAT_FRAMES = CHAT_FRAMES
 local CHAT_FRAME_TEXTURES = CHAT_FRAME_TEXTURES
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 -- Create or retrieve our registries
@@ -64,12 +66,12 @@ local windows = LibChatWindow.windows
 -- Blizzard API methods
 local SetAlpha = LibChatWindow.frame.SetAlpha
 
--- Syntax check 
+-- Syntax check
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -80,61 +82,61 @@ end
 -- module post create/post handle updates
 local postUpdateWindowProxy = function(self, frame, isTemporary, ...)
 	local postCreateWindow = isTemporary and self.PostCreateTemporaryChatWindow or self.PostCreateChatWindow
-	if postCreateWindow then 
-		if isTemporary then 
+	if postCreateWindow then
+		if isTemporary then
 			postCreateWindow(self, frame, isTemporary, ...)
-		else 
+		else
 			postCreateWindow(self, frame)
-		end 
-	end 
-end 
+		end
+	end
+end
 
 LibChatWindow.GetAllChatWindows = function(self)
 	return ipairs(CHAT_FRAMES)
-end 
+end
 
 LibChatWindow.GetAllHandledChatWindows = function(self)
 	return ipairs(windows)
-end 
+end
 
 LibChatWindow.HandleWindow = function(self, frame, isTemporary, ...)
 	-- silenty exit if the window has been handled already
-	if windows[frame] then 
-		return 
-	end 
+	if windows[frame] then
+		return
+	end
 
 	-- Add the window to our registry
-	table_insert(windows, frame)  
+	table_insert(windows, frame)
 
 	-- hashed for faster checks. we keep window data here too.
-	windows[frame] = {} 
+	windows[frame] = {}
 
 	-- module post updates
 	self:ForAllEmbeds(postUpdateWindowProxy, frame, isTemporary, ...)
 end
 
 LibChatWindow.HandleAllChatWindows = function(self)
-	for _,frameName in self:GetAllChatWindows() do 
+	for _,frameName in self:GetAllChatWindows() do
 		local frame = _G[frameName]
-		if frame then 
+		if frame then
 			LibChatWindow:HandleWindow(frame, frame.isTemporary)
-		end 
-	end 
+		end
+	end
 end
 
 LibChatWindow.IsChatWindowHandled = function(self, frame)
 	return windows[frame] and true or false
-end 
+end
 
 LibChatWindow.IsChatWindowTemporary = function(self, frame)
 	return frame.isTemporary and true or false
-end 
+end
 
 LibChatWindow.SetChatWindowPosition = function(self, frame, ...)
 	local db = windows[frame]
-	if (not db) then 
-		return 
-	end 
+	if (not db) then
+		return
+	end
 	db.slaveMaster = nil
 	db.position = { ... }
 	db.queuePositionUpdate = true
@@ -142,9 +144,9 @@ end
 
 LibChatWindow.SetChatWindowSize = function(self, frame, ...)
 	local db = windows[frame]
-	if (not db) then 
-		return 
-	end 
+	if (not db) then
+		return
+	end
 	db.slaveMaster = nil
 	db.size = { ... }
 	db.queueSizeUpdate = true
@@ -152,201 +154,201 @@ end
 
 LibChatWindow.SetChatWindowAsSlaveTo = function(self, frame, master)
 	local db = windows[frame]
-	if (not db) then 
-		return 
-	end 
+	if (not db) then
+		return
+	end
 	db.slaveMaster = master
 	db.queuePositionUpdate = true
 	db.queueSizeUpdate = true
 end
 
 LibChatWindow.UpdateChatWindowPositions = function(self, forced)
-	for _,frame in self:GetAllHandledChatWindows() do 
+	for _,frame in self:GetAllHandledChatWindows() do
 		local db = windows[frame]
-		if (db.position or db.slaveMaster) and (db.queuePositionUpdate or forced) then 
+		if (db.position or db.slaveMaster) and (db.queuePositionUpdate or forced) then
 			-- Is this the best way to stop blizzard from taking control back?
 			frame.ignoreFramePositionManager = true
-			if db.slaveMaster then 
+			if db.slaveMaster then
 				frame:ClearAllPoints()
 				frame:SetAllPoints(db.slaveMaster)
-			else 
+			else
 				frame.Place(frame, unpack(db.position))
-			end 
+			end
 			db.queuePositionUpdate = nil
-		end 
+		end
 		self:ForAllEmbeds("PostUpdateChatWindowPosition", frame)
-	end 
+	end
 end
 
 LibChatWindow.UpdateChatWindowSizes = function(self, forced)
-	for _,frame in self:GetAllHandledChatWindows() do 
+	for _,frame in self:GetAllHandledChatWindows() do
 		local db = windows[frame]
-		if (db.size or db.slaveMaster) and (db.queueSizeUpdate or forced) then 
-			if db.slaveMaster then 
+		if (db.size or db.slaveMaster) and (db.queueSizeUpdate or forced) then
+			if db.slaveMaster then
 				local scale = db.slaveMaster:GetEffectiveScale()
 				local width, height = db.slaveMaster:GetSize()
 				frame:SetSize(width/scale, height/scale)
-			else 
+			else
 				frame:SetSize(unpack(db.size))
-			end 
+			end
 			db.queueSizeUpdate = nil
-		end 
+		end
 		self:ForAllEmbeds("PostUpdateChatWindowSize", frame)
-	end 
+	end
 end
 
 LibChatWindow.UpdateChatWindowColors = function(self, forced)
-	for _,frame in self:GetAllHandledChatWindows() do 
+	for _,frame in self:GetAllHandledChatWindows() do
 		self:ForAllEmbeds("PostUpdateChatWindowColors", frame)
-	end 
+	end
 end
 
 local chatFrameTextures = {
 	"Background",
-	"TopLeftTexture", 
-	"BottomLeftTexture", 
-	"TopRightTexture", 
+	"TopLeftTexture",
+	"BottomLeftTexture",
+	"TopRightTexture",
 	"BottomRightTexture",
-	"LeftTexture", 
-	"RightTexture", 
-	"BottomTexture", 
+	"LeftTexture",
+	"RightTexture",
+	"BottomTexture",
 	"TopTexture"
 }
 
 local buttonFrameTextures = {
 	"Background",
-	"TopLeftTexture", 
-	"BottomLeftTexture", 
-	"TopRightTexture", 
+	"TopLeftTexture",
+	"BottomLeftTexture",
+	"TopRightTexture",
 	"BottomRightTexture",
-	"LeftTexture", 
-	"RightTexture", 
-	"BottomTexture", 
+	"LeftTexture",
+	"RightTexture",
+	"BottomTexture",
 	"TopTexture"
 }
 
 local editBoxTextures = {
-	"Left", 
-	"Mid", 
-	"Right", 
-	"FocusLeft", 
-	"FocusMid", 
-	"FocusRight", 
+	"Left",
+	"Mid",
+	"Right",
+	"FocusLeft",
+	"FocusMid",
+	"FocusRight",
 	"ConversationIcon"
 }
 
 local tabTextures = {
 	"Left",
-	"Middle", 
-	"Right", 
-	"SelectedLeft", 
-	"SelectedMiddle", 
-	"SelectedRight", 
-	"HighlightLeft", 
-	"HighlightMiddle", 
+	"Middle",
+	"Right",
+	"SelectedLeft",
+	"SelectedMiddle",
+	"SelectedRight",
+	"HighlightLeft",
+	"HighlightMiddle",
 	"HighlightRight"
 }
 
 LibChatWindow.GetChatWindowTextures = function(self, frame)
 	local counter = 0
 	local name = frame:GetName()
-	return function() 
+	return function()
 		counter = counter + 1
-		if chatFrameTextures[counter] then 
+		if chatFrameTextures[counter] then
 			local tex = _G[name..chatFrameTextures[counter]]
-			if tex then 
-				return tex 
-			end 
-		end 
-	end 
-end 
+			if tex then
+				return tex
+			end
+		end
+	end
+end
 
 LibChatWindow.GetChatWindowButtonFrameTextures = function(self, frame)
 	local counter = 0
 	local buttonFrame = _G[frame:GetName().."ButtonFrame"]
-	if buttonFrame then 
+	if buttonFrame then
 		local name = buttonFrame:GetName()
-		return function() 
+		return function()
 			counter = counter + 1
-			if buttonFrameTextures[counter] then 
+			if buttonFrameTextures[counter] then
 				local tex = _G[name..buttonFrameTextures[counter]]
-				if tex then 
-					return tex 
-				end 
-			end 
-		end 
-	end 
-end 
+				if tex then
+					return tex
+				end
+			end
+		end
+	end
+end
 
 LibChatWindow.GetChatWindowEditBoxTextures = function(self, frame)
 	local counter = 0
 	local editBox = _G[frame:GetName().."EditBox"]
-	if editBox then 
+	if editBox then
 		local name = editBox:GetName()
-		return function() 
+		return function()
 			counter = counter + 1
-			if editBoxTextures[counter] then 
+			if editBoxTextures[counter] then
 				local tex = _G[name..editBoxTextures[counter]]
-				if tex then 
-					return tex 
-				end 
-			end 
-		end 
-	end 
+				if tex then
+					return tex
+				end
+			end
+		end
+	end
 end
 
 LibChatWindow.GetChatWindowTabTextures = function(self, frame)
 	local counter = 0
 	local tab = _G[frame:GetName().."Tab"]
-	if tab then 
+	if tab then
 		local name = tab:GetName()
-		return function() 
+		return function()
 			counter = counter + 1
-			if tabTextures[counter] then 
+			if tabTextures[counter] then
 				local tex = _G[name..tabTextures[counter]]
-				if tex then 
-					return tex 
-				end 
-			end 
-		end 
-	end 
-end 
+				if tex then
+					return tex
+				end
+			end
+		end
+	end
+end
 
 LibChatWindow.GetChatWindowMenuButton = function(self)
 	return _G.ChatFrameMenuButton
-end 
+end
 
 LibChatWindow.GetChatWindowChannelButton = function(self)
 	return _G.ChatFrameChannelButton
-end 
+end
 
 LibChatWindow.GetChatWindowVoiceDeafenButton = function(self)
 	return _G.ChatFrameToggleVoiceDeafenButton
-end 
+end
 
 LibChatWindow.GetChatWindowVoiceMuteButton = function(self)
 	return _G.ChatFrameToggleVoiceMuteButton
-end 
+end
 
 LibChatWindow.GetChatWindowFriendsButton = function(self)
 	return _G.FriendsMicroButton
-end 
+end
 
 LibChatWindow.GetChatWindowClickAnywhereButton = function(self, frame)
 	return _G[frame:GetName().."ClickAnywhereButton"]
-end 
+end
 
 LibChatWindow.GetChatWindowButtonFrame = function(self, frame)
 	return _G[frame:GetName().."ButtonFrame"]
-end 
+end
 
 LibChatWindow.GetChatWindowMinimizeButton = function(self, frame)
 	return _G[frame:GetName().."ButtonFrameMinimizeButton"]
-end 
+end
 
 LibChatWindow.GetChatWindowEditBox = function(self, frame)
 	return _G[frame:GetName().."EditBox"]
-end 
+end
 
 LibChatWindow.GetChatWindowCurrentEditBox = function(self, frame)
 	if (GetCVar("chatStyle") == "classic") then
@@ -362,80 +364,80 @@ LibChatWindow.GetChatWindowCurrentEditBox = function(self, frame)
 		end
 		return _G[frame:GetName().."EditBox"]
 	end
-end 
+end
 
 LibChatWindow.GetChatWindowScrollUpButton = function(self, frame)
 	return _G[frame:GetName().."ButtonFrameUpButton"]
-end 
+end
 
 LibChatWindow.GetChatWindowScrollDownButton = function(self, frame)
 	return _G[frame:GetName().."ButtonFrameDownButton"]
-end 
+end
 
 LibChatWindow.GetChatWindowScrollToBottomButton = function(self, frame)
 	if (IsRetail) then
 		return frame.ScrollToBottomButton
-	elseif (IsClassic or IsTBC) then
+	elseif (IsClassic or IsTBC or IsWrath) then
 		return _G[frame:GetName().."ButtonFrameBottomButton"]
 	end
-end 
+end
 
 LibChatWindow.GetChatWindowScrollBar = function(self, frame)
 	return frame.ScrollBar
-end 
+end
 
 LibChatWindow.GetChatWindowScrollBarThumbTexture = function(self, frame)
 	return frame.ScrollBar and frame.ScrollBar.ThumbTexture
-end 
+end
 
 LibChatWindow.GetChatWindowTab = function(self, frame)
 	return _G[frame:GetName().."Tab"]
-end 
+end
 
 LibChatWindow.GetChatWindowTabText = function(self, frame)
 	return _G[frame:GetName().."TabText"]
-end 
+end
 
 LibChatWindow.GetChatWindowTabIcon = function(self, frame)
 	return _G[frame:GetName().."TabConversationIcon"]
-end 
+end
 
 LibChatWindow.GetSelectedChatFrame = function(self)
 	return _G.SELECTED_CHAT_FRAME
-end 
+end
 
 LibChatWindow.OnEvent = function(self, event, ...)
 	if (event == "UPDATE_CHAT_WINDOWS")
-	or (event == "UPDATE_FLOATING_CHAT_WINDOWS") 
-	or (event == "UI_SCALE_CHANGED") 
-	or (event == "DISPLAY_SIZE_CHANGED") 
-	or (event == "GP_VIDEO_OPTIONS_APPLY") 
-	or (event == "GP_VIDEO_OPTIONS_OKAY") 
-	or (event == "PLAYER_ENTERING_WORLD") then 
+	or (event == "UPDATE_FLOATING_CHAT_WINDOWS")
+	or (event == "UI_SCALE_CHANGED")
+	or (event == "DISPLAY_SIZE_CHANGED")
+	or (event == "GP_VIDEO_OPTIONS_APPLY")
+	or (event == "GP_VIDEO_OPTIONS_OKAY")
+	or (event == "PLAYER_ENTERING_WORLD") then
 		self:UpdateChatWindowPositions(true)
-	end 
+	end
 
 	if (event == "UPDATE_CHAT_WINDOWS")
-	or (event == "UPDATE_FLOATING_CHAT_WINDOWS") 
-	or (event == "UI_SCALE_CHANGED") 
-	or (event == "DISPLAY_SIZE_CHANGED") 
-	or (event == "GP_VIDEO_OPTIONS_APPLY") 
-	or (event == "GP_VIDEO_OPTIONS_OKAY") 
-	or (event == "PLAYER_ENTERING_WORLD") then 
+	or (event == "UPDATE_FLOATING_CHAT_WINDOWS")
+	or (event == "UI_SCALE_CHANGED")
+	or (event == "DISPLAY_SIZE_CHANGED")
+	or (event == "GP_VIDEO_OPTIONS_APPLY")
+	or (event == "GP_VIDEO_OPTIONS_OKAY")
+	or (event == "PLAYER_ENTERING_WORLD") then
 		self:UpdateChatWindowSizes(true)
-	end 
+	end
 
 	if (event == "UPDATE_CHAT_COLOR")
-	or (event == "PLAYER_ENTERING_WORLD") then 
+	or (event == "PLAYER_ENTERING_WORLD") then
 		self:UpdateChatWindowColors(true)
-	end 
+	end
 
-	if (event == "GP_OPEN_TEMPORARY_CHAT_WINDOW") then 
+	if (event == "GP_OPEN_TEMPORARY_CHAT_WINDOW") then
 		local currentFrame = ...
 		self:HandleWindow(currentFrame, currentFrame.isTemporary, select(2, ...))
-	end 
+	end
 
-end 
+end
 
 LibChatWindow.Enable = function(self)
 	self:UnregisterAllEvents()
@@ -457,12 +459,12 @@ LibChatWindow.Enable = function(self)
 	self:RegisterMessage("GP_OPEN_TEMPORARY_CHAT_WINDOW", "OnEvent")
 
 	-- proxy temporary windows creation through our event system
-	-- @return currentFrame, chatType, chatTarget, sourceChatFrame, selectWindow 
-	self:SetSecureHook("FCF_OpenTemporaryWindow", function(...) 
+	-- @return currentFrame, chatType, chatTarget, sourceChatFrame, selectWindow
+	self:SetSecureHook("FCF_OpenTemporaryWindow", function(...)
 		local frame = FCF_GetCurrentChatFrame()
-		if frame then 
-			self:SendMessage("GP_OPEN_TEMPORARY_CHAT_WINDOW", frame, ...) 
-		end 
+		if frame then
+			self:SendMessage("GP_OPEN_TEMPORARY_CHAT_WINDOW", frame, ...)
+		end
 	end, "GP_OPEN_TEMPORARY_CHAT_WINDOW")
 
 	-- initial positioning
@@ -470,7 +472,7 @@ LibChatWindow.Enable = function(self)
 
 	-- Need to set this to avoid frame popping back up
 	CHAT_FRAME_BUTTON_FRAME_MIN_ALPHA = 0
-end 
+end
 
 LibChatWindow:UnregisterAllEvents()
 LibChatWindow:RegisterEvent("PLAYER_ENTERING_WORLD", "Enable")
@@ -480,61 +482,61 @@ LibChatWindow:RegisterEvent("PLAYER_ENTERING_WORLD", "Enable")
 local embedMethods = {
 
 	-- runs post create callbacks for all frames
-	HandleAllChatWindows = true, 
+	HandleAllChatWindows = true,
 
 	-- chat frame queries
-	IsChatWindowHandled = true, 
+	IsChatWindowHandled = true,
 	IsChatWindowTemporary = true,
 
 	-- chat frames tables
-	GetAllChatWindows = true, 
-	GetAllTemporaryChatWindows = true, 
-	GetAllHandledChatWindows = true, 
+	GetAllChatWindows = true,
+	GetAllTemporaryChatWindows = true,
+	GetAllHandledChatWindows = true,
 
 	-- returns currently selected chat window, if any
 	GetSelectedChatFrame = true,
 
 	-- returns currently active editbox, if any
-	GetChatWindowCurrentEditBox = true, 
+	GetChatWindowCurrentEditBox = true,
 
 	-- returns the friends micro button (above the chat menu button)
-	GetChatWindowFriendsButton = true, 
+	GetChatWindowFriendsButton = true,
 
 	-- returns specific objects
-	GetChatWindowClickAnywhereButton = true, 
+	GetChatWindowClickAnywhereButton = true,
 	GetChatWindowButtonFrame = true,
-	GetChatWindowChannelButton = true, 
-	GetChatWindowEditBox = true, 
+	GetChatWindowChannelButton = true,
+	GetChatWindowEditBox = true,
 	GetChatWindowMenuButton = true,
-	GetChatWindowMinimizeButton = true, 
-	GetChatWindowScrollUpButton = true, 
-	GetChatWindowScrollDownButton = true, 
-	GetChatWindowScrollToBottomButton = true, 
-	GetChatWindowScrollBar = true, 
-	GetChatWindowScrollBarThumbTexture = true, 
-	GetChatWindowTab = true, 
-	GetChatWindowTabIcon = true, 
-	GetChatWindowTabText = true, 
-	GetChatWindowVoiceDeafenButton = true, 
-	GetChatWindowVoiceMuteButton = true, 
+	GetChatWindowMinimizeButton = true,
+	GetChatWindowScrollUpButton = true,
+	GetChatWindowScrollDownButton = true,
+	GetChatWindowScrollToBottomButton = true,
+	GetChatWindowScrollBar = true,
+	GetChatWindowScrollBarThumbTexture = true,
+	GetChatWindowTab = true,
+	GetChatWindowTabIcon = true,
+	GetChatWindowTabText = true,
+	GetChatWindowVoiceDeafenButton = true,
+	GetChatWindowVoiceMuteButton = true,
 
 	-- texture iterators (for tex in self:<Method>() do )
-	GetChatWindowTextures = true, 
+	GetChatWindowTextures = true,
 	GetChatWindowButtonFrameTextures = true,
-	GetChatWindowEditBoxTextures = true, 
-	GetChatWindowTabTextures = true, 
+	GetChatWindowEditBoxTextures = true,
+	GetChatWindowTabTextures = true,
 
 	-- chat frame setup
-	SetChatWindowPosition = true, 
-	SetChatWindowSize = true, 
+	SetChatWindowPosition = true,
+	SetChatWindowSize = true,
 	SetChatWindowAsSlaveTo = true
 }
 
 -- Iterate all embedded modules for the given method name or function
--- Silently fail if nothing exists. We don't want an error here. 
+-- Silently fail if nothing exists. We don't want an error here.
 LibChatWindow.ForAllEmbeds = function(self, method, ...)
-	for target in pairs(self.embeds) do 
-		if (target) and not(target.IsUserDisabled and target:IsUserDisabled()) then 
+	for target in pairs(self.embeds) do
+		if (target) and not(target.IsUserDisabled and target:IsUserDisabled()) then
 			if (type(method) == "string") then
 				if target[method] then
 					target[method](target, ...)
@@ -542,9 +544,9 @@ LibChatWindow.ForAllEmbeds = function(self, method, ...)
 			else
 				method(target, ...)
 			end
-		end 
-	end 
-end 
+		end
+	end
+end
 
 LibChatWindow.Embed = function(self, target)
 	for method in pairs(embedMethods) do
diff --git a/SimpleClassPower/back-end/libraries/clientbuild.lua b/SimpleClassPower/back-end/libraries/clientbuild.lua
index 32baa46..28eac1c 100644
--- a/SimpleClassPower/back-end/libraries/clientbuild.lua
+++ b/SimpleClassPower/back-end/libraries/clientbuild.lua
@@ -1,4 +1,4 @@
-local LibClientBuild = Wheel:Set("LibClientBuild", 44)
+local LibClientBuild = Wheel:Set("LibClientBuild", 52)
 if (not LibClientBuild) then
 	return
 end
@@ -13,20 +13,25 @@ local tostring = tostring
 
 LibClientBuild.embeds = LibClientBuild.embeds or {}
 
-local currentClientPatch, currentClientBuild = GetBuildInfo()
+local currentClientPatch, currentClientBuild, _, clientVersion = GetBuildInfo()
 currentClientBuild = tonumber(currentClientBuild)
 
 -- Let's create some constants for faster lookups
+local VERSION = clientVersion
 local MAJOR,MINOR,PATCH = string_split(".", currentClientPatch)
+MAJOR = tonumber(MAJOR)
+MINOR = tonumber(MINOR)
 
-local IsClassic, IsTBC
-local IsRetail, IsRetailBFA, IsRetailShadowlands
+local IsClassic, IsTBC, IsWotLK
+local IsRetail, IsRetailBFA, IsRetailShadowlands, IsRetailDragonflight
 
-IsClassic = tonumber(MAJOR) == 1
-IsTBC = tonumber(MAJOR) == 2
-IsRetail = tonumber(MAJOR) >= 9
-IsRetailBFA = tonumber(MAJOR) == 8
-IsRetailShadowlands = tonumber(MAJOR) == 9
+IsClassic = MAJOR == 1
+IsTBC = MAJOR == 2
+IsWotLK = MAJOR == 3
+IsRetail = MAJOR >= 9
+IsRetailBFA = MAJOR == 8
+IsRetailShadowlands = MAJOR == 9
+IsRetailDragonflight = MAJOR == 10
 
 local builds = {}
 
@@ -49,7 +54,7 @@ builds["9.0.5"] 	= 37988
 
 -- Metas
 builds["Classic"] 	= builds["1.13.7"]
-builds["TBC"] 	= builds["2.5.1"]
+builds["TBC"] 		= builds["2.5.1"]
 builds["Retail"] 	= builds["8.3.0"]
 
 -- Returns true if we're on a classic patch
@@ -61,6 +66,18 @@ end
 LibClientBuild.IsTBC = function(self)
 	return IsTBC
 end
+LibClientBuild.IsBCC = LibClientBuild.IsTBC
+
+-- Returns true if we're on a classic WotLK patch
+LibClientBuild.IsWotLK = function(self)
+	return IsWotLK
+end
+LibClientBuild.IsWrath = LibClientBuild.IsWotLK
+
+-- Returns true if we're on any classic patch
+LibClientBuild.IsAnyClassic = function(self)
+	return IsClassic or IsTBC or IsWotLK
+end
 
 -- Returns true if we're on a retail patch
 LibClientBuild.IsRetail = function(self)
@@ -77,31 +94,68 @@ LibClientBuild.IsRetailShadowlands = function(self)
 	return IsRetailShadowlands
 end
 
+-- Returns true if we're on a retail Dragonflight patch
+LibClientBuild.IsRetailDragonflight = function(self)
+	return IsRetailDragonflight
+end
+LibClientBuild.IsDragonflight = LibClientBuild.IsRetailDragonflight
+
 -- Return the build number for a given patch.
 -- Return current build if the given patch is the current. EXPERIMENTAL!
 LibClientBuild.GetClientBuildByPatch = function(self, patch)
 	return (currentClientPatch == patch) and currentClientBuild or builds[patch]
-end 
+end
 
+-- Return the current full patch version as string
 LibClientBuild.GetCurrentClientPatch = function(self)
 	return currentClientPatch
 end
 
--- Return the current WoW client build
+-- Return the current TOC version as a number
+LibClientBuild.GetCurrentClientVersion = function(self)
+	return VERSION
+end
+
+-- Return the current WoW MAJOR version as a number
+LibClientBuild.GetCurrentClientVersionMajor = function(self)
+	return MAJOR
+end
+
+-- Return the current WoW MINOR version as a number
+LibClientBuild.GetCurrentClientVersionMinor = function(self)
+	return MINOR
+end
+
+-- Return the current WoW PATCH version as a string
+-- *note that this is not the full patch version,
+--  so for WoW Classic "1.13.7" this would return "7".
+LibClientBuild.GetCurrentClientVersionPatch = function(self)
+	return PATCH
+end
+
+-- Return the current WoW client build as a number
 LibClientBuild.GetCurrentClientBuild = function(self)
 	return currentClientBuild
-end 
+end
+
 
 -- Module embedding
 local embedMethods = {
+	IsAnyClassic = true,
 	IsClassic = true,
-	IsTBC = true,
+	IsTBC = true, IsBCC = true,
+	IsWotLK = true, IsWrath = true,
 	IsRetail = true,
 	IsRetailBFA = true,
 	IsRetailShadowlands = true,
+	IsRetailDragonflight = true, IsDragonflight = true,
 	GetClientBuildByPatch = true,
 	GetCurrentClientBuild = true,
-	GetCurrentClientPatch = true
+	GetCurrentClientPatch = true,
+	GetCurrentClientVersion = true,
+	GetCurrentClientVersionMajor = true,
+	GetCurrentClientVersionMinor = true,
+	GetCurrentClientVersionPatch = true
 }
 
 LibClientBuild.Embed = function(self, target)
diff --git a/SimpleClassPower/back-end/libraries/fader.lua b/SimpleClassPower/back-end/libraries/fader.lua
index fd8786c..f73b360 100644
--- a/SimpleClassPower/back-end/libraries/fader.lua
+++ b/SimpleClassPower/back-end/libraries/fader.lua
@@ -1,5 +1,5 @@
-local LibFader = Wheel:Set("LibFader", 52)
-if (not LibFader) then	
+local LibFader = Wheel:Set("LibFader", 53)
+if (not LibFader) then
 	return
 end
 
@@ -59,8 +59,10 @@ local UnitPowerType = UnitPowerType
 local UnregisterAttributeDriver = UnregisterAttributeDriver
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 -- Sourced from FrameXML/BuffFrame.lua
@@ -86,32 +88,32 @@ LibFader.FORCED = nil -- we want this disabled from the start
 local Data = LibFader.data
 local Objects = LibFader.objects
 
--- These are debuffs which are ignored, 
--- allowing the interface to fade out even though they are present. 
+-- These are debuffs which are ignored,
+-- allowing the interface to fade out even though they are present.
 local safeDebuffs
-if (IsClassic or IsTBC) then
+if (IsAnyClassic) then
 	safeDebuffs = {
 		-- deserters
-		[ 26013] = true, -- PvP Deserter 
-		[ 71041] = true, -- Dungeon Deserter 
+		[ 26013] = true, -- PvP Deserter
+		[ 71041] = true, -- Dungeon Deserter
 		[144075] = true, -- Dungeon Deserter
 		[ 99413] = true, -- Deserter (no idea what type)
 
 		-- heal cooldowns
 		[ 11196] = true, -- Recently Bandaged
 		[  6788] = true, -- Weakened Soul
-		
+
 		-- burst cooldowns
 		[ 57723] = true, -- Exhaustion from Heroism
 		[ 95809] = true, -- Insanity from Ancient Hysteria
 		[ 57724] = true, -- Sated from Bloodlust
 		[ 80354] = true, -- Temporal Displacement from Time Warp
-		
+
 		-- Resources
 		[ 36032] = true, -- Arcane Charges
-		
-		-- Seasonal 
-		[ 26680] = true, -- Adored "You have received a gift of adoration!" 
+
+		-- Seasonal
+		[ 26680] = true, -- Adored "You have received a gift of adoration!"
 		[ 42146] = true, -- Brewfest Racing Ram Aura
 		[ 26898] = true, -- Heartbroken "You have been rejected and can no longer give Love Tokens!"
 		[ 71909] = true, -- Heartbroken "Suffering from a broken heart."
@@ -122,57 +124,57 @@ if (IsClassic or IsTBC) then
 elseif (IsRetail) then
 	safeDebuffs = {
 		-- deserters
-		[ 26013] = true, -- PvP Deserter 
-		[ 71041] = true, -- Dungeon Deserter 
+		[ 26013] = true, -- PvP Deserter
+		[ 71041] = true, -- Dungeon Deserter
 		[144075] = true, -- Dungeon Deserter
 		[ 99413] = true, -- Deserter (no idea what type)
 		[158263] = true, -- Craven "You left an Arena without entering combat and must wait before entering another one." -- added 6.0.1
 		[194958] = true, -- Ashran Deserter
 		[178394] = true, -- Honorless Target
-	
+
 		-- heal cooldowns
 		[178857] = true, -- Contender (Gladiator's Sanctum buff)
 		[ 11196] = true, -- Recently Bandaged
 		[  6788] = true, -- Weakened Soul
-		
+
 		-- burst cooldowns
 		[ 57723] = true, -- Exhaustion from Heroism
 		[264689] = true, -- Fatigued (cannot benefit from Primal Rage or similar) -- added 8.0.1 (?)
 		[ 95809] = true, -- Insanity from Ancient Hysteria
 		[ 57724] = true, -- Sated from Bloodlust
 		[ 80354] = true, -- Temporal Displacement from Time Warp
-		
+
 		-- Resources
 		[ 36032] = true, -- Arcane Charges
-		
-		-- Seasonal 
-		[ 26680] = true, -- Adored "You have received a gift of adoration!" 
+
+		-- Seasonal
+		[ 26680] = true, -- Adored "You have received a gift of adoration!"
 		[ 42146] = true, -- Brewfest Racing Ram Aura
 		[ 26898] = true, -- Heartbroken "You have been rejected and can no longer give Love Tokens!"
 		[ 71909] = true, -- Heartbroken "Suffering from a broken heart."
 		[ 43052] = true, -- Ram Fatigue "Your racing ram is fatigued."
 		[ 69438] = true, -- Sample Satisfaction (some love crap)
-		
-		-- WoD weird debuffs 
+
+		-- WoD weird debuffs
 		[174958] = true, -- Acid Trail "Riding on the slippery back of a Goren!"  -- added 6.0.1
 		[160510] = true, -- Encroaching Darkness "Something is watching you..." -- some zone in WoD
 		[156154] = true, -- Might of Ango'rosh -- WoD, Talador zone buff
-	
+
 		-- WoD fish debuffs
 		[174524] = true, -- Awesomefish
 		[174528] = true, -- Grieferfish
-		
-		-- WoD Follower deaths 
+
+		-- WoD Follower deaths
 		[173660] = true, -- Aeda Brightdawn
-		[173657] = true, -- Defender Illona 
+		[173657] = true, -- Defender Illona
 		[173658] = true, -- Delvar Ironfist
-		[173976] = true, -- Leorajh 
+		[173976] = true, -- Leorajh
 		[173659] = true, -- Talonpriest Ishaal
-		[173649] = true, -- Tormmok 
-		[173661] = true, -- Vivianne 
-	
+		[173649] = true, -- Tormmok
+		[173661] = true, -- Vivianne
+
 		-- BfA
-		[271571] = true, -- Ready! (Shell Game World Quests) 
+		[271571] = true, -- Ready! (Shell Game World Quests)
 
 		-- Shadowlands
 		[320227] = true, -- Depleted Shell (Conduit)
@@ -183,19 +185,19 @@ elseif (IsRetail) then
 	}
 end
 
--- These are buffs that will keep the interface visible while active. 
+-- These are buffs that will keep the interface visible while active.
 -- This table accepts both spellID and spellName as keys.
 local unsafeBuffs = {
 	[(GetSpellInfo(430))] = true, -- Drink
 	[(GetSpellInfo(433))] = true -- Food
 }
 
--- Syntax check 
+-- Syntax check
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -203,24 +205,24 @@ local check = function(value, num, ...)
 	error(string_format("Bad argument #%.0f to '%s': %s expected, got %s", num, name, types, type(value)), 3)
 end
 
-local InitiateDelay = function(self, elapsed) 
-	return self._owner:InitiateDelay(elapsed) 
+local InitiateDelay = function(self, elapsed)
+	return self._owner:InitiateDelay(elapsed)
 end
 
-local OnUpdate = function(self, elapsed) 
-	return self._owner:OnUpdate(elapsed) 
+local OnUpdate = function(self, elapsed)
+	return self._owner:OnUpdate(elapsed)
 end
 
-local SetToDefaultAlpha = function(object) 
-	object:SetAlpha(Objects[object]) 
+local SetToDefaultAlpha = function(object)
+	object:SetAlpha(Objects[object])
 end
 
 local SetToZeroAlpha = function(object)
 	object:SetAlpha(0)
-end 
+end
 
 local SetToProgressAlpha = function(object, progress)
-	object:SetAlpha(Objects[object] * progress) 
+	object:SetAlpha(Objects[object] * progress)
 end
 
 -- Return the current fader state, if any
@@ -230,19 +232,19 @@ end
 
 -- Register an object with a fade manager
 LibFader.RegisterObjectFade = function(self, object)
-	-- Don't re-register existing objects, 
-	-- as that will overwrite the default alpha value 
-	-- which in turn can lead to max alphas of zero. 
-	if Objects[object] then 
-		return 
-	end 
+	-- Don't re-register existing objects,
+	-- as that will overwrite the default alpha value
+	-- which in turn can lead to max alphas of zero.
+	if Objects[object] then
+		return
+	end
 	Objects[object] = object:GetAlpha()
 end
 
 -- Unregister an object from a fade manager, and hard reset its alpha
 LibFader.UnregisterObjectFade = function(self, object)
-	if (not Objects[object]) then 
-		return 
+	if (not Objects[object]) then
+		return
 	end
 
 	-- Retrieve original alpha
@@ -255,84 +257,84 @@ LibFader.UnregisterObjectFade = function(self, object)
 	object:SetAlpha(alpha)
 end
 
--- Force all faded objects visible 
+-- Force all faded objects visible
 LibFader.SetObjectFadeOverride = function(self, force)
-	if (force) then 
-		LibFader.FORCED = true 
-	else 
-		LibFader.FORCED = nil 
-	end 
+	if (force) then
+		LibFader.FORCED = true
+	else
+		LibFader.FORCED = nil
+	end
 end
 
 -- Prevent objects from fading out in instances
 LibFader.DisableInstanceFading = function(self, fade)
-	if (fade) then 
-		Data.disableInstanceFade = true 
-	else 
-		Data.disableInstanceFade = false 
+	if (fade) then
+		Data.disableInstanceFade = true
+	else
+		Data.disableInstanceFade = false
 	end
 end
 
 -- Prevent objects from fading out while grouped
 LibFader.DisableGroupFading = function(self, fade)
-	if (fade) then 
-		Data.disableGroupFade = true 
-	else 
-		Data.disableGroupFade = false 
+	if (fade) then
+		Data.disableGroupFade = true
+	else
+		Data.disableGroupFade = false
 	end
 end
 
 -- Set the default alpha of an opaque object
 LibFader.SetObjectAlpha = function(self, object, alpha)
 	check(alpha, 2, "number")
-	if (not Objects[object]) then 
-		return 
+	if (not Objects[object]) then
+		return
 	end
 	Objects[object] = alpha
-end 
+end
 
 LibFader.CheckMouse = function(self)
-	if (SpellFlyout and SpellFlyout:IsVisible()) then 
-		Data.mouseOver = true 
+	if (SpellFlyout and SpellFlyout:IsVisible()) then
+		Data.mouseOver = true
 		return true
-	end 
-	for object in pairs(Objects) do 
+	end
+	for object in pairs(Objects) do
 		if (object and not object.ignoreMouse) then
-			if (object.GetExplorerHitRects) then 
+			if (object.GetExplorerHitRects) then
 				local top, bottom, left, right = object:GetExplorerHitRects()
-				if (object:IsMouseOver(top, bottom, left, right) and object:IsVisible()) then 
-					Data.mouseOver = true 
+				if (object:IsMouseOver(top, bottom, left, right) and object:IsVisible()) then
+					Data.mouseOver = true
 					return true
-				end 
-			else 
-				if (object:IsMouseOver() and object:IsVisible()) then 
-					Data.mouseOver = true 
+				end
+			else
+				if (object:IsMouseOver() and object:IsVisible()) then
+					Data.mouseOver = true
 					return true
-				end 
-			end 
+				end
+			end
 		end
-	end 
+	end
 	Data.mouseOver = nil
 end
 
 LibFader.CheckCursor = function(self)
-	if (CursorHasSpell() or CursorHasItem()) then 
-		Data.busyCursor = true 
-		return 
-	end 
+	if (CursorHasSpell() or CursorHasItem()) then
+		Data.busyCursor = true
+		return
+	end
 
 	-- other values: money, merchant
 	local cursor = GetCursorInfo()
-	if (cursor == "petaction") 
-	or (cursor == "spell") 
-	or (cursor == "macro") 
-	or (cursor == "mount") 
-	or (cursor == "item") then 
-		Data.busyCursor = true 
-		return 
-	end 
+	if (cursor == "petaction")
+	or (cursor == "spell")
+	or (cursor == "macro")
+	or (cursor == "mount")
+	or (cursor == "item") then
+		Data.busyCursor = true
+		return
+	end
 	Data.busyCursor = nil
-end 
+end
 
 LibFader.CheckAuras = function(self)
 	for i = 1, BUFF_MAX_DISPLAY do
@@ -369,100 +371,100 @@ end
 LibFader.CheckHealth = function(self)
 	local min = UnitHealth("player") or 0
 	local max = UnitHealthMax("player") or 0
-	if (max > 0) and (min/max < .9) then 
+	if (max > 0) and (min/max < .9) then
 		Data.lowHealth = true
 		return
-	end 
+	end
 	Data.lowHealth = nil
-end 
+end
 
 LibFader.CheckPower = function(self)
 	local powerID, powerType = UnitPowerType("player")
-	if (powerType == "MANA") then 
+	if (powerType == "MANA") then
 		local min = UnitPower("player") or 0
 		local max = UnitPowerMax("player") or 0
-		if (max > 0) and (min/max < .75) then 
+		if (max > 0) and (min/max < .75) then
 			Data.lowPower = true
 			return
-		end 
-	elseif (powerType == "ENERGY" or powerType == "FOCUS") then 
+		end
+	elseif (powerType == "ENERGY" or powerType == "FOCUS") then
 		local min = UnitPower("player") or 0
 		local max = UnitPowerMax("player") or 0
-		if (max > 0) and (min/max < .5) then 
+		if (max > 0) and (min/max < .5) then
 			Data.lowPower = true
 			return
-		end 
-		if (playerClass == "DRUID") then 
+		end
+		if (playerClass == "DRUID") then
 			min = UnitPower("player", POWER_TYPE_MANA) or 0
 			max = UnitPowerMax("player", POWER_TYPE_MANA) or 0
-			if (max > 0) and (min/max < .5) then 
+			if (max > 0) and (min/max < .5) then
 				Data.lowPower = true
 				return
-			end 
+			end
 		end
-	end 
+	end
 	Data.lowPower = nil
-end 
+end
 
 LibFader.CheckVehicle = function(self)
-	--if (UnitInVehicle("player") or HasVehicleActionBar()) then 
-	if (HasVehicleActionBar()) then 
+	--if (UnitInVehicle("player") or HasVehicleActionBar()) then
+	if (HasVehicleActionBar()) then
 		Data.inVehicle = true
-		return 
-	end 
+		return
+	end
 	Data.inVehicle = nil
-end 
+end
 
 LibFader.CheckOverride = function(self)
-	if (HasOverrideActionBar() or HasTempShapeshiftActionBar()) then 
+	if (HasOverrideActionBar() or HasTempShapeshiftActionBar()) then
 		Data.hasOverride = true
-		return 
-	end 
+		return
+	end
 	Data.hasOverride = nil
-end 
+end
 
 LibFader.CheckPossess = function(self)
-	if (IsPossessBarVisible()) then 
+	if (IsPossessBarVisible()) then
 		Data.hasPossess = true
-		return 
-	end 
+		return
+	end
 	Data.hasPossess = nil
-end 
+end
 
 LibFader.CheckTarget = function(self)
-	if UnitExists("target") then 
+	if UnitExists("target") then
 		Data.hasTarget = true
-		return 
-	end 
+		return
+	end
 	Data.hasTarget = nil
-end 
+end
 
 LibFader.CheckFocus	 = function(self)
-	if UnitExists("focus") then 
+	if UnitExists("focus") then
 		Data.hasFocus = true
-		return 
-	end 
+		return
+	end
 	Data.hasFocus = nil
-end 
+end
 
 LibFader.CheckGroup = function(self)
-	if IsInGroup() then 
+	if IsInGroup() then
 		Data.inGroup = true
-		return 
-	end 
+		return
+	end
 	Data.inGroup = nil
 end
 
 LibFader.CheckInstance = function(self)
-	if IsInInstance() then 
+	if IsInInstance() then
 		Data.inInstance = true
-		return 
-	end 
+		return
+	end
 	Data.inInstance = nil
 end
 
 LibFader.OnEvent = function(self, event, ...)
-	if (event == "PLAYER_ENTERING_WORLD") then 
+	if (event == "PLAYER_ENTERING_WORLD") then
 		local isInitialLogin, isReloadingUi = ...
 
 		Data.inCombat = InCombatLockdown()
@@ -470,7 +472,7 @@ LibFader.OnEvent = function(self, event, ...)
 		self:CheckInstance()
 		self:CheckGroup()
 		self:CheckTarget()
-		
+
 		if (IsRetail or IsTBC) then
 			self:CheckFocus()
 		end
@@ -480,7 +482,7 @@ LibFader.OnEvent = function(self, event, ...)
 			self:CheckOverride()
 			self:CheckPossess()
 		end
-		
+
 		self:CheckHealth()
 		self:CheckPower()
 		self:CheckAuras()
@@ -501,7 +503,7 @@ LibFader.OnEvent = function(self, event, ...)
 
 	elseif (event == "PLAYER_LEAVING_WORLD") then
 		-- Only needed this when we added the initial delay on startup/reloads
-		-- Now it's redundant. 
+		-- Now it's redundant.
 		-- If we could check if this was leaving and instance or reloading,
 		-- we could do something here. But we can't. So we won't.
 		--local oldState = self.achievedState
@@ -511,7 +513,7 @@ LibFader.OnEvent = function(self, event, ...)
 		--	self:SendMessage("GP_FADER_STATE_LOST", oldState)
 		--end
 
-	elseif (event == "PLAYER_LEVEL_UP") then 
+	elseif (event == "PLAYER_LEVEL_UP") then
 			local level = ...
 			if (level and (level ~= playerLevel)) then
 				playerLevel = level
@@ -521,48 +523,48 @@ LibFader.OnEvent = function(self, event, ...)
 					playerLevel = level
 				end
 			end
-		
-	elseif (event == "PLAYER_REGEN_DISABLED") then 
+
+	elseif (event == "PLAYER_REGEN_DISABLED") then
 		Data.inCombat = true
 
-	elseif (event == "PLAYER_REGEN_ENABLED") then 
+	elseif (event == "PLAYER_REGEN_ENABLED") then
 		Data.inCombat = false
 
-	elseif (event == "PLAYER_TARGET_CHANGED") then 
+	elseif (event == "PLAYER_TARGET_CHANGED") then
 		self:CheckTarget()
 
-	elseif (event == "PLAYER_FOCUS_CHANGED") then 
+	elseif (event == "PLAYER_FOCUS_CHANGED") then
 		self:CheckFocus()
 
-	elseif (event == "GROUP_ROSTER_UPDATE") then 
+	elseif (event == "GROUP_ROSTER_UPDATE") then
 		self:CheckGroup()
 
-	elseif (event == "UPDATE_POSSESS_BAR") then 
+	elseif (event == "UPDATE_POSSESS_BAR") then
 		self:CheckPossess()
 
-	elseif (event == "UPDATE_OVERRIDE_ACTIONBAR") then 
+	elseif (event == "UPDATE_OVERRIDE_ACTIONBAR") then
 		self:CheckOverride()
 
-	elseif (event == "UNIT_ENTERING_VEHICLE") 
-		or (event == "UNIT_ENTERED_VEHICLE") 
-		or (event == "UNIT_EXITING_VEHICLE") 
+	elseif (event == "UNIT_ENTERING_VEHICLE")
+		or (event == "UNIT_ENTERED_VEHICLE")
+		or (event == "UNIT_EXITING_VEHICLE")
 		or (event == "UNIT_EXITED_VEHICLE")
-		or (event == "UPDATE_VEHICLE_ACTIONBAR") then 
+		or (event == "UPDATE_VEHICLE_ACTIONBAR") then
 		self:CheckVehicle()
 
-	elseif (event == "UNIT_POWER_FREQUENT") 
+	elseif (event == "UNIT_POWER_FREQUENT")
 		or (event == "UNIT_DISPLAYPOWER") then
 			self:CheckPower()
 
-	elseif (event == "UNIT_HEALTH_FREQUENT") or (event == "UNIT_HEALTH") then 
+	elseif (event == "UNIT_HEALTH_FREQUENT") or (event == "UNIT_HEALTH") then
 		self:CheckHealth()
 
-	elseif (event == "UNIT_AURA") then 
+	elseif (event == "UNIT_AURA") then
 		self:CheckAuras()
 
-	elseif (event == "ZONE_CHANGED_NEW_AREA") then 
+	elseif (event == "ZONE_CHANGED_NEW_AREA") then
 		self:CheckInstance()
-	end 
+	end
 end
 
 LibFader.ClearTimerData = function(self)
@@ -601,7 +603,7 @@ LibFader.SetObjectFadeDurationOut = function(self, seconds)
 	check(seconds, 1, "number")
 	LibFader.totalDurationOut = seconds
 	LibFader.totalDurationOutOverride = seconds
-end 
+end
 
 LibFader.SetObjectFadeHold = function(self, seconds)
 	check(seconds, 1, "number")
@@ -613,8 +615,8 @@ LibFader.InitiateDelay = function(self, elapsed)
 	self.elapsed = self.elapsed + elapsed
 
 	-- Enforce a delay at the start
-	if (self.elapsed < 15) then 
-		return 
+	if (self.elapsed < 15) then
+		return
 	end
 
 	-- Clearout everything
@@ -629,38 +631,38 @@ LibFader.InitiateDelay = function(self, elapsed)
 	-- Validate values and return to standard updates
 	self:ValidateTimerData()
 	self.frame:SetScript("OnUpdate", OnUpdate)
-end 
+end
 
 LibFader.OnUpdate = function(self, elapsed)
 	self.elapsed = self.elapsed + elapsed
 
 	-- Throttle any and all updates
-	if (self.elapsed < 1/60) then 
-		return 
-	end 
+	if (self.elapsed < 1/60) then
+		return
+	end
 
 	local oldState = self.achievedState
 
 	if self.FORCED
-	or Data.inCombat 
-	or Data.hasTarget 
-	--or Data.hasFocus 
+	or Data.inCombat
+	or Data.hasTarget
+	--or Data.hasFocus
 	or (Data.inGroup and Data.disableGroupFade)
-	or Data.hasOverride 
-	or Data.hasPossess 
-	or Data.inVehicle 
+	or Data.hasOverride
+	or Data.hasPossess
+	or Data.inVehicle
 	or (Data.inInstance and Data.disableInstanceFade)
-	or Data.lowHealth 
-	or Data.lowPower 
-	or Data.busyCursor 
-	or Data.badAura 
-	or self:CheckMouse() then 
-		if (self.currentPosition == 1) and (self.achievedState == "peril") then 
+	or Data.lowHealth
+	or Data.lowPower
+	or Data.busyCursor
+	or Data.badAura
+	or self:CheckMouse() then
+		if (self.currentPosition == 1) and (self.achievedState == "peril") then
 			self.elapsed = 0
-			return 
-		end 
+			return
+		end
 		local progress = self.elapsed / self.totalDurationIn
-		if ((self.currentPosition + progress) < 1) then 
+		if ((self.currentPosition + progress) < 1) then
 			self.currentPosition = self.currentPosition + progress
 			self.achievedState = nil
 			self:ForAll(SetToProgressAlpha, self.currentPosition)
@@ -668,7 +670,7 @@ LibFader.OnUpdate = function(self, elapsed)
 				LibModule:AddDebugMessageFormatted(string_format("FaderState lost: '%s'", oldState))
 				self:SendMessage("GP_FADER_STATE_LOST", oldState)
 			end
-		else 
+		else
 			self.currentPosition = 1
 			self.achievedState = "peril"
 			self.totalDurationHoldCounter = self.totalDurationHold
@@ -677,9 +679,9 @@ LibFader.OnUpdate = function(self, elapsed)
 				LibModule:AddDebugMessageFormatted(string_format("FaderState achieved: '%s'", self.achievedState))
 				self:SendMessage("GP_FADER_STATE_ACHIEVED", self.achievedState)
 			end
-		end 
-	else 
-		if (self.currentPosition == 1) and (self.achievedState == "peril") and (self.totalDurationHoldCounter > 0) then 
+		end
+	else
+		if (self.currentPosition == 1) and (self.achievedState == "peril") and (self.totalDurationHoldCounter > 0) then
 			if ((self.totalDurationHoldCounter - self.elapsed) > 0) then
 				self.totalDurationHoldCounter = self.totalDurationHoldCounter - self.elapsed
 				self.elapsed = 0
@@ -689,7 +691,7 @@ LibFader.OnUpdate = function(self, elapsed)
 			end
 		end
 		local progress = self.elapsed / self.totalDurationOut
-		if ((self.currentPosition - progress) > 0) then 
+		if ((self.currentPosition - progress) > 0) then
 			self.currentPosition = self.currentPosition - progress
 			self.achievedState = nil
 			self:ForAll(SetToProgressAlpha, self.currentPosition)
@@ -706,30 +708,30 @@ LibFader.OnUpdate = function(self, elapsed)
 				LibModule:AddDebugMessageFormatted(string_format("FaderState achieved: '%s'", self.achievedState))
 				self:SendMessage("GP_FADER_STATE_ACHIEVED", self.achievedState)
 			end
-		end 
-	end 
+		end
+	end
 	self.elapsed = 0
 end
 
 LibFader.ForAll = function(self, method, ...)
-	for object in pairs(Objects) do 
-		if (type(method) == "string") then 
+	for object in pairs(Objects) do
+		if (type(method) == "string") then
 			object[method](object, ...)
-		elseif (type(method) == "function") then 
+		elseif (type(method) == "function") then
 			method(object, ...)
-		end 
-	end 
+		end
+	end
 end
 
 local embedMethods = {
 	SetObjectFadeHold = true,
 	SetObjectFadeDurationIn = true,
 	SetObjectFadeDurationOut = true,
-	SetObjectFadeOverride = true, 
+	SetObjectFadeOverride = true,
 	RegisterObjectFade = true,
 	UnregisterObjectFade = true,
 	DisableInstanceFading = true,
-	GetCurrentFaderState = true 
+	GetCurrentFaderState = true
 }
 
 LibFader.Embed = function(self, target)
@@ -749,22 +751,22 @@ LibFader:RegisterEvent("ZONE_CHANGED_NEW_AREA", "OnEvent")
 LibFader:RegisterEvent("PLAYER_ENTERING_WORLD", "OnEvent")
 LibFader:RegisterEvent("PLAYER_LEAVING_WORLD", "OnEvent")
 LibFader:RegisterEvent("PLAYER_LEVEL_UP", "OnEvent")
-LibFader:RegisterEvent("PLAYER_REGEN_DISABLED", "OnEvent") 
-LibFader:RegisterEvent("PLAYER_REGEN_ENABLED", "OnEvent") 
-LibFader:RegisterEvent("PLAYER_TARGET_CHANGED", "OnEvent") 
-LibFader:RegisterEvent("GROUP_ROSTER_UPDATE", "OnEvent") 
-LibFader:RegisterUnitEvent("UNIT_HEALTH", "OnEvent", "player") 
-LibFader:RegisterUnitEvent("UNIT_POWER_FREQUENT", "OnEvent", "player") 
-LibFader:RegisterUnitEvent("UNIT_DISPLAYPOWER", "OnEvent", "player") 
+LibFader:RegisterEvent("PLAYER_REGEN_DISABLED", "OnEvent")
+LibFader:RegisterEvent("PLAYER_REGEN_ENABLED", "OnEvent")
+LibFader:RegisterEvent("PLAYER_TARGET_CHANGED", "OnEvent")
+LibFader:RegisterEvent("GROUP_ROSTER_UPDATE", "OnEvent")
+LibFader:RegisterUnitEvent("UNIT_HEALTH", "OnEvent", "player")
+LibFader:RegisterUnitEvent("UNIT_POWER_FREQUENT", "OnEvent", "player")
+LibFader:RegisterUnitEvent("UNIT_DISPLAYPOWER", "OnEvent", "player")
 LibFader:RegisterUnitEvent("UNIT_AURA", "OnEvent", "player", "vehicle")
 
 if (IsRetail) then
-	LibFader:RegisterEvent("PLAYER_FOCUS_CHANGED", "OnEvent") 
-	LibFader:RegisterEvent("UPDATE_OVERRIDE_ACTIONBAR", "OnEvent") 
-	LibFader:RegisterEvent("UPDATE_POSSESS_BAR", "OnEvent") 
-	LibFader:RegisterEvent("UPDATE_VEHICLE_ACTIONBAR", "OnEvent", "player") 
-	LibFader:RegisterUnitEvent("UNIT_ENTERED_VEHICLE", "OnEvent", "player") 
-	LibFader:RegisterUnitEvent("UNIT_ENTERING_VEHICLE", "OnEvent", "player") 
-	LibFader:RegisterUnitEvent("UNIT_EXITED_VEHICLE", "OnEvent", "player") 
-	LibFader:RegisterUnitEvent("UNIT_EXITING_VEHICLE", "OnEvent", "player") 
+	LibFader:RegisterEvent("PLAYER_FOCUS_CHANGED", "OnEvent")
+	LibFader:RegisterEvent("UPDATE_OVERRIDE_ACTIONBAR", "OnEvent")
+	LibFader:RegisterEvent("UPDATE_POSSESS_BAR", "OnEvent")
+	LibFader:RegisterEvent("UPDATE_VEHICLE_ACTIONBAR", "OnEvent", "player")
+	LibFader:RegisterUnitEvent("UNIT_ENTERED_VEHICLE", "OnEvent", "player")
+	LibFader:RegisterUnitEvent("UNIT_ENTERING_VEHICLE", "OnEvent", "player")
+	LibFader:RegisterUnitEvent("UNIT_EXITED_VEHICLE", "OnEvent", "player")
+	LibFader:RegisterUnitEvent("UNIT_EXITING_VEHICLE", "OnEvent", "player")
 end
diff --git a/SimpleClassPower/back-end/libraries/frame.lua b/SimpleClassPower/back-end/libraries/frame.lua
index 8700a40..1836a3b 100644
--- a/SimpleClassPower/back-end/libraries/frame.lua
+++ b/SimpleClassPower/back-end/libraries/frame.lua
@@ -1,5 +1,5 @@
-local LibFrame = Wheel:Set("LibFrame", 72)
-if (not LibFrame) then	
+local LibFrame = Wheel:Set("LibFrame", 74)
+if (not LibFrame) then
 	return
 end
 
@@ -52,37 +52,39 @@ local UIParent = UIParent
 local WorldFrame = WorldFrame
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 -- Default keyword used as a fallback. this will not be user editable.
 local KEYWORD_DEFAULT = "UICenter"
 
--- Create the new frame parent 
+-- Create the new frame parent
 if (not LibFrame.frameParent) then
 	LibFrame.frameParent = LibFrame.frameParent or CreateFrame("Frame", nil, UIParent, "SecureHandlerAttributeTemplate")
 	RegisterAttributeDriver(LibFrame.frameParent, "state-visibility", "[combat]show;show")
 else
 	UnregisterAttributeDriver(LibFrame.frameParent, "state-visibility")
 	RegisterAttributeDriver(LibFrame.frameParent, "state-visibility", "[combat]show;show")
-end 
+end
 
 -- Create the cache frame
 if (not LibFrame.frameMemoryCache) then
 	LibFrame.frameMemoryCache = LibFrame.frameMemoryCache or CreateFrame("Frame", nil, UIParent)
 	LibFrame.frameMemoryCache:SetSize(2,2)
 	LibFrame.frameMemoryCache:SetPoint("BOTTOM", UIParent, "TOP", 0, 2)
-end 
+end
 
 -- Create the UICenter frame
 if (not LibFrame.frame) then
 	LibFrame.frame = CreateFrame("Frame", nil, LibFrame.frameParent, "SecureHandlerAttributeTemplate")
-else 
+else
 	-- needs to be done since not all previous versions held this frame
-	LibFrame.frame:SetParent(LibFrame.frameParent) 
+	LibFrame.frame:SetParent(LibFrame.frameParent)
 	UnregisterAttributeDriver(LibFrame.frame, "state-visibility")
-end 
+end
 
 -- Return a value rounded to the nearest integer.
 local math_round = function(value)
@@ -117,7 +119,7 @@ local SetDisplaySize = function(relativeScale, ratio, altRatio, useSmallestRatio
 	end
 
 	-- If a stored set of ratios exist, apply them.
-	if (ratio) then 
+	if (ratio) then
 		local ratioWidth = math_round(displayHeight*ratio)
 		local altRatioWidth = math_round(displayHeight*(altRatio or ratio))
 
@@ -138,7 +140,7 @@ local SetDisplaySize = function(relativeScale, ratio, altRatio, useSmallestRatio
 end
 SetDisplaySize()
 
-if (IsClassic or IsTBC) then
+if (IsClassic or IsTBC or IsWrath) then
 	-- Forcefully re-show this in combat if somebody has hidden it.
 	RegisterAttributeDriver(LibFrame.frame, "state-visibility", "[combat]show;show")
 
@@ -149,7 +151,7 @@ elseif (IsRetail) then
 end
 
 -- Keyword registry to translate words to frame handles used for anchoring or parenting
-LibFrame.keyWords = LibFrame.keyWords or { [KEYWORD_DEFAULT] = function() return LibFrame.frame end } 
+LibFrame.keyWords = LibFrame.keyWords or { [KEYWORD_DEFAULT] = function() return LibFrame.frame end }
 LibFrame.frames = LibFrame.frames or {}
 LibFrame.fontStrings = LibFrame.fontStrings or {}
 LibFrame.textures = LibFrame.textures or {}
@@ -181,12 +183,12 @@ local blizzSetHeight = FrameMethods.SetHeight
 
 -- Utility Functions
 -----------------------------------------------------------------
--- Syntax check 
+-- Syntax check
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -201,7 +203,7 @@ end
 
 -- Translates keywords and parses normal frames, but doesn't include the defaults and fallbacks
 local parseAnchorStrict = function(anchor)
-	return anchor and (keyWords[anchor] and keyWords[anchor]() or _G[anchor] and _G[anchor] or anchor) 
+	return anchor and (keyWords[anchor] and keyWords[anchor]() or _G[anchor] and _G[anchor] or anchor)
 end
 
 local parseTemplate = function(template)
@@ -265,7 +267,7 @@ local frameWidgetPrototype = {
 		end
 	end,
 
-	-- Set a single point on a widget without clearing first. 
+	-- Set a single point on a widget without clearing first.
 	-- Like the above function, this too accepts keywords as anchors.
 	Point = function(self, ...)
 		local numArgs = select("#", ...)
@@ -295,37 +297,37 @@ local frameWidgetPrototype = {
 		elseif (numArgs == 2) then
 			self:SetSize(...)
 		end
-	end, 
+	end,
 
-	-- Assign multiple properties at once. 
-	-- Intented to simplify assignment operations in front-end stylesheets. 
+	-- Assign multiple properties at once.
+	-- Intented to simplify assignment operations in front-end stylesheets.
 	-- Process is generic enough to be a good fit for the back-end.
 	SetProperties = function(self, ...)
 		local numArgs = select("#", ...)
-		if (numArgs == 1) then 
+		if (numArgs == 1) then
 			local list = ...
-			for property,value in pairs(list) do 
+			for property,value in pairs(list) do
 				self[property] = value
 			end
-		else 
-			for i = 1,numArgs,2 do 
+		else
+			for i = 1,numArgs,2 do
 				local property,value = select(i, ...)
 				self[property] = value
-			end 
-		end 
+			end
+		end
 	end,
 
-	-- ConsolePort assumes this exists on a multiple of frames, 
+	-- ConsolePort assumes this exists on a multiple of frames,
 	-- so we're adding it and just opt out of various things by setting it to true.
-	IsForbidden = function(self) 
+	IsForbidden = function(self)
 		return true
 	end
-	
+
 }
 
 local framePrototype
 framePrototype = {
-	CreateFrame = function(self, frameType, frameName, template) 
+	CreateFrame = function(self, frameType, frameName, template)
 		local frame = embed(CreateFrame(frameType or "Frame", frameName, self, parseTemplate(template)), framePrototype)
 		frames[frame] = true
 		return frame
@@ -342,14 +344,14 @@ framePrototype = {
 	end
 }
 
--- Embed custom frame widget methods in the main frame prototype too 
+-- Embed custom frame widget methods in the main frame prototype too
 embed(framePrototype, frameWidgetPrototype)
 
--- Allow more methods to be added to our frame objects. 
+-- Allow more methods to be added to our frame objects.
 -- This will cascade down through all LibFrames, so use with caution!
 LibFrame.AddMethod = function(self, method, func)
 	-- Silently fail if the method exists.
-	-- *Edit: NO! Libraries that add newer version of their methods 
+	-- *Edit: NO! Libraries that add newer version of their methods
 	--  must be able to update those methods upon library updates!
 	--if (framePrototype[method]) then
 	--	return
@@ -358,35 +360,35 @@ LibFrame.AddMethod = function(self, method, func)
 	-- Add the new method to the prototype
 	framePrototype[method] = func
 
-	-- Add the method to any existing frames, 
-	-- since we're using embedding and not inheritance. 
+	-- Add the method to any existing frames,
+	-- since we're using embedding and not inheritance.
 	for frame in pairs(frames) do
 		frame[method] = func
 	end
 end
 
 -- Register a keyword to trigger a function call when used as an anchor on a frame
--- Even though embeddable, this method uses the global keyword table. 
+-- Even though embeddable, this method uses the global keyword table.
 -- There are no local ones, and this is intentional.
 LibFrame.RegisterKeyword = function(self, keyWord, func)
 	LibFrame.keyWords[keyWord] = func
 end
 
 -- Create a frame with certain extra methods we like to have
-LibFrame.CreateFrame = function(self, frameType, frameName, parent, template) 
+LibFrame.CreateFrame = function(self, frameType, frameName, parent, template)
 
-	-- Do some argument handling to allow the directly embedded version to skip 
+	-- Do some argument handling to allow the directly embedded version to skip
 	-- the 'parent' argument in the same manner the inherited frame method does.
-	-- Because we don't really want two different syntaxes. 
+	-- Because we don't really want two different syntaxes.
 	local parsedAnchor = parseAnchorStrict(parent)
-	if (template) then 
+	if (template) then
 		template = parseTemplate(template)
 	end
-	if (not parsedAnchor) then 
+	if (not parsedAnchor) then
 		parsedAnchor = self.IsObjectType and parseAnchor(self) or parseAnchor(parent)
-		if (type(parent) == "string") and (not template) then 
-			template = parent 
-		end 
+		if (type(parent) == "string") and (not template) then
+			template = parent
+		end
 	end
 
 	-- Create the new frame and copy our custom methods in
@@ -394,7 +396,7 @@ LibFrame.CreateFrame = function(self, frameType, frameName, parent, template)
 
 	-- Add the frame to our registry
 	frames[frame] = true
-	
+
 	-- Return it to the user
 	return frame
 end
@@ -441,26 +443,26 @@ LibFrame.SetAspectRatio = function(self, ratio, altRatio, useSmallestRatio)
 end
 
 LibFrame.UpdateDisplaySize = function(self)
-	if (InCombatLockdown()) then 
-		return self:RegisterEvent("PLAYER_REGEN_ENABLED", "OnEvent") 
-	end 
+	if (InCombatLockdown()) then
+		return self:RegisterEvent("PLAYER_REGEN_ENABLED", "OnEvent")
+	end
 	SetDisplaySize()
 end
 
 LibFrame.OnEvent = function(self, event, ...)
-	if (InCombatLockdown()) then 
-		return self:RegisterEvent("PLAYER_REGEN_ENABLED", "OnEvent") 
-	elseif (event == "PLAYER_REGEN_ENABLED") then 
+	if (InCombatLockdown()) then
+		return self:RegisterEvent("PLAYER_REGEN_ENABLED", "OnEvent")
+	elseif (event == "PLAYER_REGEN_ENABLED") then
 		self:UnregisterEvent("PLAYER_REGEN_ENABLED", "OnEvent")
-	end 
+	end
 	self:UpdateDisplaySize()
 end
 
 LibFrame.Enable = function(self)
 
-	-- Get rid of old events from previous handlers, 
-	-- if this library for some reason was overwritten 
-	-- by a more recent version from a load on demand addon. 
+	-- Get rid of old events from previous handlers,
+	-- if this library for some reason was overwritten
+	-- by a more recent version from a load on demand addon.
 	self:UnregisterAllEvents()
 
 	-- New system only needs to capture changes and events
@@ -470,11 +472,11 @@ LibFrame.Enable = function(self)
 	-- Register for changes to the parent frames
 	self:RegisterMessage("GP_WORLD_SCALE_UPDATE", "OnEvent")
 	self:RegisterMessage("GP_INTERFACE_SCALE_UPDATE", "OnEvent")
-	
+
 	-- Could it be enough to just track frame changes and not events?
 	self:SetHook(UIParent, "OnSizeChanged", "UpdateDisplaySize", "LibFrame_UIParent_OnSizeChanged")
 	self:SetHook(WorldFrame, "OnSizeChanged", "UpdateDisplaySize", "LibFrame_WorldFrame_OnSizeChanged")
-end 
+end
 
 LibFrame:UnregisterAllEvents()
 LibFrame:Enable()
diff --git a/SimpleClassPower/back-end/libraries/inputmethod.lua b/SimpleClassPower/back-end/libraries/inputmethod.lua
index 378e8ac..ddaedc5 100644
--- a/SimpleClassPower/back-end/libraries/inputmethod.lua
+++ b/SimpleClassPower/back-end/libraries/inputmethod.lua
@@ -1,4 +1,4 @@
-local LibInputMethod = Wheel:Set("LibInputMethod", 10)
+local LibInputMethod = Wheel:Set("LibInputMethod", 11)
 if (not LibInputMethod) then
 	return
 end
@@ -20,8 +20,10 @@ local GetActiveDeviceID = C_GamePad and C_GamePad.GetActiveDeviceID
 local GetDeviceMappedState = C_GamePad and C_GamePad.GetDeviceMappedState
 
 -- WoW Client Constants
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 -- Library registries
@@ -111,15 +113,15 @@ LibInputMethod.GetGamepadType = function(self)
 		local mapped = GetDeviceMappedState(deviceID)
 		if (mapped) then
 			-- All except "Letters" is untested!
-			if (mapped.labelStyle == "Letters") then 
+			if (mapped.labelStyle == "Letters") then
 				return "xbox"
-			elseif (mapped.labelStyle == "LettersReversed") then 
+			elseif (mapped.labelStyle == "LettersReversed") then
 				return "xbox-reversed"
-			elseif (mapped.labelStyle == "Shapes") then 
+			elseif (mapped.labelStyle == "Shapes") then
 				return "playstation"
-			elseif (mapped.labelStyle == "Generic") then 
+			elseif (mapped.labelStyle == "Generic") then
 				return "generic"
-			end	
+			end
 		end
 	end
 end
diff --git a/SimpleClassPower/back-end/libraries/minimap.lua b/SimpleClassPower/back-end/libraries/minimap.lua
index 68d4460..8ef7b11 100644
--- a/SimpleClassPower/back-end/libraries/minimap.lua
+++ b/SimpleClassPower/back-end/libraries/minimap.lua
@@ -1,4 +1,4 @@
-local Version = 67
+local Version = 71
 local LibMinimap = Wheel:Set("LibMinimap", Version)
 if (not LibMinimap) then
 	return
@@ -62,8 +62,10 @@ local ToggleDropDownMenu = ToggleDropDownMenu
 local WorldFrame = WorldFrame
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 -- Localized Torghast instance name
@@ -105,7 +107,7 @@ do
 	LibMinimap.baggedButtonsIgnored["MinimapButtonFrame"] = true
 	LibMinimap.baggedButtonsIgnored["MiniMapBattlefieldFrame"] = true
 	--LibMinimap.baggedButtonsIgnored["QueueStatusMinimapButton"] = true
-	
+
 	LibMinimap.baggedButtonsIgnored["BookOfTracksFrame"] = true
 	LibMinimap.baggedButtonsIgnored["CartographerNotesPOI"] = true
 	LibMinimap.baggedButtonsIgnored["DA_Minimap"] = true
@@ -160,8 +162,8 @@ local noop = function() end
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -244,7 +246,7 @@ ElementHandler.RegisterEvent = function(proxy, event, func)
 	if (not Callbacks[proxy][event]) then
 		Callbacks[proxy][event] = {}
 	end
-	
+
 	local events = Callbacks[proxy][event]
 	if (#events > 0) then
 		for i = #events, 1, -1 do
@@ -268,7 +270,7 @@ ElementHandler.RegisterMessage = function(proxy, event, func)
 	if (not Callbacks[proxy][event]) then
 		Callbacks[proxy][event] = {}
 	end
-	
+
 	local events = Callbacks[proxy][event]
 	if (#events > 0) then
 		for i = #events, 1, -1 do
@@ -408,7 +410,7 @@ end
 -- cause a SetPoint family anchor bullshit bug.
 -----------------------------------------------------------
 LibMinimap.HandleObjectivesTracker = function(self, event, addon)
-	if (event == "ADDON_LOADED") then 
+	if (event == "ADDON_LOADED") then
 		if (addon == "Blizzard_ObjectiveTracker") then
 			LibMinimap:UnregisterEvent("ADDON_LOADED", "HandleObjectivesTracker")
 		else
@@ -442,7 +444,7 @@ LibMinimap.SyncMinimap = function(self, onlyQuery)
 			return false
 		end
 
-		-- If this flag isn't set or the map hasn't been initialized, 
+		-- If this flag isn't set or the map hasn't been initialized,
 		-- all of the below will always be redone.
 		if (onlyQuery) then
 			return true
@@ -503,7 +505,7 @@ LibMinimap.SyncMinimap = function(self, onlyQuery)
 	Library.MapOverlay:SetAllPoints() -- This will by default fill the entire master frame
 	Library.MapOverlay:SetFrameStrata("LOW") -- MEDIUM collides with Immersion
 	Library.MapOverlay:SetFrameLevel(50)
-	
+
 
 	-- Configure Blizzard Elements
 	-----------------------------------------------------------
@@ -532,7 +534,7 @@ LibMinimap.SyncMinimap = function(self, onlyQuery)
 	-- that it's still in its default position, and the end result will be.... bad.
 	-- The cluster is the parent to everything.
 	-- This prevents the default zone text from being updated,
-	-- as well as disables its tooltip. 
+	-- as well as disables its tooltip.
 	Library.OldCluster:SetParent(UIParent)
 	Library.OldCluster:UnregisterAllEvents()
 	Library.OldCluster:SetScript("OnEvent", noop)
@@ -580,7 +582,7 @@ LibMinimap.SyncMinimap = function(self, onlyQuery)
 		SetSize = true,
 		SetScale = true
 	}) do
-		Library.OldMinimap[methodName] = noop	
+		Library.OldMinimap[methodName] = noop
 	end
 
 	-- Proxy methods on the actual minimap
@@ -631,9 +633,9 @@ LibMinimap.SyncMinimap = function(self, onlyQuery)
 		end
 		Library.MapHolder[methodName] = method
 		Library.MapContent[methodName] = method
-	end 	
+	end
 
-	-- Should I move this to its own API call?	
+	-- Should I move this to its own API call?
 	Library.MapContent:EnableMouseWheel(true)
 
 	Library.MapContent:SetScript("OnMouseWheel", function(self, delta)
@@ -649,21 +651,21 @@ LibMinimap.SyncMinimap = function(self, onlyQuery)
 			LibMinimap:ShowMinimapTrackingMenu()
 		else
 			local effectiveScale = self:GetEffectiveScale()
-	
+
 			local x, y = GetCursorPosition()
 			x = x / effectiveScale
 			y = y / effectiveScale
-	
+
 			local cx, cy = self:GetCenter()
 			x = x - cx
 			y = y - cy
-	
+
 			if (math_sqrt(x * x + y * y) < (self:GetWidth() / 2)) then
 				self:PingLocation(x, y)
 			end
 		end
 	end)
-	
+
 	-- Configure Custom Elements
 	-----------------------------------------------------------
 	-- Register our Minimap as a keyword with the Engine,
@@ -772,10 +774,10 @@ if (IsRetail) then
 		self:SyncMinimap(true)
 
 		Library.OldMinimap:SetQuestBlobInsideAlpha(blobInside) -- "blue" areas with quest mobs/items in them
-		Library.OldMinimap:SetQuestBlobOutsideAlpha(blobOutside) -- borders around the "blue" areas 
+		Library.OldMinimap:SetQuestBlobOutsideAlpha(blobOutside) -- borders around the "blue" areas
 		Library.OldMinimap:SetQuestBlobRingAlpha(ringOutside) -- the big fugly edge ring texture!
 		Library.OldMinimap:SetQuestBlobRingScalar(ringInside) -- ring texture inside quest areas?
-	end 
+	end
 
 	LibMinimap.SetMinimapArchBlobAlpha = function(self, blobInside, blobOutside, ringOutside, ringInside)
 		check(blobInside, 1, "number")
@@ -786,10 +788,10 @@ if (IsRetail) then
 		self:SyncMinimap(true)
 
 		Library.OldMinimap:SetArchBlobInsideAlpha(blobInside) -- "blue" areas with quest mobs/items in them
-		Library.OldMinimap:SetArchBlobOutsideAlpha(blobOutside) -- borders around the "blue" areas 
+		Library.OldMinimap:SetArchBlobOutsideAlpha(blobOutside) -- borders around the "blue" areas
 		Library.OldMinimap:SetArchBlobRingAlpha(ringOutside) -- the big fugly edge ring texture!
 		Library.OldMinimap:SetArchBlobRingScalar(ringInside) -- ring texture inside quest areas?
-	end 
+	end
 
 	LibMinimap.SetMinimapTaskBlobAlpha = function(self, blobInside, blobOutside, ringOutside, ringInside)
 		check(blobInside, 1, "number")
@@ -800,10 +802,10 @@ if (IsRetail) then
 		self:SyncMinimap(true)
 
 		Library.OldMinimap:SetTaskBlobInsideAlpha(blobInside) -- "blue" areas with quest mobs/items in them
-		Library.OldMinimap:SetTaskBlobOutsideAlpha(blobOutside) -- borders around the "blue" areas 
+		Library.OldMinimap:SetTaskBlobOutsideAlpha(blobOutside) -- borders around the "blue" areas
 		Library.OldMinimap:SetTaskBlobRingAlpha(ringOutside) -- the big fugly edge ring texture!
 		Library.OldMinimap:SetTaskBlobRingScalar(ringInside) -- ring texture inside quest areas?
-	end 
+	end
 
 	-- Set all blob values at once
 	LibMinimap.SetMinimapBlobAlpha = function(self, blobInside, blobOutside, ringOutside, ringInside)
@@ -815,20 +817,20 @@ if (IsRetail) then
 		self:SyncMinimap(true)
 
 		Library.OldMinimap:SetQuestBlobInsideAlpha(blobInside) -- "blue" areas with quest mobs/items in them
-		Library.OldMinimap:SetQuestBlobOutsideAlpha(blobOutside) -- borders around the "blue" areas 
+		Library.OldMinimap:SetQuestBlobOutsideAlpha(blobOutside) -- borders around the "blue" areas
 		Library.OldMinimap:SetQuestBlobRingAlpha(ringOutside) -- the big fugly edge ring texture!
 		Library.OldMinimap:SetQuestBlobRingScalar(ringInside) -- ring texture inside quest areas?
 
 		Library.OldMinimap:SetArchBlobInsideAlpha(blobInside) -- "blue" areas with quest mobs/items in them
-		Library.OldMinimap:SetArchBlobOutsideAlpha(blobOutside) -- borders around the "blue" areas 
+		Library.OldMinimap:SetArchBlobOutsideAlpha(blobOutside) -- borders around the "blue" areas
 		Library.OldMinimap:SetArchBlobRingAlpha(ringOutside) -- the big fugly edge ring texture!
 		Library.OldMinimap:SetArchBlobRingScalar(ringInside) -- ring texture inside quest areas?
 
 		Library.OldMinimap:SetTaskBlobInsideAlpha(blobInside) -- "blue" areas with quest mobs/items in them
-		Library.OldMinimap:SetTaskBlobOutsideAlpha(blobOutside) -- borders around the "blue" areas 
+		Library.OldMinimap:SetTaskBlobOutsideAlpha(blobOutside) -- borders around the "blue" areas
 		Library.OldMinimap:SetTaskBlobRingAlpha(ringOutside) -- the big fugly edge ring texture!
 		Library.OldMinimap:SetTaskBlobRingScalar(ringInside) -- ring texture inside quest areas?
-	end 
+	end
 end
 
 LibMinimap.SetMinimapMaskTexture = function(self, path)
@@ -869,10 +871,10 @@ if (IsClassic) then
 				})
 			end
 		end
-		if (hasTracking) then 
+		if (hasTracking) then
 			EasyMenu(trackingMenu, trackingMenuFrame, "cursor", 0 , 0, "MENU")
 			LibMinimap:PlaySoundKitID(SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON, "SFX")
-		end 
+		end
 	end
 else
 	LibMinimap.ShowMinimapTrackingMenu = function(self)
@@ -1025,7 +1027,7 @@ LibMinimap.UpdateMinimapButtonBag = function(self)
 			self:RestoreButton(button)
 		end
 	end
-	
+
 end
 
 LibMinimap.UpdateCompass = function()
@@ -1044,22 +1046,22 @@ LibMinimap.UpdateCompass = function()
 			end
 			radius = width/2
 		end
-	
+
 		local inset = LibMinimap.compassRadiusInset
 		if inset then
 			radius = radius - inset
 		end
-	
+
 		local playerFacing = GetPlayerFacing()
 		if (not playerFacing) or (compassFrame.supressCompass) then
 			compassFrame:SetAlpha(0)
 		else
 			compassFrame:SetAlpha(1)
 		end
-	
+
 		-- In Torghast, map is always locked. Weird.
 		local angle = (IN_TORGHAST) and 0 or (LibMinimap.rotateMinimap and playerFacing) and -playerFacing or 0
-	
+
 		compassFrame.east:SetPoint("CENTER", radius*math.cos(angle), radius*math.sin(angle))
 		compassFrame.north:SetPoint("CENTER", radius*math.cos(angle + math.pi/2), radius*math.sin(angle + math.pi/2))
 		compassFrame.west:SetPoint("CENTER", radius*math.cos(angle + math.pi), radius*math.sin(angle + math.pi))
@@ -1179,12 +1181,15 @@ LibMinimap.SetMinimapCompassEnabled = function(self, enableCompass)
 	if enableCompass then
 		-- Hide blizzard textires
 		MinimapCompassTexture:SetAlpha(0)
-		MinimapNorthTag:SetAlpha(0)
+
+		if (MinimapNorthTag) then
+			MinimapNorthTag:SetAlpha(0)
+		end
 
 		-- Get or create our compass frame
 		local compassFrame = LibMinimap:GetCompassFrame() or LibMinimap:CreateCompassFrame()
 		compassFrame:Show()
-		
+
 		-- Get the current rotation setting and store it locally
 		LibMinimap.rotateMinimap = GetCVar("rotateMinimap") == "1"
 
@@ -1247,7 +1252,7 @@ LibMinimap.OnEvent = function(self, event, ...)
 		-- Update Cluster position
 		Library.OldCluster:ClearAllPoints()
 		Library.OldCluster:SetAllPoints(Library.MapHolder)
-	
+
 	elseif (event == "PLAYER_ENTERING_WORLD") then
 		-- In Torghast, map is always locked. Weird.
 		-- *Note that this is only in the tower, not the antechamber.
@@ -1340,7 +1345,7 @@ LibMinimap.RegisterElement = function(self, elementName, enableFunc, disableFunc
 	check(disableFunc, 3, "function")
 	check(updateFunc, 4, "function")
 	check(version, 5, "number", "nil")
-	
+
 	-- Does an old version of the element exist?
 	local old = Elements[elementName]
 	local needUpdate
diff --git a/SimpleClassPower/back-end/libraries/playerdata.lua b/SimpleClassPower/back-end/libraries/playerdata.lua
index b338a78..098f842 100644
--- a/SimpleClassPower/back-end/libraries/playerdata.lua
+++ b/SimpleClassPower/back-end/libraries/playerdata.lua
@@ -1,4 +1,4 @@
-local LibPlayerData = Wheel:Set("LibPlayerData", 24)
+local LibPlayerData = Wheel:Set("LibPlayerData", 26)
 if (not LibPlayerData) then
 	return
 end
@@ -39,22 +39,24 @@ local IsXPUserDisabled = IsXPUserDisabled
 local UnitLevel = UnitLevel
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 -- Library registries
----------------------------------------------------------------------	
+---------------------------------------------------------------------
 LibPlayerData.embeds = LibPlayerData.embeds or {}
 
 -- Utility Functions
----------------------------------------------------------------------	
--- Syntax check 
+---------------------------------------------------------------------
+-- Syntax check
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -69,7 +71,7 @@ if (IsClassic) then
 
 	-- Returns whether the player is  tracking a reputation
 	LibPlayerData.PlayerHasRep = function()
-		return GetWatchedFactionInfo() and true or false 
+		return GetWatchedFactionInfo() and true or false
 	end
 
 	-- Just in case I slip up and use the wrong API.
@@ -80,24 +82,37 @@ elseif (IsTBC) then
 	-- Return whether the player currently can gain XP
 	LibPlayerData.PlayerHasXP = function() return (UnitLevel("player") < 70) end
 
-	-- Returns whether the player is  tracking a reputation
+	-- Returns whether the player is tracking a reputation
+	LibPlayerData.PlayerHasRep = function()
+		return GetWatchedFactionInfo() and true or false
+	end
+
+	-- Just in case I slip up and use the wrong API.
+	LibPlayerData.PlayerHasAP = function() end
+
+elseif (IsWrath) then
+
+	-- Return whether the player currently can gain XP
+	LibPlayerData.PlayerHasXP = function() return (UnitLevel("player") < 80) end
+
+	-- Returns whether the player is tracking a reputation
 	LibPlayerData.PlayerHasRep = function()
-		return GetWatchedFactionInfo() and true or false 
+		return GetWatchedFactionInfo() and true or false
 	end
 
 	-- Just in case I slip up and use the wrong API.
 	LibPlayerData.PlayerHasAP = function() end
-	
+
 elseif (IsRetail) then
 
 	-- Return whether the player currently can gain XP
 	LibPlayerData.PlayerHasXP = function()
-		if (not IsXPUserDisabled()) then 
-			if (GetAccountExpansionLevel() == GetMaximumExpansionLevel()) then 
+		if (not IsXPUserDisabled()) then
+			if (GetAccountExpansionLevel() == GetMaximumExpansionLevel()) then
 				return (UnitLevel("player") < GetMaxLevelForLatestExpansion())
 			else
 				return (UnitLevel("player") < GetMaxLevelForPlayerExpansion())
-			end 
+			end
 		end
 		return false
 	end
@@ -114,23 +129,23 @@ elseif (IsRetail) then
 		return azeriteItem and azeriteItem:IsEquipmentSlot() and IsAzeriteItemEnabled(azeriteItem)
 	end
 
-	-- Returns whether the player is  tracking a reputation
+	-- Returns whether the player is tracking a reputation
 	LibPlayerData.PlayerHasRep = function()
 		local name, reaction, min, max, current, factionID = GetWatchedFactionInfo()
-		if name then 
+		if name then
 			local numFactions = GetNumFactions()
 			for i = 1, numFactions do
 				local factionName, description, standingID, barMin, barMax, barValue, atWarWith, canToggleAtWar, isHeader, isCollapsed, hasRep, isWatched, isChild, factionID, hasBonusRepGain, canBeLFGBonus = GetFactionInfo(i)
 				local friendID, friendRep, friendMaxRep, friendName, friendText, friendTexture, friendTextLevel, friendThreshold, nextFriendThreshold = GetFriendshipReputation(factionID)
 				if (factionName == name) then
-					if (standingID) then 
+					if (standingID) then
 						return true
-					else 
+					else
 						return false
-					end 
+					end
 				end
 			end
-		end 
+		end
 	end
 
 end
diff --git a/SimpleClassPower/back-end/libraries/spellhighlight.lua b/SimpleClassPower/back-end/libraries/spellhighlight.lua
index 8d0242b..be79282 100644
--- a/SimpleClassPower/back-end/libraries/spellhighlight.lua
+++ b/SimpleClassPower/back-end/libraries/spellhighlight.lua
@@ -1,4 +1,4 @@
-local LibSpellHighlight = Wheel:Set("LibSpellHighlight", 9)
+local LibSpellHighlight = Wheel:Set("LibSpellHighlight", 10)
 if (not LibSpellHighlight) then
 	return
 end
@@ -59,7 +59,7 @@ local UnitPowerMax = UnitPowerMax
 local UnitPowerType = UnitPowerType
 
 -- Doing it this way to make the transition to library later on easier
-LibSpellHighlight.embeds = LibSpellHighlight.embeds or {} 
+LibSpellHighlight.embeds = LibSpellHighlight.embeds or {}
 LibSpellHighlight.activeHighlights = LibSpellHighlight.activeHighlights or {} -- current active highlights spellIDs and their highlight type
 LibSpellHighlight.activeHighlightsByAuraID = LibSpellHighlight.activeHighlightsByAuraID or {}
 LibSpellHighlight.highlightSpellsByAuraID = LibSpellHighlight.highlightSpellsByAuraID or {} -- reactive auras and actionbar highlight spells
@@ -72,7 +72,7 @@ LibSpellHighlight.playerSpellCache = LibSpellHighlight.playerSpellCache or {} --
 LibSpellHighlight.runningTimers = LibSpellHighlight.runningTimers or {} -- currently running timers
 
 -- Frame tracking timers
-LibSpellHighlight.frame = LibSpellHighlight.frame or CreateFrame("Frame") 
+LibSpellHighlight.frame = LibSpellHighlight.frame or CreateFrame("Frame")
 
 -- Shortcuts
 local Frame = LibSpellHighlight.frame
@@ -103,8 +103,10 @@ local _,playerClass = UnitClass("player")
 local playerGUID = UnitGUID("player")
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 -- Sourced from BlizzardInterfaceResources/Resources/EnumerationTables.lua
@@ -166,12 +168,12 @@ local L = {
 
 -- Utility Functions
 ----------------------------------------------------
--- Syntax check 
+-- Syntax check
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -217,7 +219,7 @@ end
 -- Library Timers
 ----------------------------------------------------
 -- Constant to track if updates are running
-local TimerRunning 
+local TimerRunning
 
 -- Reset the frame, in case this is a library update
 Frame:SetScript("OnUpdate", nil)
@@ -302,7 +304,7 @@ LibSpellHighlight.UpdateAuras = function(self, event, ...)
 	end
 
 	-- Iterate for current highlights
-	for i = 1, BUFF_MAX_DISPLAY do 
+	for i = 1, BUFF_MAX_DISPLAY do
 
 		-- Retrieve buff information
 		local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, auraID, canApplyAura, isBossDebuff, isCastByPlayer, nameplateShowAll, timeMod, value1, value2, value3 = self:GetUnitBuff("player", i, "HELPFUL PLAYER")
@@ -326,7 +328,7 @@ LibSpellHighlight.UpdateAuras = function(self, event, ...)
 				end
 			end
 		end
-		
+
 	end
 
 	-- Disable active highlights that no longer match the current iteration.
@@ -391,7 +393,7 @@ LibSpellHighlight.UpdateCounterAttack = function(self, event, ...)
 			end
 		end
 	end
-	
+
 	if (isSrcPlayer) and (eventType == "SPELL_CAST_SUCCESS") and (spellName == L.Spell_Counterattack) then
 		local spellID = PlayerSpellCache[L.Spell_Counterattack]
 		self:DeactivateHighlight(spellID)
@@ -463,7 +465,7 @@ LibSpellHighlight.UpdateMongooseBite = function(self, event, ...)
 			end
 		end
 	end
-	
+
 	if (isSrcPlayer) and (eventType == "SPELL_CAST_SUCCESS") and (spellName == L.Spell_MongooseBite) then
 		local spellID = PlayerSpellCache[L.Spell_MongooseBite]
 		self:DeactivateHighlight(spellID)
@@ -619,7 +621,7 @@ LibSpellHighlight.UpdateClassicEvents = function(self, event, ...)
 		-- Initial update of highlights.
 		self:UpdateAuras()
 		self:UpdateComboPoints()
-	
+
 	elseif (playerClass == "HUNTER") then
 		-- Register combat log parsing if abilities exist.
 		if (PlayerSpellCache[L.Spell_Counterattack]) and (PlayerSpellCache[L.Spell_MongooseBite]) then
@@ -631,7 +633,7 @@ LibSpellHighlight.UpdateClassicEvents = function(self, event, ...)
 		elseif ((PlayerSpellCache[L.Spell_MongooseBite])) then
 			self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED", "UpdateMongooseBite")
 		end
-	
+
 	elseif (playerClass == "ROGUE") then
 		-- Track combo points for finisher highlight.
 		self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateComboPoints")
@@ -695,7 +697,7 @@ LibSpellHighlight.UpdateClassicEvents = function(self, event, ...)
 end
 
 local PopulateClassicDatabase = function(self)
-	if not(IsClassic or IsTBC) then
+	if not(IsClassic or IsTBC or IsWrath) then
 		return
 	end
 
@@ -730,7 +732,7 @@ local PopulateClassicDatabase = function(self)
 			[9829] = true, -- Shred (Rank 4)
 			[9830] = true  -- Shred (Rank 5)
 		}
-	
+
 		ComboFinishersBySpellID[22568] = true -- Ferocious Bite (Rank 1)
 		ComboFinishersBySpellID[22827] = true -- Ferocious Bite (Rank 2)
 		ComboFinishersBySpellID[22828] = true -- Ferocious Bite (Rank 3)
@@ -742,22 +744,22 @@ local PopulateClassicDatabase = function(self)
 		ComboFinishersBySpellID[ 9752] = true -- Rip (Rank 4)
 		ComboFinishersBySpellID[ 9894] = true -- Rip (Rank 5)
 		ComboFinishersBySpellID[ 9896] = true -- Rip (Rank 6)
-	
+
 	end
-	
+
 	if (playerClass == "HUNTER") then
 		ReactiveSpellsBySpellID[L.Spell_Counterattack] = { 19306, 20909, 20910 }
 		ReactiveSpellsBySpellID[L.Spell_MongooseBite] = { 1495, 14269, 14270, 14271 }
-	end 
-	
+	end
+
 	if (playerClass == "PALADIN") then
 		ReactiveSpellsBySpellID[L.Spell_Exorcism] = { 879, 5614, 5615, 10312, 10313, 10314 }
 		ReactiveSpellsBySpellID[L.Spell_HammerOfWrath] = { 24239, 24274, 24275 }
-	end 
-	
+	end
+
 	if (playerClass == "ROGUE") then
 		ReactiveSpellsBySpellID[L.Spell_Riposte] = { 14251 }
-	
+
 		ComboFinishersBySpellID[ 8647] = true -- Expose Armor (Rank 1)
 		ComboFinishersBySpellID[ 8649] = true -- Expose Armor (Rank 2)
 		ComboFinishersBySpellID[ 8650] = true -- Expose Armor (Rank 3)
@@ -780,14 +782,14 @@ local PopulateClassicDatabase = function(self)
 		ComboFinishersBySpellID[11275] = true -- Rupture (Rank 6)
 		ComboFinishersBySpellID[ 5171] = true -- Slice and Dive (Rank 1)
 		ComboFinishersBySpellID[ 6774] = true -- Slice and Dive (Rank 2)
-	
-	end 
-	
+
+	end
+
 	if (playerClass == "SHAMAN") then
 	end
-	
+
 	if (playerClass == "WARLOCK") then
-	
+
 		HighlightTypeByAuraID[17941] = "REACTIVE"
 		HighlightSpellsByAuraID[17941] = { -- Shadow Trance
 			[  686] = true, -- Shadow Bolt (Rank 1)
@@ -802,14 +804,14 @@ local PopulateClassicDatabase = function(self)
 			[25307] = true, -- Shadow Bolt (Rank 10)
 		}
 		ReactiveSpellsBySpellID[L.Spell_Nightfall] = { 18094, 18095 }
-	end 
-	
+	end
+
 	if (playerClass == "WARRIOR") then
 		ReactiveSpellsBySpellID[L.Spell_Execute] = { 5308, 20658, 20660, 20661, 20662 }
 		ReactiveSpellsBySpellID[L.Spell_Overpower] = { 7384, 7887, 11584, 11585 }
 		ReactiveSpellsBySpellID[L.Spell_Revenge] = { 6572, 6574, 7379, 11600, 11601, 25288 }
 	end
-	
+
 	-- Cache all spellIDs that have a triggering auraID,
 	-- and store their overlay types.
 	for auraID,spells in pairs(HighlightSpellsByAuraID) do
@@ -818,7 +820,7 @@ local PopulateClassicDatabase = function(self)
 			HighlightTypeBySpellID[spellID] = HighlightTypeByAuraID[auraID]
 		end
 	end
-	
+
 	-- Store overlay type of reative spells
 	for spellName, spells in pairs(ReactiveSpellsBySpellID) do
 		for _,spellID in ipairs(spells) do
@@ -852,7 +854,7 @@ LibSpellHighlight.Embed = function(self, target)
 	return target
 end
 
-if (IsClassic or IsTBC) then
+if (IsClassic or IsTBC or IsWrath) then
 	-- Register initialization events
 	if (playerClass == "DRUID") then
 		LibSpellHighlight:RegisterEvent("SPELLS_CHANGED", "UpdateClassicEvents")
diff --git a/SimpleClassPower/back-end/libraries/statusbar.lua b/SimpleClassPower/back-end/libraries/statusbar.lua
index d029d99..45c171e 100644
--- a/SimpleClassPower/back-end/libraries/statusbar.lua
+++ b/SimpleClassPower/back-end/libraries/statusbar.lua
@@ -1,4 +1,4 @@
-local LibStatusBar = Wheel:Set("LibStatusBar", 59)
+local LibStatusBar = Wheel:Set("LibStatusBar", 60)
 if (not LibStatusBar) then
 	return
 end
@@ -43,8 +43,8 @@ local Textures = LibStatusBar.textures
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -115,7 +115,7 @@ local Update = function(self, elapsed)
 	elseif (value < min) then
 		value = min
 	end
-	
+
 	if (value == min) or (max == min) then
 		bar:Hide()
 	else
@@ -157,7 +157,7 @@ local Update = function(self, elapsed)
 				-- *There's gotta be a more elegant way to do this...
 				local topBefore, topAfter = 1, #sparkMap.top
 				local bottomBefore, bottomAfter = 1, #sparkMap.bottom
-					
+
 				-- Iterate backwards to find the first top point before our current bar value
 				for i = topAfter,topBefore,-1 do
 					if sparkMap.top[i].keyPercent > sparkPercentage then
@@ -178,7 +178,7 @@ local Update = function(self, elapsed)
 						break
 					end
 				end
-			
+
 				-- figure out the offset at our current position
 				-- between our upper and lover points
 				local belowPercentTop = sparkMap.top[topBefore].keyPercent
@@ -189,11 +189,11 @@ local Update = function(self, elapsed)
 
 				local currentPercentTop = (sparkPercentage - belowPercentTop)/(abovePercentTop-belowPercentTop)
 				local currentPercentBottom = (sparkPercentage - belowPercentBottom)/(abovePercentBottom-belowPercentBottom)
-	
+
 				-- difference between the points
 				local diffTop = sparkMap.top[topAfter].offset - sparkMap.top[topBefore].offset
 				local diffBottom = sparkMap.bottom[bottomAfter].offset - sparkMap.bottom[bottomBefore].offset
-	
+
 				sparkBefore = (sparkMap.top[topBefore].offset + diffTop*currentPercentTop) --* height
 				sparkAfter = (sparkMap.bottom[bottomBefore].offset + diffBottom*currentPercentBottom) --* height
 			else
@@ -224,7 +224,7 @@ local Update = function(self, elapsed)
 				sparkAfter = (sparkMap[below].bottomOffset + diffBottom*currentPercent) --* height
 			end
 		end
-		
+
 		if (orientation == "RIGHT") then
 			if data.reversedH then
 				-- bar grows from the left to right
@@ -242,7 +242,7 @@ local Update = function(self, elapsed)
 			bar:SetPoint("BOTTOM")
 			bar:SetPoint("LEFT")
 			bar:SetSize(displaySize, height)
-				
+
 			spark:ClearAllPoints()
 			spark:SetPoint("TOP", bar, "TOPRIGHT", 0, sparkBefore*height)
 			spark:SetPoint("BOTTOM", bar, "BOTTOMRIGHT", 0, -sparkAfter*height)
@@ -259,18 +259,18 @@ local Update = function(self, elapsed)
 				-- (e.g. player absorbbar)
 				SetTexCoord(bar, 1-mult, 1, 0, 1)
 			end
-	
+
 			bar:ClearAllPoints()
 			bar:SetPoint("TOP")
 			bar:SetPoint("BOTTOM")
 			bar:SetPoint("RIGHT")
 			bar:SetSize(displaySize, height)
-			
+
 			spark:ClearAllPoints()
 			spark:SetPoint("TOP", bar, "TOPLEFT", 0, sparkBefore*height)
 			spark:SetPoint("BOTTOM", bar, "BOTTOMLEFT", 0, -sparkAfter*height)
 			spark:SetSize(data.sparkThickness, height - (sparkBefore + sparkAfter)*height)
-	
+
 		elseif (orientation == "UP") then
 			if data.reversed then
 				SetTexCoord(bar, 1, 0, 1-mult, 1)
@@ -278,18 +278,18 @@ local Update = function(self, elapsed)
 			else
 				SetTexCoord(bar, 0, 1, 1-mult, 1)
 			end
-	
+
 			bar:ClearAllPoints()
 			bar:SetPoint("LEFT")
 			bar:SetPoint("RIGHT")
 			bar:SetPoint("BOTTOM")
 			bar:SetSize(width, displaySize)
-			
+
 			spark:ClearAllPoints()
 			spark:SetPoint("LEFT", bar, "TOPLEFT", -sparkBefore*width, 0)
 			spark:SetPoint("RIGHT", bar, "TOPRIGHT", sparkAfter*width, 0)
 			spark:SetSize(width - (sparkBefore + sparkAfter)*width, data.sparkThickness)
-	
+
 		elseif (orientation == "DOWN") then
 			if data.reversed then
 				SetTexCoord(bar, 1, 0, 0, mult)
@@ -297,13 +297,13 @@ local Update = function(self, elapsed)
 			else
 				SetTexCoord(bar, 0, 1, 0, mult)
 			end
-	
+
 			bar:ClearAllPoints()
 			bar:SetPoint("LEFT")
 			bar:SetPoint("RIGHT")
 			bar:SetPoint("TOP")
 			bar:SetSize(width, displaySize)
-	
+
 			spark:ClearAllPoints()
 			spark:SetPoint("LEFT", bar, "BOTTOMLEFT", -sparkBefore*width, 0)
 			spark:SetPoint("RIGHT", bar, "BOTTOMRIGHT", sparkAfter*width, 0)
@@ -313,7 +313,7 @@ local Update = function(self, elapsed)
 			bar:Show()
 		end
 	end
-	
+
 	-- Spark alpha animation
 	if ((value == max) or (value == min) or (value/max >= data.sparkMaxPercent) or (value/max <= data.sparkMinPercent)) then
 		if spark:IsShown() then
@@ -326,7 +326,7 @@ local Update = function(self, elapsed)
 			local currentAlpha = spark:GetAlpha()
 			local targetAlpha = data.sparkDirection == "IN" and data.sparkMaxAlpha or data.sparkMinAlpha
 			local range = data.sparkMaxAlpha - data.sparkMinAlpha
-			local alphaChange = elapsed/(data.sparkDirection == "IN" and data.sparkDurationIn or data.sparkDurationOut) * range	
+			local alphaChange = elapsed/(data.sparkDirection == "IN" and data.sparkDurationIn or data.sparkDurationOut) * range
 			if data.sparkDirection == "IN" then
 				if currentAlpha + alphaChange < targetAlpha then
 					currentAlpha = currentAlpha + alphaChange
@@ -373,7 +373,7 @@ local OnUpdate = function(self, elapsed)
 				data.barDisplayValue = data.barValue
 				data.smoothing = nil
 			else
-				-- The fraction of the total bar this total animation should cover 
+				-- The fraction of the total bar this total animation should cover
 				local animsize = (data.barValue - data.smoothingInitialValue)/(data.barMax - data.barMin)
 
 				local smartSpeed
@@ -469,9 +469,9 @@ StatusBar.SetSmoothingFrequency = function(self, smoothingFrequency)
 end
 
 StatusBar.SetSmoothingMode = function(self, mode)
-	if (mode == "bezier-fast-in-slow-out") 
-	or (mode == "bezier-slow-in-fast-out") 
-	or (mode == "linear-fast-in-slow-out") 
+	if (mode == "bezier-fast-in-slow-out")
+	or (mode == "bezier-slow-in-fast-out")
+	or (mode == "linear-fast-in-slow-out")
 	or (mode == "linear-slow-in-fast-out")
 	or (mode == "linear") then
 		Bars[self].barSmoothingMode = mode
@@ -561,8 +561,8 @@ end
 StatusBar.SetStatusBarTexture = function(self, ...)
 	local arg = ...
 	if (type(arg) == "number") then
-		-- For some reason after 2.5.2 in WoW BCC, 
-		-- we can get a single number (textureID?) here. 
+		-- For some reason after 2.5.2 in WoW BCC,
+		-- we can get a single number (textureID?) here.
 		-- So we need an extra check. Seems to fix it.
 		local r,g,b = ...
 		if (r and g and b) then
@@ -604,7 +604,14 @@ end
 StatusBar.SetSparkTexture = function(self, ...)
 	local arg = ...
 	if (type(arg) == "number") then
-		Bars[self].spark:SetColorTexture(...)
+		-- we can get a single number (textureID?) here.
+		-- So we need an extra check. Seems to fix it.
+		local r,g,b = ...
+		if (r and g and b) then
+			Bars[self].spark:SetColorTexture(...)
+		else
+			Bars[self].spark:SetTexture(...)
+		end
 	else
 		Bars[self].spark:SetTexture(...)
 	end
@@ -822,7 +829,7 @@ LibStatusBar.CreateStatusBar = function(self, parent)
 
 	-- rare gem of a texture, works nicely on bars smaller than 256px in effective width
 	bar:SetTexture([[Interface\FontStyles\FontStyleMetal]])
-	
+
 	-- the spark texture
 	local spark = scaffold:CreateTexture()
 	spark:SetDrawLayer("BORDER", 1)
@@ -879,7 +886,7 @@ LibStatusBar.CreateStatusBar = function(self, parent)
 	-- Give both the bar texture and the virtual bar direct access
 	Textures[bar] = texCoords
 	Textures[statusbar] = texCoords
-	
+
 	Update(statusbar)
 
 	-- Apply our custom handler
diff --git a/SimpleClassPower/back-end/libraries/tooltip.lua b/SimpleClassPower/back-end/libraries/tooltip.lua
index 21de186..a974827 100644
--- a/SimpleClassPower/back-end/libraries/tooltip.lua
+++ b/SimpleClassPower/back-end/libraries/tooltip.lua
@@ -1,4 +1,4 @@
-local LibTooltip = Wheel:Set("LibTooltip", 125)
+local LibTooltip = Wheel:Set("LibTooltip", 127)
 if (not LibTooltip) then
 	return
 end
@@ -26,7 +26,7 @@ assert(LibStatusBar, "LibTooltip requires LibStatusBar to be loaded.")
 
 local LibPlayerData = Wheel("LibPlayerData")
 assert(LibPlayerData, "LibTooltip requires LibPlayerData to be loaded.")
- 
+
 -- Embed functionality into the library
 LibFrame:Embed(LibTooltip)
 LibEvent:Embed(LibTooltip)
@@ -39,11 +39,11 @@ local error = error
 local getmetatable = getmetatable
 local ipairs = ipairs
 local math_abs = math.abs
-local math_ceil = math.ceil 
+local math_ceil = math.ceil
 local math_floor = math.floor
 local math_mod = math.fmod
 local pairs = pairs
-local select = select 
+local select = select
 local setmetatable = setmetatable
 local string_find = string.find
 local string_format = string.format
@@ -59,7 +59,7 @@ local tostring = tostring
 local type = type
 local unpack = unpack
 
--- WoW API 
+-- WoW API
 local GetBestMapForUnit = C_Map.GetBestMapForUnit
 local GetCVarBool = GetCVarBool
 local GetMoneyString = GetMoneyString
@@ -87,14 +87,16 @@ local UnitQuestTrivialLevelRangeScaling = UnitQuestTrivialLevelRangeScaling or G
 local UnitReaction = UnitReaction
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 -- Library Registries
 LibTooltip.embeds = LibTooltip.embeds or {} -- modules and libs that embed this
 LibTooltip.defaults = LibTooltip.defaults or {} -- global tooltip defaults (can be modified by modules)
-LibTooltip.tooltips = LibTooltip.tooltips or {} -- tooltips keyed by frame handle 
+LibTooltip.tooltips = LibTooltip.tooltips or {} -- tooltips keyed by frame handle
 LibTooltip.tooltipsByName = LibTooltip.tooltipsByName or {} -- tooltips keyed by frame name
 LibTooltip.tooltipSettings = LibTooltip.tooltipSettings or {} -- per tooltip settings
 LibTooltip.tooltipDefaults = LibTooltip.tooltipDefaults or {} -- per tooltip defaults
@@ -126,11 +128,11 @@ local RIGHT_PADDING= 40 -- padding between left and right messages
 local LINE_PADDING = 2 -- padding between lines of text
 
 -- Fonts
-local FONT_TITLE = Game15Font_o1 
+local FONT_TITLE = Game15Font_o1
 local FONT_NORMAL = Game13Font_o1
 local FONT_VALUE = Game13Font_o1
 
--- Blizzard textures we use 
+-- Blizzard textures we use
 local BOSS_TEXTURE = "|TInterface\\TargetingFrame\\UI-TargetingFrame-Skull:14:14:-2:1|t" -- 1:1
 local FFA_TEXTURE = "|TInterface\\TargetingFrame\\UI-PVP-FFA:14:10:-2:1:64:64:6:34:0:40|t" -- 4:3
 local FACTION_ALLIANCE_TEXTURE = "|TInterface\\TargetingFrame\\UI-PVP-Alliance:14:10:-2:1:64:64:6:34:0:40|t" -- 4:3
@@ -142,12 +144,12 @@ local englishPlayerFaction, localizedPlayerFaction = UnitFactionGroup("player")
 
 -- Utility Functions
 ---------------------------------------------------------
--- Syntax check 
+-- Syntax check
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -158,20 +160,20 @@ end
 -- Prefix and camel case a word (e.g. 'name' >> 'prefixName' )
 local getPrefixed = function(name, prefix)
 	return name and string_gsub(name, "^%l", string_upper)
-end 
+end
 
 -- RGB to Hex Color Code
 local hex = function(r, g, b)
 	return ("|cff%02x%02x%02x"):format(math_floor(r*255), math_floor(g*255), math_floor(b*255))
 end
 
--- Convert a Blizzard Color or RGB value set 
--- into our own custom color table format. 
+-- Convert a Blizzard Color or RGB value set
+-- into our own custom color table format.
 local prepare = function(...)
 	local tbl
 	if (select("#", ...) == 1) then
 		local old = ...
-		if (old.r) then 
+		if (old.r) then
 			tbl = {}
 			tbl[1] = old.r or 1
 			tbl[2] = old.g or 1
@@ -191,14 +193,14 @@ end
 -- Convert a whole Blizzard color table
 local prepareGroup = function(group)
 	local tbl = {}
-	for i,v in pairs(group) do 
+	for i,v in pairs(group) do
 		tbl[i] = prepare(v)
-	end 
+	end
 	return tbl
-end 
+end
 
 -- Small utility function to anchor line based on lineIndex.
--- Note that this expects there to be a 10px inset from edge to text, 
+-- Note that this expects there to be a 10px inset from edge to text,
 -- plus a 2px padding between the lines. Makes these variable?
 local alignLine = function(tooltip, lineIndex)
 
@@ -206,19 +208,19 @@ local alignLine = function(tooltip, lineIndex)
 	local right = tooltip.lines.right[lineIndex]
 	left:ClearAllPoints()
 
-	if (lineIndex == 1) then 
+	if (lineIndex == 1) then
 		left:SetPoint("TOPLEFT", tooltip, "TOPLEFT", TEXT_INSET, -TEXT_INSET)
 	else
 		left:SetPoint("TOPLEFT", tooltip["TextLeft"..(lineIndex-1)], "BOTTOMLEFT", 0, -LINE_PADDING)
-	end 
+	end
 
 	-- If this is a single line, anchor it to the right side too, to allow wrapping.
-	if (right:IsShown()) then 
+	if (right:IsShown()) then
 		left:SetPoint("RIGHT", right, "LEFT", -RIGHT_PADDING, 0)
 	else
 		left:SetPoint("RIGHT", tooltip, "RIGHT", -TEXT_INSET, 0)
-	end 
-end 
+	end
+end
 
 -- Small utility function to create a left/right pair of lines
 local createNewLinePair = function(tooltip, lineIndex)
@@ -246,7 +248,7 @@ local createNewLinePair = function(tooltip, lineIndex)
 	right:SetFontObject((lineIndex == 1) and FONT_TITLE or FONT_NORMAL)
 	right:SetTextColor(tooltip.colors.offwhite[1], tooltip.colors.offwhite[2], tooltip.colors.offwhite[3])
 	right:SetJustifyH("RIGHT")
-	right:SetJustifyV("MIDDLE") 
+	right:SetJustifyV("MIDDLE")
 	right:SetIndentedWordWrap(false)
 	right:SetWordWrap(false)
 	right:SetNonSpaceWrap(false)
@@ -255,13 +257,13 @@ local createNewLinePair = function(tooltip, lineIndex)
 	tooltip["TextRight"..lineIndex] = right
 	tooltip.lines.right[#tooltip.lines.right + 1] = right
 
-	if tooltip.PostCreateLinePair then 
+	if tooltip.PostCreateLinePair then
 		tooltip:PostCreateLinePair(lineIndex, left, right)
-	end 
+	end
 
 	-- Align the new line
 	alignLine(tooltip, lineIndex)
-end 
+end
 
 -- Time constants
 local DAY, HOUR, MINUTE = 86400, 3600, 60
@@ -280,7 +282,7 @@ local formatTime = function(time)
 		return "%.1f%s", time, "s"
 	else
 		return ""
-	end	
+	end
 end
 
 -- Default Color & Texture Tables
@@ -290,7 +292,7 @@ local Colors = {
 	-- some basic ui colors used by all text
 	normal = prepare(229/255, 178/255, 38/255),
 	highlight = prepare(250/255, 250/255, 250/255),
-	offwhite = prepare(196/255, 196/255, 196/255), 
+	offwhite = prepare(196/255, 196/255, 196/255),
 	title = prepare(255/255, 234/255, 137/255),
 
 	-- health bar coloring
@@ -331,26 +333,26 @@ local Colors = {
 	power = {}
 }
 
--- Power bar colors need special handling, 
+-- Power bar colors need special handling,
 -- as some of them contain sub tables.
-for powerType, powerColor in pairs(PowerBarColor) do 
-	if (type(powerType) == "string") then 
-		if (powerColor.r) then 
+for powerType, powerColor in pairs(PowerBarColor) do
+	if (type(powerType) == "string") then
+		if (powerColor.r) then
 			Colors.power[powerType] = prepare(powerColor)
-		else 
-			if powerColor[1] and (type(powerColor[1]) == "table") then 
+		else
+			if powerColor[1] and (type(powerColor[1]) == "table") then
 				Colors.power[powerType] = prepareGroup(powerColor)
-			end 
-		end  
-	end 
-end 
+			end
+		end
+	end
+end
 
 -- Library hardcoded fallbacks
 local LibraryDefaults = {
 	autoCorrectScale = true, -- automatically correct the tooltip scale when shown
 	backdrop = {
 		bgFile = [[Interface\Tooltips\UI-Tooltip-Background]],
-		edgeFile = [[Interface\Tooltips\UI-Tooltip-Border]], 
+		edgeFile = [[Interface\Tooltips\UI-Tooltip-Border]],
 		edgeSize = 16,
 		insets = {
 			left = 2.5,
@@ -371,7 +373,7 @@ local LibraryDefaults = {
 	barHeight_power = 4 -- height of bars with the "power" type
 }
 
--- Assign the library hardcoded defaults as fallbacks 
+-- Assign the library hardcoded defaults as fallbacks
 setmetatable(Defaults, { __index = LibraryDefaults } )
 
 -- Tooltip Template
@@ -386,22 +388,22 @@ local Blizzard_GetScript = FrameMethods.GetScript
 -- Retrieve a tooltip specific setting
 Tooltip.GetCValue = function(self, name)
 	return TooltipSettings[self][name]
-end 
+end
 
 -- Retrieve a tooltip specific default
 Tooltip.GetDefaultCValue = function(self, name)
 	return TooltipDefaults[self][name]
-end 
+end
 
 -- Store a tooltip specific setting
 Tooltip.SetCValue = function(self, name, value)
 	TooltipSettings[self][name] = value
-end 
+end
 
 -- Store a tooltip specific default
 Tooltip.SetDefaultCValue = function(self, name, value)
 	TooltipDefaults[self][name] = value
-end 
+end
 
 -- Updates the tooltip size based on visible lines
 Tooltip.UpdateLayout = function(self)
@@ -410,104 +412,104 @@ Tooltip.UpdateLayout = function(self)
 	local currentHeight = 0
 	local overflowWidth
 
-	for lineIndex in ipairs(self.lines.left) do 
+	for lineIndex in ipairs(self.lines.left) do
 
 		-- Stop when we hit the first hidden line
 		local left = self.lines.left[lineIndex]
-		if (not left:IsShown()) then 
-			break 
-		end 
+		if (not left:IsShown()) then
+			break
+		end
 
 		-- Width of the current line
 		local lineWidth = 0
 
-		-- TODO: Add a system to make sure even overflow is controlled, 
+		-- TODO: Add a system to make sure even overflow is controlled,
 		-- by forcefully line-breaking the offending sides.
 		local right = self.lines.right[lineIndex]
-		if (right:IsShown()) then 
+		if (right:IsShown()) then
 			local rightWidth = RIGHT_PADDING + right:GetStringWidth()
 			local leftWidth = left:GetStringWidth()
 			local freeSpace = self.maximumWidth - rightWidth
 			if (left._wordWrap) then
 				lineWidth = leftWidth + rightWidth
-				if (lineWidth > self.maximumWidth) and (self.maximumWidth > rightWidth + self.minimumWidth) then 
+				if (lineWidth > self.maximumWidth) and (self.maximumWidth > rightWidth + self.minimumWidth) then
 					lineWidth = self.maximumWidth
-				end 
+				end
 			else
 				lineWidth = leftWidth + rightWidth
-				if (lineWidth > (overflowWidth or self.maximumWidth)) then 
+				if (lineWidth > (overflowWidth or self.maximumWidth)) then
 					overflowWidth = lineWidth
-				end 
+				end
 			end
-		else 
+		else
 			lineWidth = left:GetStringWidth()
 			if (not left._wordWrap) then
-				if (lineWidth > (overflowWidth or self.maximumWidth)) then 
+				if (lineWidth > (overflowWidth or self.maximumWidth)) then
 					overflowWidth = lineWidth
-				end 
+				end
 			end
-		end 
+		end
 
 		-- Increase the width if this line was larger
-		if (lineWidth > currentWidth) then 
-			currentWidth = lineWidth 
-		end 
-	end 
+		if (lineWidth > currentWidth) then
+			currentWidth = lineWidth
+		end
+	end
 
 	-- Don't allow it past maximum,
 	-- except for when a double line caused the overflow(?)
-	if (currentWidth > (overflowWidth or self.maximumWidth)) then 
+	if (currentWidth > (overflowWidth or self.maximumWidth)) then
 		currentWidth = overflowWidth or self.maximumWidth
-	end 
+	end
 
 	-- Set the width, add text inset to the final width
 	self:SetWidth(currentWidth + TEXT_INSET*2)
 
 	-- Second iteration to figure out heights now that text is wrapped
-	for lineIndex in ipairs(self.lines.left) do 
+	for lineIndex in ipairs(self.lines.left) do
 		-- Stop when we hit the first hidden line
 		local left = self.lines.left[lineIndex]
-		if (not left:IsShown()) then 
-			break 
-		end 
+		if (not left:IsShown()) then
+			break
+		end
 
 		-- Increase the height
-		if (lineIndex == 1) then 
+		if (lineIndex == 1) then
 			currentHeight = currentHeight + left:GetStringHeight()
-		else 
+		else
 			currentHeight = currentHeight + LINE_PADDING + left:GetStringHeight()
-		end 
-	end 
+		end
+	end
 
 	-- Set the height, add text inset to the final width
 	self:SetHeight(currentHeight + TEXT_INSET*2)
-end 
+end
 
 -- Backdrop update callback
 -- Update the size and position of the backdrop, make space for bars.
 Tooltip.UpdateBackdropLayout = function(self)
 
 	-- Allow modules to fully override this.
-	if self.OverrideBackdrop then 
+	if self.OverrideBackdrop then
 		return self:OverrideBackdrop()
-	end 
+	end
 
-	if self.PreUpdateBackdrop then 
+	if self.PreUpdateBackdrop then
 		self:PreUpdateBackdrop()
-	end 
+	end
 
 	-- Retrieve current settings
 	local left, right, top, bottom = unpack(self:GetCValue("backdropOffsets"))
-	local barSpacing = self:GetCValue("barSpacing") 
+	local barSpacing = self:GetCValue("barSpacing")
 	local barHeight = self:GetCValue("barHeight")
 
 	-- Make space for visible bars
-	for i,bar in ipairs(self.bars) do 
-		if bar:IsShown() then 
+	for i,bar in ipairs(self.bars) do
+		if bar:IsShown() then
 			-- Figure out the size of the current bar.
 			bottom = bottom + barSpacing + (bar.barType and self:GetCValue("barHeight"..bar.barType) or barHeight)
-		end 
-	end 
+		end
+	end
 
 	-- Position the backdrop
 	local backdrop = self.Backdrop
@@ -520,19 +522,19 @@ Tooltip.UpdateBackdropLayout = function(self)
 	backdrop:SetBackdropColor(unpack(self:GetCValue("backdropColor")))
 
 	-- Call module post updates if they exist.
-	if self.PostUpdateBackdrop then 
+	if self.PostUpdateBackdrop then
 		return self:PostUpdateBackdrop()
-	end 	
-end 
+	end
+end
 
 -- Bar update callback
 -- Update the position and size of the bars
 Tooltip.UpdateBarLayout = function(self)
 
 	-- Allow modules to fully override this.
-	if (self.OverrideBars) then 
+	if (self.OverrideBars) then
 		return self:OverrideBars()
-	end 
+	end
 
 	-- Retrieve general bar data
 	local barLeft, barRight = unpack(self:GetCValue("barInsets"))
@@ -540,11 +542,11 @@ Tooltip.UpdateBarLayout = function(self)
 	local barSpacing = self:GetCValue("barSpacing")
 	local barOffset = self:GetCValue("barOffset")
 
-	-- Iterate through all the visible bars, 
-	-- and size and position them. 
-	for i,bar in ipairs(self.bars) do 
-		if bar:IsShown() then 
-			
+	-- Iterate through all the visible bars,
+	-- and size and position them.
+	for i,bar in ipairs(self.bars) do
+		if bar:IsShown() then
+
 			-- Figure out the size of the current bar.
 			local barSize = bar.barType and self:GetCValue("barHeight"..bar.barType) or barHeight
 
@@ -556,14 +558,14 @@ Tooltip.UpdateBarLayout = function(self)
 
 			-- Update offsets
 			barOffset = barOffset + barSize + barSpacing
-		end 
-	end 
+		end
+	end
 
 	-- Call module post updates if they exist.
-	if (self.PostUpdateBars) then 
+	if (self.PostUpdateBars) then
 		return self:PostUpdateBars()
-	end 
-end 
+	end
+end
 
 Tooltip.GetNumBars = function(self)
 	return self.numBars
@@ -577,12 +579,12 @@ Tooltip.AddBar = function(self, barType)
 	self.numBars = self.numBars + 1
 
 	-- create an additional bar if needed
-	if (self.numBars > #self.bars) then 
+	if (self.numBars > #self.bars) then
 		local bar = self:CreateStatusBar()
 		local barTexture = self:GetCValue("barTexture")
-		if barTexture then 
+		if barTexture then
 			bar:SetStatusBarTexture(barTexture)
-		end 
+		end
 
 		-- Add a value string, but let the modules handle it.
 		local value = bar:CreateFontString()
@@ -595,16 +597,16 @@ Tooltip.AddBar = function(self, barType)
 		value:SetShadowColor(0, 0, 0, 0)
 		value:SetTextColor(self.colors.highlight[1], self.colors.highlight[2], self.colors.highlight[3], .75)
 		value:Hide()
-		
+
 		bar.Value = value
 
 		-- Store the new bar
 		self.bars[self.numBars] = bar
 
-		if self.PostCreateBar then 
+		if self.PostCreateBar then
 			self:PostCreateBar(bar)
 		end
-	end 
+	end
 
 	local bar = self.bars[self.numBars]
 	bar:SetValue(0, true)
@@ -625,8 +627,8 @@ Tooltip.GetUnitHealthColor = function(self, unit)
 		return self:OverideUnitHealthColor(unit)
 	end
 	local r, g, b
-	if self.data then 
-		if (self.data.isPet and self.data.petRarity) then 
+	if self.data then
+		if (self.data.isPet and self.data.petRarity) then
 			r, g, b = unpack(self.colors.quality[self.data.petRarity - 1])
 		else
 			if ((not UnitPlayerControlled(unit)) and UnitIsTapDenied(unit) and UnitCanAttack("player", unit)) then
@@ -637,18 +639,18 @@ Tooltip.GetUnitHealthColor = function(self, unit)
 				r, g, b = unpack(self.colors.dead)
 			elseif (UnitIsPlayer(unit)) then
 				local _, class = UnitClass(unit)
-				if class then 
+				if class then
 					r, g, b = unpack(self.colors.class[class])
-				else 
+				else
 					r, g, b = unpack(self.colors.disconnected)
-				end 
+				end
 			elseif (UnitReaction(unit, "player")) then
 				r, g, b = unpack(self.colors.reaction[UnitReaction(unit, "player")])
 			else
 				r, g, b = 1, 1, 1
 			end
-		end 
-	else 
+		end
+	else
 		if ((not UnitPlayerControlled(unit)) and UnitIsTapDenied(unit) and UnitCanAttack("player", unit)) then
 			r, g, b = unpack(self.colors.tapped)
 		elseif (not UnitIsConnected(unit)) then
@@ -657,22 +659,22 @@ Tooltip.GetUnitHealthColor = function(self, unit)
 			r, g, b = unpack(self.colors.dead)
 		elseif (UnitIsPlayer(unit)) then
 			local _, class = UnitClass(unit)
-			if class then 
+			if class then
 				r, g, b = unpack(self.colors.class[class])
-			else 
+			else
 				r, g, b = unpack(self.colors.disconnected)
-			end 
+			end
 		elseif (UnitReaction(unit, "player")) then
 			r, g, b = unpack(self.colors.reaction[UnitReaction(unit, "player")])
 		else
 			r, g, b = 1, 1, 1
 		end
-	end 
+	end
 	if self.PostUpdateUnitHealthColor then
 		return self:PostUpdateUnitHealthColor(unit)
 	end
 	return r,g,b
-end 
+end
 Tooltip.UnitColor = Tooltip.GetUnitHealthColor -- make the original blizz call a copy of this, for compatibility
 
 Tooltip.GetUnitPowerColor = function(self, unit)
@@ -694,11 +696,11 @@ Tooltip.GetUnitPowerColor = function(self, unit)
 		return self:PostUpdateUnitPowerColor(unit)
 	end
 	return r, g, b
-end 
+end
 
 -- Returns the correct difficulty color compared to the player.
 -- Using this as a tooltip method to access our custom colors.
-if (IsClassic or IsTBC) then
+if (IsClassic or IsTBC or IsWrath) then
 	Tooltip.GetDifficultyColorByLevel = function(self, level, isScaling)
 		local colors = self.colors.quest
 		local levelDiff = level - UnitLevel("player")
@@ -763,34 +765,34 @@ end
 
 -- Mimic the UIParent scale regardless of what the effective scale is
 Tooltip.UpdateScale = function(self)
-	if self:GetCValue("autoCorrectScale") then 
+	if self:GetCValue("autoCorrectScale") then
 		local currentScale = self:GetScale()
 		local targetScale = UIParent:GetEffectiveScale() / self:GetParent():GetEffectiveScale()
-		if (math_abs(currentScale - targetScale) > .05) then 
+		if (math_abs(currentScale - targetScale) > .05) then
 			self:SetScale(targetScale)
 			self:Show()
 			return true
-		end 
-	end 
-end 
+		end
+	end
+end
 
 Tooltip.GetPositionOffset = function(self)
 
-	-- Add offset for any visible bars 
+	-- Add offset for any visible bars
 	local offset = 0
 
 	-- Get standard values for size and spacing
 	local barSpacing = self:GetCValue("barSpacing")
 	local barHeight = self:GetCValue("barHeight")
 
-	for barIndex,bar in ipairs(self.bars) do 
-		if bar:IsShown() then 
+	for barIndex,bar in ipairs(self.bars) do
+		if bar:IsShown() then
 			offset = offset + barSpacing + (bar.barType and self:GetCValue("barHeight"..bar.barType) or barHeight)
-		end 
-	end 
+		end
+	end
 
 	return offset
-end 
+end
 
 Tooltip.UpdatePosition = function(self)
 
@@ -798,77 +800,77 @@ Tooltip.UpdatePosition = function(self)
 	local defaultAnchor = self:GetCValue("defaultAnchor")
 
 	local position
-	if (type(defaultAnchor) == "function") then 
+	if (type(defaultAnchor) == "function") then
 		position = { defaultAnchor(self, self:GetOwner()) }
-	else 
+	else
 		position = { unpack(defaultAnchor) }
-	end 
+	end
 
-	-- only check for offsets when the bottom is the anchor, 
+	-- only check for offsets when the bottom is the anchor,
 	-- since the bars currently only are shown there
 	local point = position[1]
-	if ((type(point) == "string") and (string_find(point, "BOTTOM"))) then 
+	if ((type(point) == "string") and (string_find(point, "BOTTOM"))) then
 
 		-- Add the offset only if there is one
 		local offset = self:GetPositionOffset()
-		if (offset > 0) then 
-			if (type(position[#position]) == "number") then 
+		if (offset > 0) then
+			if (type(position[#position]) == "number") then
 				position[#position] = position[#position] + offset
 			else
 				position[#position + 1] = 0
 				position[#position + 1] = offset
-			end 
-		end 
-	end 
+			end
+		end
+	end
 
 	-- Position it, and take bar height into account
 	self:Place(unpack(position))
-end 
+end
 
 Tooltip.SetDefaultPosition = function(self, ...)
 	local numArgs = select("#", ...)
-	if (numArgs == 1) then 
+	if (numArgs == 1) then
 		local defaultAnchor = ...
 		check(defaultAnchor, 1, "table", "function", "string")
-		if ((type("defaultAnchor") == "function") or (type("defaultAnchor") == "table")) then 
+		if ((type("defaultAnchor") == "function") or (type("defaultAnchor") == "table")) then
 			self:SetDefaultCValue("defaultAnchor", defaultAnchor)
-		else 
+		else
 			self:SetDefaultCValue("defaultAnchor", { defaultAnchor })
-		end 
-	else 
+		end
+	else
 		self:SetDefaultCValue("defaultAnchor", { ... })
-	end 
-end 
+	end
+end
 
 Tooltip.SetPosition = function(self, ...)
 	local numArgs = select("#", ...)
-	if (numArgs == 1) then 
+	if (numArgs == 1) then
 		local defaultAnchor = ...
 		check(defaultAnchor, 1, "table", "function", "string")
-		if ((type("defaultAnchor") == "function") or (type("defaultAnchor") == "table")) then 
+		if ((type("defaultAnchor") == "function") or (type("defaultAnchor") == "table")) then
 			self:SetCValue("defaultAnchor", defaultAnchor)
-		else 
+		else
 			self:SetCValue("defaultAnchor", { defaultAnchor })
-		end 
-	else 
+		end
+	else
 		self:SetCValue("defaultAnchor", { ... })
-	end 
-end 
+	end
+end
 
 Tooltip.SetMinimumWidth = function(self, width)
 	self.minimumWidth = width
-end 
+end
 
 Tooltip.SetMaximumWidth = function(self, width)
 	self.maximumWidth = width
-end 
+end
 
 Tooltip.SetDefaultBackdrop = function(self, backdropTable)
 	check(backdropTable, 1, "table", "nil")
 	self:SetDefaultCValue("backdrop", backdropTable)
 	self:UpdateBackdropLayout()
 	self:UpdateBarLayout()
-end 
+end
 
 Tooltip.SetDefaultBackdropColor = function(self, r, g, b, a)
 	check(r, 1, "number")
@@ -878,7 +880,7 @@ Tooltip.SetDefaultBackdropColor = function(self, r, g, b, a)
 	self:SetDefaultCValue("backdropColor", { r, g, b, a })
 	self:UpdateBackdropLayout()
 	self:UpdateBarLayout()
-end 
+end
 
 Tooltip.SetDefaultBackdropBorderColor = function(self, r, g, b, a)
 	check(r, 1, "number")
@@ -888,7 +890,7 @@ Tooltip.SetDefaultBackdropBorderColor = function(self, r, g, b, a)
 	self:SetDefaultCValue("backdropBorderColor", { r, g, b, a })
 	self:UpdateBackdropLayout()
 	self:UpdateBarLayout()
-end 
+end
 
 Tooltip.SetDefaultBackdropOffset = function(self, left, right, top, bottom)
 	check(left, 1, "number")
@@ -898,7 +900,7 @@ Tooltip.SetDefaultBackdropOffset = function(self, left, right, top, bottom)
 	self:SetDefaultCValue("defaultBackdropOffset", { left, right, top, bottom })
 	self:UpdateBackdropLayout()
 	self:UpdateBarLayout()
-end 
+end
 
 Tooltip.SetDefaultStatusBarInset = function(self, left, right)
 	check(left, 1, "number")
@@ -906,33 +908,33 @@ Tooltip.SetDefaultStatusBarInset = function(self, left, right)
 	self:SetDefaultCValue("barInsets", { left, right })
 	self:UpdateBackdropLayout()
 	self:UpdateBarLayout()
-end 
+end
 
 Tooltip.SetDefaultStatusBarOffset = function(self, barOffset)
 	check(barOffset, 1, "number")
 	self:SetDefaultCValue("barOffset", barOffset)
 	self:UpdateBackdropLayout()
 	self:UpdateBarLayout()
-end 
+end
 
 Tooltip.SetDefaultBarHeight = function(self, barHeight, barType)
 	check(barHeight, 1, "number")
 	check(barType, 2, "string", "nil")
-	if barType then 
+	if barType then
 		self:SetDefaultCValue("barHeight"..barType, barHeight)
-	else 
+	else
 		self:SetDefaultCValue("barHeight", barHeight)
-	end 
+	end
 	self:UpdateBarLayout()
 	self:UpdateBackdropLayout()
-end 
+end
 
 Tooltip.SetBackdrop = function(self, backdropTable)
 	check(backdropTable, 1, "table", "nil")
 	self:SetCValue("backdrop", backdropTable)
 	self:UpdateBackdropLayout()
 	self:UpdateBarLayout()
-end 
+end
 
 Tooltip.SetBackdropBorderColor = function(self, r, g, b, a)
 	check(r, 1, "number")
@@ -942,7 +944,7 @@ Tooltip.SetBackdropBorderColor = function(self, r, g, b, a)
 	self:SetCValue("backdropBorderColor", { r, g, b, a })
 	self:UpdateBackdropLayout()
 	self:UpdateBarLayout()
-end 
+end
 
 Tooltip.SetBackdropColor = function(self, r, g, b, a)
 	check(r, 1, "number")
@@ -952,7 +954,7 @@ Tooltip.SetBackdropColor = function(self, r, g, b, a)
 	self:SetCValue("backdropColor", { r, g, b, a })
 	self:UpdateBackdropLayout()
 	self:UpdateBarLayout()
-end 
+end
 
 Tooltip.SetBackdropOffset = function(self, left, right, top, bottom)
 	check(left, 1, "number")
@@ -962,7 +964,7 @@ Tooltip.SetBackdropOffset = function(self, left, right, top, bottom)
 	self:SetCValue("backdropOffsets", { left, right, top, bottom })
 	self:UpdateBackdropLayout()
 	self:UpdateBarLayout()
-end 
+end
 
 Tooltip.SetStatusBarInset = function(self, left, right)
 	check(left, 1, "number")
@@ -970,42 +972,42 @@ Tooltip.SetStatusBarInset = function(self, left, right)
 	self:SetCValue("barInsets", { left, right })
 	self:UpdateBackdropLayout()
 	self:UpdateBarLayout()
-end 
+end
 
 Tooltip.SetStatusBarOffset = function(self, barOffset)
 	check(barOffset, 1, "number")
 	self:SetCValue("barOffset", barOffset)
 	self:UpdateBackdropLayout()
 	self:UpdateBarLayout()
-end 
+end
 
 Tooltip.SetStatusBarTexture = function(self, barTexture, barIndex)
 	check(barTexture, 1, "string")
 	check(barIndex, 2, "number", "nil")
 
-	if barIndex then 
+	if barIndex then
 		local bar = self.bars[barIndex]
-		if bar then 
+		if bar then
 			bar:SetStatusBarTexture(barTexture)
-		end 
+		end
 	else
-		for barIndex,bar in ipairs(self.bars) do 
+		for barIndex,bar in ipairs(self.bars) do
 			bar:SetStatusBarTexture(barTexture)
-		end 
-	end 
-end 
+		end
+	end
+end
 
 Tooltip.SetBarHeight = function(self, barHeight, barType)
 	check(barHeight, 1, "number")
 	check(barType, 2, "string", "nil")
-	if barType then 
+	if barType then
 		self:SetCValue("barHeight"..barType, barHeight)
-	else 
+	else
 		self:SetCValue("barHeight", barHeight)
-	end 
+	end
 	self:UpdateBarLayout()
 	self:UpdateBackdropLayout()
-end 
+end
 
 -- Rewritten Tooltip API
 -- *Blizz compatibility and personal additions
@@ -1013,17 +1015,17 @@ end
 Tooltip.SetOwner = function(self, owner, anchor)
 	self:Hide()
 	self:ClearAllPoints()
-	
+
 	self.owner = owner
 	self.anchor = anchor
 end
 
 Tooltip.GetOwner = function(self)
 	return self.owner
-end 
+end
 
 Tooltip.SetDefaultAnchor = function(self, parent)
-	-- Keyword parse the owner frame, to allow tooltips to use our custom crames. 
+	-- Keyword parse the owner frame, to allow tooltips to use our custom crames.
 	self:SetOwner(LibTooltip:GetFrame(parent), "ANCHOR_NONE")
 
 	-- Notify other listeners the tooltip is now in default position
@@ -1031,61 +1033,61 @@ Tooltip.SetDefaultAnchor = function(self, parent)
 
 	-- Update position
 	self:UpdatePosition()
-end 
+end
 
 Tooltip.SetSmartAnchor = function(self, parent, offsetX, offsetY)
 
-	-- Keyword parse the owner frame, to allow tooltips to use our custom frames. 
+	-- Keyword parse the owner frame, to allow tooltips to use our custom frames.
 	self:SetOwner(LibTooltip:GetFrame(parent), "ANCHOR_NONE")
 
 	local width, height = UIParent:GetSize()
 	local left = parent:GetLeft()
 	local right = width - parent:GetRight()
-	local bottom = parent:GetBottom() 
+	local bottom = parent:GetBottom()
 	local top = height - parent:GetTop()
-	local point = ((bottom < top) and "BOTTOM" or "TOP") .. ((left < right) and "LEFT" or "RIGHT") 
-	local rPoint = ((bottom < top) and "TOP" or "BOTTOM") .. ((left < right) and "RIGHT" or "LEFT") 
-	
+	local point = ((bottom < top) and "BOTTOM" or "TOP") .. ((left < right) and "LEFT" or "RIGHT")
+	local rPoint = ((bottom < top) and "TOP" or "BOTTOM") .. ((left < right) and "RIGHT" or "LEFT")
+
 	offsetX = (offsetX or 10) * ((left < right) and 1 or -1)
 	offsetY = (offsetY or 10) * ((bottom < top) and 1 or -1)
 
 	self:Place(point, parent, rPoint, offsetX, offsetY)
-end 
+end
 
 Tooltip.SetSmartVerticalAnchor = function(self, parent, offsetY)
 
-	-- Keyword parse the owner frame, to allow tooltips to use our custom frames. 
+	-- Keyword parse the owner frame, to allow tooltips to use our custom frames.
 	self:SetOwner(LibTooltip:GetFrame(parent), "ANCHOR_NONE")
 
 	local width, height = UIParent:GetSize()
-	local bottom = parent:GetBottom() 
+	local bottom = parent:GetBottom()
 	local top = height - parent:GetTop()
 	local point = ((bottom < top) and "BOTTOM" or "TOP")
 	local rPoint = ((bottom < top) and "TOP" or "BOTTOM")
-	
+
 	offsetY = (offsetY or 10) * ((bottom < top) and 1 or -1)
 
 	self:Place(point, parent, rPoint, 0, offsetY)
-end 
+end
 
 Tooltip.SetSmartItemAnchor = function(self, parent, offsetX, offsetY)
 
-	-- Keyword parse the owner frame, to allow tooltips to use our custom frames. 
+	-- Keyword parse the owner frame, to allow tooltips to use our custom frames.
 	self:SetOwner(LibTooltip:GetFrame(parent), "ANCHOR_NONE")
 
 	local width, height = UIParent:GetSize()
 	local left = parent:GetLeft()
 	local right = width - parent:GetRight()
-	local bottom = parent:GetBottom() 
+	local bottom = parent:GetBottom()
 	local top = height - parent:GetTop()
-	local point = ((bottom < top) and "BOTTOM" or "TOP") .. ((left < right) and "LEFT" or "RIGHT") 
-	local rPoint = ((bottom < top) and "BOTTOM" or "TOP") .. ((left < right) and "RIGHT" or "LEFT") 
-	
+	local point = ((bottom < top) and "BOTTOM" or "TOP") .. ((left < right) and "LEFT" or "RIGHT")
+	local rPoint = ((bottom < top) and "BOTTOM" or "TOP") .. ((left < right) and "RIGHT" or "LEFT")
+
 	offsetX = (offsetX or 10) * ((left < right) and 1 or -1)
 	offsetY = (offsetY or 10) * ((bottom < top) and 1 or -1)
 
 	self:Place(point, parent, rPoint, offsetX, offsetY)
-end 
+end
 
 Tooltip.SetAction = function(self, slot)
 	if (not self.owner) then
@@ -1094,68 +1096,68 @@ Tooltip.SetAction = function(self, slot)
 	end
 
 	-- Switch to item function if the action is an item
-	if (self:IsActionItem(slot)) then 
+	if (self:IsActionItem(slot)) then
 		return self:SetActionItem(slot)
-	end 
+	end
 
 	-- Continue normally if it's a normal character action
 	local data = self:GetTooltipDataForAction(slot, self.data)
-	if data then 
+	if data then
 
 		-- Because a millionth of a second matters.
 		local colors = self.colors
 
-		-- Shouldn't be any bars here, but if for some reason 
-		-- the tooltip wasn't properly hidden before this, 
+		-- Shouldn't be any bars here, but if for some reason
+		-- the tooltip wasn't properly hidden before this,
 		-- we make sure the bars are reset!
 		self:ClearStatusBars(true) -- suppress layout updates
 
 		-- Action Title
-		if data.schoolType then 
+		if data.schoolType then
 			self:AddDoubleLine(data.name, data.schoolType, colors.title[1], colors.title[2], colors.title[3], colors.quest.gray[1], colors.quest.gray[2], colors.quest.gray[3], true, true)
-		else 
+		else
 			self:AddLine(data.name, colors.title[1], colors.title[2], colors.title[3], true)
-		end 
+		end
 
-		if data.isAutoAttack then 
-			if (data.attackSpeed) then 
+		if data.isAutoAttack then
+			if (data.attackSpeed) then
 				self:AddLine(INVTYPE_WEAPONMAINHAND, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], true)
 				self:AddDoubleLine(string_format(DAMAGE_TEMPLATE, data.attackMinDamage, data.attackMaxDamage), STAT_SPEED .. " " .. data.attackSpeed, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], true, true)
 				self:AddLine(string_format(DPS_TEMPLATE, data.attackDPS), colors.quest.green[1], colors.quest.green[2], colors.quest.green[3])
-			end 
-			if (data.attackDPSOffHand) then 
+			end
+			if (data.attackDPSOffHand) then
 				self:AddLine(" ")
 				self:AddLine(INVTYPE_WEAPONOFFHAND, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], true)
 				self:AddDoubleLine(string_format(DAMAGE_TEMPLATE, data.attackMinDamageOffHand, data.attackMaxDamageOffHand), STAT_SPEED .. " " .. data.attackSpeedOffHand, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], true, true)
 				self:AddLine(string_format(DPS_TEMPLATE, data.attackDPSOffHand), colors.quest.green[1], colors.quest.green[2], colors.quest.green[3])
-			end 
-		end 
+			end
+		end
 
 		-- Cost and range
-		if (data.spellCost or data.spellRange) then 
-			if (data.spellRange and data.spellCost) then 
+		if (data.spellCost or data.spellRange) then
+			if (data.spellRange and data.spellCost) then
 				self:AddDoubleLine(data.spellCost, data.spellRange, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], true, true)
 
-			elseif data.spellRange then 
+			elseif data.spellRange then
 				self:AddLine(data.spellRange, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], true)
 
-			elseif data.spellCost then 
+			elseif data.spellCost then
 				self:AddLine(data.spellCost, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], true)
-			end 
-		end 
+			end
+		end
 
-		-- Time and Cooldown 
-		if (data.castTime or data.cooldownTime) then 
-			if (data.castTime and data.cooldownTime) then 
+		-- Time and Cooldown
+		if (data.castTime or data.cooldownTime) then
+			if (data.castTime and data.cooldownTime) then
 				self:AddDoubleLine(data.castTime, data.cooldownTime, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
 
-			elseif data.cooldownTime then 
+			elseif data.cooldownTime then
 				self:AddDoubleLine(data.cooldownTime, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
 
-			elseif data.castTime then 
+			elseif data.castTime then
 				self:AddLine(data.castTime, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
-			end 
-		end 
+			end
+		end
 
 		-- Cooldown remaining. Check for charges first.
 		if (data.charges and data.maxCharges and (data.charges > 0) and (data.charges < data.maxCharges)) then
@@ -1163,25 +1165,25 @@ Tooltip.SetAction = function(self, slot)
 			local msg = string_format(SPELL_RECHARGE_TIME, string_format(formatTime(data.chargeDuration - (GetTime() - data.chargeStart))))
 			self:AddLine(msg, colors.normal[1], colors.normal[2], colors.normal[3])
 
-		elseif (data.cooldownEnable and (data.cooldownEnable ~= 0) and (data.cooldownStart > 0) and (data.cooldownDuration > 0)) then 
-			
+		elseif (data.cooldownEnable and (data.cooldownEnable ~= 0) and (data.cooldownStart > 0) and (data.cooldownDuration > 0)) then
+
 			local msg = string_format(ITEM_COOLDOWN_TIME, string_format(formatTime(data.cooldownDuration - (GetTime() - data.cooldownStart))))
 			self:AddLine(msg, colors.normal[1], colors.normal[2], colors.normal[3])
-			
-		end 
+
+		end
 
 		-- Description
-		if data.unmetRequirement then 
+		if data.unmetRequirement then
 			self:AddLine(data.unmetRequirement, colors.quest.red[1], colors.quest.red[2], colors.quest.red[3], true)
-		end 
+		end
 
-		if data.description then 
+		if data.description then
 			self:AddLine(data.description, colors.quest.green[1], colors.quest.green[2], colors.quest.green[3], true)
-		end 
+		end
 
 		self:Show()
-	end 
-end 
+	end
+end
 
 -- General method to add item info based on data table.
 -- As items can be part of multiple tooltip types, we use this for all of them.
@@ -1192,15 +1194,15 @@ local SetItemInfo = function(self, data, useSimplified)
 	local offwhiteR, offwhiteG, offwhiteB = colors.offwhite[1], colors.offwhite[2], colors.offwhite[3]
 
 	-- User settings
-	local colorNameAsSpell = self.colorNameAsSpellWithUse and data.itemHasUseEffect 
+	local colorNameAsSpell = self.colorNameAsSpellWithUse and data.itemHasUseEffect
 	local skipItemLevel = self.hideItemLevelWithUse and data.itemHasUseEffect
 	local skipStats = self.hideStatsWithUseEffect and data.itemHasUseEffect
 	local skipBinds = self.hideBindsWithUseEffect and data.itemHasUseEffect
 	local skipUnique = self.hideUniqueWithUseEffect and data.itemHasUseEffect
 	local skipEquipAndType = self.hideEquipTypeWithUseEffect and data.itemHasUseEffect
 
-	-- Shouldn't be any bars here, but if for some reason 
-	-- the tooltip wasn't properly hidden before this, 
+	-- Shouldn't be any bars here, but if for some reason
+	-- the tooltip wasn't properly hidden before this,
 	-- we make sure the bars are reset!
 	self:ClearStatusBars(true) -- suppress layout updates
 
@@ -1211,13 +1213,20 @@ local SetItemInfo = function(self, data, useSimplified)
 	end
 
 	-- item name and item level on top
-	if (data.itemLevel) and (not skipItemLevel) and (data.itemLevel > 1) then 
-		self:AddDoubleLine(displayName, data.itemLevel, colors.quality[data.itemRarity][1], colors.quality[data.itemRarity][2], colors.quality[data.itemRarity][3], colors.normal[1], colors.normal[2], colors.normal[3], true)
-	elseif colorNameAsSpell then 
+	-- *sometimes the itemRarity isn't passed(?)
+	local r, g, b
+	if (data.itemRarity) and (colors.quality[data.itemRarity]) then
+		r, g, b = colors.quality[data.itemRarity][1], colors.quality[data.itemRarity][2], colors.quality[data.itemRarity][3]
+	else
+		r, g, b = colors.quality[1][1], colors.quality[1][2], colors.quality[1][3]
+	end
+	if (data.itemLevel) and (not skipItemLevel) and (data.itemLevel > 1) then
+		self:AddDoubleLine(displayName, data.itemLevel, r, g, b, colors.normal[1], colors.normal[2], colors.normal[3], true)
+	elseif colorNameAsSpell then
 		self:AddLine(displayName, colors.title[1], colors.title[2], colors.title[3], true)
-	else 
-		self:AddLine(displayName, colors.quality[data.itemRarity][1], colors.quality[data.itemRarity][2], colors.quality[data.itemRarity][3], true)
-	end 
+	else
+		self:AddLine(displayName, r, g, b, true)
+	end
 
 	-- itemID
 	if (data.itemID) and (not self.hideItemID) and (IsShiftKeyDown()) then
@@ -1228,164 +1237,164 @@ local SetItemInfo = function(self, data, useSimplified)
 
 	-- item bind status
 	if (not skipBinds) then
-		if (data.itemIsBound) then 
+		if (data.itemIsBound) then
 			self:AddLine(data.itemBind, offwhiteR, offwhiteG, offwhiteB)
 		elseif (data.itemCanBind) then
 			self:AddLine(data.itemBind, offwhiteR, offwhiteG, offwhiteB)
-		end 
+		end
 	end
 
 	-- item unique status
-	if (data.itemIsUnique) and (not skipUnique) then 
+	if (data.itemIsUnique) and (not skipUnique) then
 		self:AddLine(data.itemUnique, offwhiteR, offwhiteG, offwhiteB)
-	end 
+	end
 
 	-- item equip location and type
-	if (not skipEquipAndType) then 
-		if (data.itemEquipLoc and (data.itemEquipLoc ~= "")) then 
+	if (not skipEquipAndType) then
+		if (data.itemEquipLoc and (data.itemEquipLoc ~= "")) then
 			local itemType
-			if data.itemType then 
-				if data.itemEquipLoc ~= "INVTYPE_TRINKET" and data.itemEquipLoc ~= "INVTYPE_FINGER" and data.itemEquipLoc ~= "INVTYPE_NECK" then 
+			if data.itemType then
+				if data.itemEquipLoc ~= "INVTYPE_TRINKET" and data.itemEquipLoc ~= "INVTYPE_FINGER" and data.itemEquipLoc ~= "INVTYPE_NECK" then
 					itemType = data.itemSubType or data.itemType
-				end 
-			end 
+				end
+			end
 			if (itemType) then
 				self:AddDoubleLine(_G[data.itemEquipLoc], itemType, offwhiteR, offwhiteG, offwhiteB, offwhiteR, offwhiteG, offwhiteB)
-			else 
+			else
 				self:AddLine(_G[data.itemEquipLoc], offwhiteR, offwhiteG, offwhiteB)
-			end 
-		
-		elseif (data.itemType or data.itemSubType) then 
+			end
 
-			if (data.itemClassID == LE_ITEM_CLASS_MISCELLANEOUS) then 
+		elseif (data.itemType or data.itemSubType) then
+
+			if (data.itemClassID == LE_ITEM_CLASS_MISCELLANEOUS) then
 				-- This includes hearthstones, flight master's whistle and similar
 
 			elseif (data.itemClassID == LE_ITEM_MISCELLANEOUS_OTHER) then
 
-			elseif (data.itemClassID == LE_ITEM_CLASS_CONSUMABLE) then 
+			elseif (data.itemClassID == LE_ITEM_CLASS_CONSUMABLE) then
 
 				-- Subtypes usually do not have any constants to reference them by.
 				-- Source: https://wow.gamepedia.com/ItemType
-				if (data.itemSubClassID == 8) then 
+				if (data.itemSubClassID == 8) then
 					-- "Other", used for conservatory seeds in shadowlands
 
 				else
 					-- Food, drink, flasks, etc
 					self:AddLine(data.itemSubType or data.itemType, offwhiteR, offwhiteG, offwhiteB)
 				end
-			
-			else 
+
+			else
 				self:AddLine(data.itemSubType or data.itemType, offwhiteR, offwhiteG, offwhiteB)
-			end 
-		end 
-	end 
+			end
+		end
+	end
 
-	if (not skipStats) then 
+	if (not skipStats) then
 
 		-- damage and speed
-		if (data.itemDamageMin and data.itemDamageMax) then 
-			if data.itemSpeed then 
+		if (data.itemDamageMin and data.itemDamageMax) then
+			if data.itemSpeed then
 				self:AddDoubleLine(string_format(DAMAGE_TEMPLATE, math_floor(data.itemDamageMin), math_floor(data.itemDamageMax)), string_format("%s %s", ITEM_MOD_CR_SPEED_SHORT, data.itemSpeed), colors.highlight[1], colors.highlight[2], colors.highlight[3], offwhiteR, offwhiteG, offwhiteB)
-				
-			else 
+
+			else
 				self:AddLine(string_format(DAMAGE_TEMPLATE, math_floor(data.itemDamageMin), math_floor(data.itemDamageMax)), colors.highlight[1], colors.highlight[2], colors.highlight[3])
-			end 
-		end 
+			end
+		end
 
 		-- damage pr second
-		if data.itemDPS then 
+		if data.itemDPS then
 			self:AddLine(string_format(DPS_TEMPLATE, string_format("%.1f", data.itemDPS+.05)), colors.highlight[1], colors.highlight[2], colors.highlight[3])
-		end 
+		end
+
+		local statR, statG, statB = colors.quest.green[1], colors.quest.green[2], colors.quest.green[3]
 
-		local statR, statG, statB = colors.quest.green[1], colors.quest.green[2], colors.quest.green[3] 
-		
-		-- armor 
-		if (data.itemArmor and (data.itemArmor ~= 0)) then 
+		-- armor
+		if (data.itemArmor and (data.itemArmor ~= 0)) then
 			self:AddLine(string_format("%s %s", (data.itemArmor > 0) and ("+"..tostring(data.itemArmor)) or tostring(data.itemArmor), RESISTANCE0_NAME), offwhiteR, offwhiteG, offwhiteB)
-		end 
-		
-		-- block 
-		if data.itemBlock and (data.itemBlock ~= 0) then 
+		end
+
+		-- block
+		if data.itemBlock and (data.itemBlock ~= 0) then
 			self:AddLine(string_format("%s %s", (data.itemBlock > 0) and ("+"..tostring(data.itemBlock)) or tostring(data.itemBlock), ITEM_MOD_BLOCK_RATING_SHORT), offwhiteR, offwhiteG, offwhiteB)
-		end 
+		end
 
 		-- parry?
 
 		-- primary stat
 		if (IsRetail) then
-			if data.primaryStatValue and (data.primaryStatValue ~= 0) then 
+			if data.primaryStatValue and (data.primaryStatValue ~= 0) then
 				self:AddLine(string_format("%s %s", (data.primaryStatValue > 0) and ("+"..tostring(data.primaryStatValue)) or tostring(data.primaryStatValue), data.primaryStatID), statR, statG, statB)
-			end 
+			end
 		end
 
 		-- for multiple primary stats. classic thing?
-		if (IsClassic or IsTBC) then
-			if data.primaryStats then 
-				for key,value in pairs(data.primaryStats) do 
+		if (IsClassic or IsTBC or IsWrath) then
+			if data.primaryStats then
+				for key,value in pairs(data.primaryStats) do
 					self:AddLine(string_format("%s %s", (value > 0) and ("+"..tostring(value)) or tostring(value), _G[key]), statR, statG, statB)
-				end 
-			end 
+				end
+			end
 		end
 
 		-- stamina
-		if data.itemStamina and (data.itemStamina ~= 0) then 
+		if data.itemStamina and (data.itemStamina ~= 0) then
 			self:AddLine(string_format("%s %s", (data.itemStamina > 0) and ("+"..tostring(data.itemStamina)) or tostring(data.itemStamina), ITEM_MOD_STAMINA_SHORT), statR, statG, statB)
 
-		end 
+		end
 
 		-- secondary stats
-		if data.sorted2ndStats then 
-			for _,stat in ipairs(data.sorted2ndStats) do 
+		if data.sorted2ndStats then
+			for _,stat in ipairs(data.sorted2ndStats) do
 				self:AddLine(stat, colors.quest.green[1], colors.quest.green[2], colors.quest.green[3])
-			end 
-		end 
+			end
+		end
 
 		-- no benefit stats
 		if (IsRetail) then
-			if data.primaryStats then 
-				for key,value in pairs(data.primaryStats) do 
+			if data.primaryStats then
+				for key,value in pairs(data.primaryStats) do
 					if (key ~= data.primaryStatKey) then
 						self:AddLine(string_format("%s %s", (value > 0) and ("+"..tostring(value)) or tostring(value), _G[key]), colors.quest.gray[1], colors.quest.gray[2], colors.quest.gray[3])
 					end
-				end 
-			end 
+				end
+			end
 		end
 
-		--if data.uselessStats then 
-		--	for key,value in pairs(data.uselessStats) do 
+		--if data.uselessStats then
+		--	for key,value in pairs(data.uselessStats) do
 		--		self:AddLine(string_format("%s %s", (value > 0) and ("+"..tostring(value)) or tostring(value), _G[key]), colors.quest.gray[1], colors.--quest.gray[2], colors.quest.gray[3])
-		--	end 
-		--end 
+		--	end
+		--end
 
 	end
 
 	-- use effect
-	if data.itemHasUseEffect then 
+	if data.itemHasUseEffect then
 		--if (not useSimplified) and ((data.itemHasEquipEffect or data.itemDescription) or (self:GetNumLines() > 3)) then
 		--	self:AddLine(" ")
 		--end
 		self:AddLine(data.itemUseEffect, colors.quest.green[1], colors.quest.green[2], colors.quest.green[3], true)
-	end 
+	end
 
 	-- equip effect(s)
-	if data.itemHasEquipEffect then 
+	if data.itemHasEquipEffect then
 		--if (not useSimplified) and (data.itemDescription or (self:GetNumLines() > 3)) then
 		--	self:AddLine(" ")
 		--end
-		for _,stat in ipairs(data.itemEquipEffects) do 
+		for _,stat in ipairs(data.itemEquipEffects) do
 			self:AddLine(stat, colors.quest.green[1], colors.quest.green[2], colors.quest.green[3], true)
-		end 
-	end 
+		end
+	end
 
 	-- description
 	if (data.itemDescription) and (not useSimplified) then
 		--if (not useSimplified) and (self:GetNumLines() > 3) then
 		--	self:AddLine(" ")
 		--end
-		for _,msg in ipairs(data.itemDescription) do 
+		for _,msg in ipairs(data.itemDescription) do
 			--self:AddLine(msg, colors.quest.green[1], colors.quest.green[2], colors.quest.green[3], true)
 			self:AddLine(msg, colors.quest.yellow[1], colors.quest.yellow[2], colors.quest.yellow[3], true)
-		end 
+		end
 	end
 
 	-- click action for books, chests, etc.
@@ -1394,7 +1403,7 @@ local SetItemInfo = function(self, data, useSimplified)
 	end
 
 	-- durability
-	if (data.itemDurability) and (not useSimplified) then 
+	if (data.itemDurability) and (not useSimplified) then
 		self:AddLine(string_format(DURABILITY_TEMPLATE, data.itemDurability, data.itemDurabilityMax), offwhiteR, offwhiteG, offwhiteB)
 	end
 
@@ -1402,22 +1411,22 @@ local SetItemInfo = function(self, data, useSimplified)
 	if (InRepairMode()) and ((data.repairCost) and (data.repairCost > 0)) then
 		local money = data.repairCost
 		local moneyString
-		if (self.coinStringGold) and (self.coinStringSilver) and (self.coinStringCopper) then 
+		if (self.coinStringGold) and (self.coinStringSilver) and (self.coinStringCopper) then
 
 			local gold = math_floor(money / (100 * 100))
-			if (gold > 0) then 
+			if (gold > 0) then
 				moneyString = string_format("%d%s", gold, self.coinStringGold)
 			end
 
 			local silver = math_floor((money - (gold * 100 * 100)) / 100)
-			if (silver > 0) then 
+			if (silver > 0) then
 				moneyString = (moneyString and moneyString.." " or "") .. string_format("%d%s", silver, self.coinStringSilver)
 			end
 
 			local copper = math_mod(money, 100)
-			if (copper > 0) then 
+			if (copper > 0) then
 				moneyString = (moneyString and moneyString.." " or "") .. string_format("%d%s", copper, self.coinStringCopper)
-			end 
+			end
 		else
 			moneyString = GetMoneyString(money, false)
 		end
@@ -1431,25 +1440,25 @@ local SetItemInfo = function(self, data, useSimplified)
 		end
 	else
 		-- Sell value. Only shown on garbage, or for all sellable items when at a merchant.
-		if (data.itemSellPrice) and (data.itemCount) and ((data.itemRarity == 0) or (MerchantFrame:IsShown()) or (IsShiftKeyDown())) then 
+		if (data.itemSellPrice) and (data.itemCount) and ((data.itemRarity == 0) or (MerchantFrame:IsShown()) or (IsShiftKeyDown())) then
 			local money = data.itemSellPrice * data.itemCount
 			local moneyString
-			if (self.coinStringGold) and (self.coinStringSilver) and (self.coinStringCopper) then 
+			if (self.coinStringGold) and (self.coinStringSilver) and (self.coinStringCopper) then
 
 				local gold = math_floor(money / (100 * 100))
-				if (gold > 0) then 
+				if (gold > 0) then
 					moneyString = string_format("%d%s", gold, self.coinStringGold)
 				end
 
 				local silver = math_floor((money - (gold * 100 * 100)) / 100)
-				if (silver > 0) then 
+				if (silver > 0) then
 					moneyString = (moneyString and moneyString.." " or "") .. string_format("%d%s", silver, self.coinStringSilver)
 				end
 
 				local copper = math_mod(money, 100)
-				if (copper > 0) then 
+				if (copper > 0) then
 					moneyString = (moneyString and moneyString.." " or "") .. string_format("%d%s", copper, self.coinStringCopper)
-				end 
+				end
 			else
 				moneyString = GetMoneyString(money, false)
 			end
@@ -1473,12 +1482,12 @@ Tooltip.SetActionItem = function(self, slot)
 		return
 	end
 	local data = self:GetTooltipDataForActionItem(slot, self.data)
-	if data then 
+	if data then
 
 		SetItemInfo(self, data, true) -- simplify the display on actionbuttons.
 
 		self:Show()
-	end 
+	end
 end
 
 Tooltip.SetPetAction = function(self, slot)
@@ -1487,48 +1496,48 @@ Tooltip.SetPetAction = function(self, slot)
 		return
 	end
 	local data = self:GetTooltipDataForPetAction(slot, self.data)
-	if data then 
+	if data then
 
 		-- Because a millionth of a second matters.
 		local colors = self.colors
 
-		-- Shouldn't be any bars here, but if for some reason 
-		-- the tooltip wasn't properly hidden before this, 
+		-- Shouldn't be any bars here, but if for some reason
+		-- the tooltip wasn't properly hidden before this,
 		-- we make sure the bars are reset!
 		self:ClearStatusBars(true) -- suppress layout updates
 
 		-- Action Title
-		if data.schoolType then 
+		if data.schoolType then
 			self:AddDoubleLine(data.name, data.schoolType, colors.title[1], colors.title[2], colors.title[3], colors.quest.gray[1], colors.quest.gray[2], colors.quest.gray[3], true, true)
-		else 
+		else
 			self:AddLine(data.name, colors.title[1], colors.title[2], colors.title[3], true)
-		end 
+		end
 
 		-- Cost and range
-		if (data.spellCost or data.spellRange) then 
-			if (data.spellRange and data.spellCost) then 
+		if (data.spellCost or data.spellRange) then
+			if (data.spellRange and data.spellCost) then
 				self:AddDoubleLine(data.spellCost, data.spellRange, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], true, true)
 
-			elseif data.spellRange then 
+			elseif data.spellRange then
 				self:AddLine(data.spellRange, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], true)
 
-			elseif data.spellCost then 
+			elseif data.spellCost then
 				self:AddLine(data.spellCost, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], true, true)
-			end 
-		end 
+			end
+		end
 
-		-- Time and Cooldown 
-		if (data.castTime or data.cooldownTime) then 
-			if (data.castTime and data.cooldownTime) then 
+		-- Time and Cooldown
+		if (data.castTime or data.cooldownTime) then
+			if (data.castTime and data.cooldownTime) then
 				self:AddDoubleLine(data.castTime, data.cooldownTime, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
 
-			elseif data.cooldownTime then 
+			elseif data.cooldownTime then
 				self:AddDoubleLine(data.cooldownTime, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
 
-			elseif data.castTime then 
+			elseif data.castTime then
 				self:AddLine(data.castTime, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
-			end 
-		end 
+			end
+		end
 
 		-- Cooldown remaining. Check for charges first.
 		if (data.charges and data.maxCharges and (data.charges > 0) and (data.charges < data.maxCharges)) then
@@ -1536,23 +1545,23 @@ Tooltip.SetPetAction = function(self, slot)
 			local msg = string_format(SPELL_RECHARGE_TIME, string_format(formatTime(data.chargeDuration - (GetTime() - data.chargeStart))))
 			self:AddLine(msg, colors.normal[1], colors.normal[2], colors.normal[3])
 
-		elseif (data.cooldownEnable and (data.cooldownEnable ~= 0) and (data.cooldownStart > 0) and (data.cooldownDuration > 0)) then 
-			
+		elseif (data.cooldownEnable and (data.cooldownEnable ~= 0) and (data.cooldownStart > 0) and (data.cooldownDuration > 0)) then
+
 			local msg = string_format(ITEM_COOLDOWN_TIME, string_format(formatTime(data.cooldownDuration - (GetTime() - data.cooldownStart))))
 			self:AddLine(msg, colors.normal[1], colors.normal[2], colors.normal[3])
-			
-		end 
+
+		end
 
 		-- Description
-		if data.description then 
+		if data.description then
 			self:AddLine(data.description, colors.quest.green[1], colors.quest.green[2], colors.quest.green[3], true)
-		end 
+		end
 
 		self:Show()
-	end 
+	end
 end
 
--- Allow data table to be passed instead of created, 
+-- Allow data table to be passed instead of created,
 -- to allow tooltip building based on stored caches.
 -- This is to avoid double calls in cases such as bags
 -- where much info is retrieved through the scanner back-end.
@@ -1565,31 +1574,31 @@ Tooltip.SetBagItem = function(self, bagID, slotID, data)
 	if (data) then
 
 		SetItemInfo(self, data, false) -- don't simplify in bags, we want more info here.
-		
+
 		self:Show()
 
 		-- Mimic the blizz return values here.
-		return 	data.hasCooldown, 
-				data.repairCost, 
-				data.speciesID, 
-				data.level, 
-				data.breedQuality, 
-				data.maxHealth, 
-				data.power, 
-				data.speed, 
+		return 	data.hasCooldown,
+				data.repairCost,
+				data.speciesID,
+				data.level,
+				data.breedQuality,
+				data.maxHealth,
+				data.power,
+				data.speed,
 				data.name
 
 	end
 end
 
 Tooltip.SetItem = function(self, item)
-end 
+end
 
 Tooltip.SetItemID = function(self, itemID)
-end 
+end
 
 Tooltip.SetItemLink = function(self, itemLink)
-end 
+end
 
 Tooltip.SetUnit = function(self, unit)
 	if (not self.owner) then
@@ -1598,21 +1607,21 @@ Tooltip.SetUnit = function(self, unit)
 	end
 	self.unit = unit
 	local unit = self:GetTooltipUnit()
-	if unit then 
+	if unit then
 		local data = self:GetTooltipDataForUnit(unit, self.data)
-		if data then 
+		if data then
 
 			-- Because a millionth of a second matters.
 			local colors = self.colors
 
-			-- Shouldn't be any bars here, but if for some reason 
-			-- the tooltip wasn't properly hidden before this, 
+			-- Shouldn't be any bars here, but if for some reason
+			-- the tooltip wasn't properly hidden before this,
 			-- we make sure the bars are reset!
 			self:ClearStatusBars(true) -- suppress layout updates
 
 			-- Add our health and power bars
-			-- These will be automatically updated thanks to 
-			-- their provided barTypes here. 
+			-- These will be automatically updated thanks to
+			-- their provided barTypes here.
 			if (self.showHealthBar) then
 				self:AddBar("health")
 			end
@@ -1621,12 +1630,12 @@ Tooltip.SetUnit = function(self, unit)
 			end
 
 			-- Add unit data
-			-- *Add support for totalRP3 if it's enabled? 
+			-- *Add support for totalRP3 if it's enabled?
 
-			-- name 
+			-- name
 			local displayName = data.name
-			if data.isPlayer then 
-				if (data.showPvPFactionWithName) then 
+			if data.isPlayer then
+				if (data.showPvPFactionWithName) then
 					if data.isFFA then
 						displayName = FFA_TEXTURE .. " " .. displayName
 					elseif (data.isPVP and data.englishFaction) then
@@ -1635,120 +1644,120 @@ Tooltip.SetUnit = function(self, unit)
 						elseif (data.englishFaction == "Alliance") then
 							displayName = FACTION_ALLIANCE_TEXTURE .. " " .. displayName
 						elseif (data.englishFaction == "Neutral") then
-							-- They changed this to their new atlas garbage in Legion, 
+							-- They changed this to their new atlas garbage in Legion,
 							-- so for the sake of simplicty we'll just use the FFA PvP icon instead. Works.
 							displayName = FFA_TEXTURE .. " " .. displayName
 						end
 					end
 				end
-				if (data.pvpRankName) then 
+				if (data.pvpRankName) then
 					displayName = displayName .. colors.quest.gray.colorCode.. " (" .. data.pvpRankName .. ")|r"
 				end
-			else 
+			else
 				if data.isBoss then
 					displayName = BOSS_TEXTURE .. " " .. displayName
 				elseif (data.classification == "rare") or (data.classification == "rareelite") then
 					displayName = displayName .. colors.quality[3].colorCode .. " (" .. ITEM_QUALITY3_DESC .. ")|r"
-				elseif (data.classification == "elite") then 
+				elseif (data.classification == "elite") then
 					displayName = displayName .. colors.title.colorCode .. " (" .. ELITE .. ")|r"
 				end
 			end
 
 			local levelText
-			if (data.effectiveLevel and (data.effectiveLevel > 0)) then 
+			if (data.effectiveLevel and (data.effectiveLevel > 0)) then
 				local r, g, b, colorCode = self:GetDifficultyColorByLevel(data.effectiveLevel)
 				levelText = colorCode .. data.effectiveLevel .. "|r"
 			end
 
 			if (data.isPlayer) and (not levelText) then
 				displayName = BOSS_TEXTURE .. " " .. displayName
-			end 
+			end
 
 			local r, g, b = self:GetUnitHealthColor(unit)
-			if levelText then 
-				if self.showLevelWithName then 
+			if levelText then
+				if self.showLevelWithName then
 					self:AddLine(levelText .. colors.quest.gray.colorCode .. ": |r" .. displayName, r, g, b, true)
-				else 
+				else
 					self:AddDoubleLine(displayName, levelText, r, g, b, nil, nil, nil, true)
-				end 
+				end
 			else
 				self:AddLine(displayName, r, g, b, true)
-			end 
+			end
 
 			-- Players
-			if data.isPlayer then 
-				if data.isDead then 
+			if data.isPlayer then
+				if data.isDead then
 					self:AddLine(data.isGhost and DEAD or CORPSE, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
-				else 
-					if data.guild then 
+				else
+					if data.guild then
 						self:AddLine("<"..data.guild..">", colors.title[1], colors.title[2], colors.title[3])
-					end  
+					end
 
 					local levelLine
 
-					if data.raceDisplayName then 
+					if data.raceDisplayName then
 						levelLine = (levelLine and levelLine.." " or "") .. data.raceDisplayName
-					end 
+					end
 
-					if (data.classDisplayName and data.class) then 
-						if self.colorClass then 
+					if (data.classDisplayName and data.class) then
+						if self.colorClass then
 							levelLine = (levelLine and levelLine.." " or "") .. colors.class[data.class].colorCode .. data.classDisplayName .. "|r"
-						else 
+						else
 							levelLine = (levelLine and levelLine.." " or "") .. data.classDisplayName
-						end 
-					end 
+						end
+					end
 
-					if levelLine then 
+					if levelLine then
 						self:AddLine(levelLine, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
-					end 
+					end
 
 					-- player faction (Horde/Alliance/Neutral)
-					if data.localizedFaction then 
+					if data.localizedFaction then
 						self:AddLine(data.localizedFaction, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
-					end 
+					end
 				end
 
 			-- All other NPCs
-			else 
+			else
 
-				if data.isDead then 
+				if data.isDead then
 					self:AddLine(data.isGhost and DEAD or CORPSE, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
 
-					if (data.isSkinnable) then 
+					if (data.isSkinnable) then
 						self:AddLine(data.skinnableMsg, data.skinnableColor[1], data.skinnableColor[2], data.skinnableColor[3])
 					end
-				else 
+				else
 					-- titles
-					if data.title then 
+					if data.title then
 						self:AddLine("<"..data.title..">", colors.normal[1], colors.normal[2], colors.normal[3], true)
-					end 
+					end
 
-					if data.city then 
+					if data.city then
 						self:AddLine(data.city, colors.title[1], colors.title[2], colors.title[3])
-					end 
+					end
 
-					-- Beast etc 
-					if data.creatureFamily then 
+					-- Beast etc
+					if data.creatureFamily then
 						self:AddLine(data.creatureFamily, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
 
-					-- Humanoid, Crab, etc 
-					elseif data.creatureType then 
+					-- Humanoid, Crab, etc
+					elseif data.creatureType then
 						self:AddLine(data.creatureType, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
-					end 
+					end
 
 					-- player faction (Horde/Alliance/Neutral)
-					if data.localizedFaction then 
+					if data.localizedFaction then
 						self:AddLine(data.localizedFaction, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
-					end 
+					end
 
-					if (data.isCivilian) then 
+					if (data.isCivilian) then
 						self:AddLine(PVP_RANK_CIVILIAN, data.civilianColor[1], data.civilianColor[2], data.civilianColor[3])
 					end
 				end
 
 				if (data.objectives) then
 					for objectiveID, objectiveData in ipairs(data.objectives) do
-	
+
 						-- Do a first iteration to figure out if we have completes.
 						local notComplete
 						for questObjectiveID, questObjectiveData in ipairs(objectiveData.questObjectives) do
@@ -1760,15 +1769,15 @@ Tooltip.SetUnit = function(self, unit)
 						end
 
 						-- Only show incompletes.
-						if (notComplete) then 
+						if (notComplete) then
 
 							self:AddLine(" ")
 							self:AddLine(objectiveData.questTitle, colors.title[1], colors.title[2], colors.title[3])
-		
+
 							for questObjectiveID, questObjectiveData in ipairs(objectiveData.questObjectives) do
 								local objectiveType = questObjectiveData.objectiveType
-	
-	
+
+
 								-- Use coloring for unfinished quests.
 								if (objectiveType == "incomplete") then
 									self:AddLine(questObjectiveData.objectiveText, colors.quest.gray[1], colors.quest.gray[2], colors.quest.gray[3])
@@ -1782,11 +1791,11 @@ Tooltip.SetUnit = function(self, unit)
 								end
 							end
 						end
-						
+
 					end
 				end
 
-			end 
+			end
 
 			if (data.realm) then
 				-- FRIENDS_LIST_REALM -- "Realm: "
@@ -1794,29 +1803,29 @@ Tooltip.SetUnit = function(self, unit)
 				self:AddLine(FRIENDS_LIST_REALM..data.realm, colors.quest.gray[1], colors.quest.gray[2], colors.quest.gray[3])
 			end
 
-			if (data.uiMapID) then 
+			if (data.uiMapID) then
 				local uiMapID = GetBestMapForUnit("player")
-				if (uiMapID ~= data.uiMapID) then 
-					-- Color according to the faction of the tooltip unit's current zone, 
-					-- relative to that zone's standing with the player. 
+				if (uiMapID ~= data.uiMapID) then
+					-- Color according to the faction of the tooltip unit's current zone,
+					-- relative to that zone's standing with the player.
 					local name, pvpType, label = LibZone:GetPvPType(data.uiMapID)
-					if (name) then 
+					if (name) then
 						local color = pvpType and colors.zone[pvpType] or colors.zone.unknown
 						self:AddLine(" ")
 						self:AddLine(LOCATION_COLON, colors.quest.gray[1], colors.quest.gray[2], colors.quest.gray[3])
 						self:AddDoubleLine(name, label, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], color[1], color[2], color[3])
-					end 
+					end
 				end
-			end 
+			end
 
-			if self:UpdateBarValues(unit, true) then 
+			if self:UpdateBarValues(unit, true) then
 				self:UpdateBackdropLayout()
 				self:UpdateBarLayout()
 				self:UpdatePosition()
-			end 
+			end
 			self:Show()
-		end 
-	end 
+		end
+	end
 end
 
 Tooltip.SetSpellByID = function(self, spellID)
@@ -1826,48 +1835,48 @@ Tooltip.SetSpellByID = function(self, spellID)
 	end
 
 	local data = self:GetTooltipDataForSpellID(spellID, self.data)
-	if data then 
+	if data then
 
 		-- Because a millionth of a second matters.
 		local colors = self.colors
 
-		-- Shouldn't be any bars here, but if for some reason 
-		-- the tooltip wasn't properly hidden before this, 
+		-- Shouldn't be any bars here, but if for some reason
+		-- the tooltip wasn't properly hidden before this,
 		-- we make sure the bars are reset!
 		self:ClearStatusBars(true) -- suppress layout updates
 
 		-- Action Title
-		if data.schoolType then 
+		if data.schoolType then
 			self:AddDoubleLine(data.name, data.schoolType, colors.title[1], colors.title[2], colors.title[3], colors.quest.gray[1], colors.quest.gray[2], colors.quest.gray[3], true, true)
-		else 
+		else
 			self:AddLine(data.name, colors.title[1], colors.title[2], colors.title[3], true)
-		end 
+		end
 
 		-- Cost and range
-		if (data.spellCost or data.spellRange) then 
-			if (data.spellRange and data.spellCost) then 
+		if (data.spellCost or data.spellRange) then
+			if (data.spellRange and data.spellCost) then
 				self:AddDoubleLine(data.spellCost, data.spellRange, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], true, true)
 
-			elseif data.spellRange then 
+			elseif data.spellRange then
 				self:AddLine(data.spellRange, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], true)
 
-			elseif data.spellCost then 
+			elseif data.spellCost then
 				self:AddLine(data.spellCost, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], true, true)
-			end 
-		end 
+			end
+		end
 
-		-- Time and Cooldown 
-		if (data.castTime or data.cooldownTime) then 
-			if (data.castTime and data.cooldownTime) then 
+		-- Time and Cooldown
+		if (data.castTime or data.cooldownTime) then
+			if (data.castTime and data.cooldownTime) then
 				self:AddDoubleLine(data.castTime, data.cooldownTime, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3], colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
 
-			elseif data.cooldownTime then 
+			elseif data.cooldownTime then
 				self:AddDoubleLine(data.cooldownTime, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
 
-			elseif data.castTime then 
+			elseif data.castTime then
 				self:AddLine(data.castTime, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
-			end 
-		end 
+			end
+		end
 
 		-- Cooldown remaining. Check for charges first.
 		if (data.charges and data.maxCharges and (data.charges > 0) and (data.charges < data.maxCharges)) then
@@ -1875,17 +1884,17 @@ Tooltip.SetSpellByID = function(self, spellID)
 			local msg = string_format(SPELL_RECHARGE_TIME, string_format(formatTime(data.chargeDuration - (GetTime() - data.chargeStart))))
 			self:AddLine(msg, colors.normal[1], colors.normal[2], colors.normal[3])
 
-		elseif (data.cooldownEnable and (data.cooldownEnable ~= 0) and (data.cooldownStart > 0) and (data.cooldownDuration > 0)) then 
-			
+		elseif (data.cooldownEnable and (data.cooldownEnable ~= 0) and (data.cooldownStart > 0) and (data.cooldownDuration > 0)) then
+
 			local msg = string_format(ITEM_COOLDOWN_TIME, string_format(formatTime(data.cooldownDuration - (GetTime() - data.cooldownStart))))
 			self:AddLine(msg, colors.normal[1], colors.normal[2], colors.normal[3])
-			
-		end 
+
+		end
 
 		-- Description
-		if data.description then 
+		if data.description then
 			self:AddLine(data.description, colors.quest.green[1], colors.quest.green[2], colors.quest.green[3], true)
-		end 
+		end
 
 		self:Show()
 	end
@@ -1896,30 +1905,30 @@ local ShowAuraTooltip = function(self, data)
 	-- Because a millionth of a second matters.
 	local colors = self.colors
 
-	-- Shouldn't be any bars here, but if for some reason 
-	-- the tooltip wasn't properly hidden before this, 
+	-- Shouldn't be any bars here, but if for some reason
+	-- the tooltip wasn't properly hidden before this,
 	-- we make sure the bars are reset!
 	self:ClearStatusBars(true) -- suppress layout updates
 
-	if (data.debuffTypeLabel) then 
+	if (data.debuffTypeLabel) then
 		self:AddDoubleLine(data.name, data.debuffTypeLabel, colors.title[1], colors.title[2], colors.title[3], colors.quest.gray[1], colors.quest.gray[2], colors.quest.gray[3], true, true)
 	else
 		self:AddLine(data.name, colors.title[1], colors.title[2], colors.title[3], true)
-	end 
+	end
 
-	if (data.spellId and (not self.hideSpellID)) and (IsShiftKeyDown()) then 
+	if (data.spellId and (not self.hideSpellID)) and (IsShiftKeyDown()) then
 		-- How to NOT localize. This is just baaaaad!
 		local spellIDText = STAT_CATEGORY_SPELL .. " " .. ID
 		self:AddLine(spellIDText .. ": " .. data.spellId, colors.offwhite[1], colors.offwhite[2], colors.offwhite[3])
-	end 
+	end
 
-	if data.description then 
+	if data.description then
 		self:AddLine(data.description, colors.quest.green[1], colors.quest.green[2], colors.quest.green[3], true)
-	end 
+	end
 
-	if data.timeRemaining then 
+	if data.timeRemaining then
 		self:AddLine(data.timeRemaining, colors.normal[1], colors.normal[2], colors.normal[3], true)
-	end 
+	end
 
 	self:Show()
 
@@ -1932,12 +1941,12 @@ Tooltip.SetUnitAura = function(self, unit, auraID, filter)
 	end
 	self.unit = unit
 	local unit = self:GetTooltipUnit()
-	if unit then 
+	if unit then
 		local data = self:GetTooltipDataForUnitAura(unit, auraID, filter, self.data)
-		if data then 
+		if data then
 			ShowAuraTooltip(self, data)
-		end 
-	end 
+		end
+	end
 end
 
 Tooltip.SetUnitBuff = function(self, unit, buffID, filter)
@@ -1947,12 +1956,12 @@ Tooltip.SetUnitBuff = function(self, unit, buffID, filter)
 	end
 	self.unit = unit
 	local unit = self:GetTooltipUnit()
-	if unit then 
+	if unit then
 		local data = self:GetTooltipDataForUnitBuff(unit, buffID, filter, self.data)
-		if data then 
+		if data then
 			ShowAuraTooltip(self, data)
-		end 
-	end 
+		end
+	end
 end
 
 Tooltip.SetUnitDebuff = function(self, unit, debuffID, filter)
@@ -1962,12 +1971,12 @@ Tooltip.SetUnitDebuff = function(self, unit, debuffID, filter)
 	end
 	self.unit = unit
 	local unit = self:GetTooltipUnit()
-	if unit then 
+	if unit then
 		local data = self:GetTooltipDataForUnitDebuff(unit, debuffID, filter, self.data)
-		if data then 
+		if data then
 			ShowAuraTooltip(self, data)
-		end 
-	end 
+		end
+	end
 end
 
 Tooltip.SetTrackingSpell = function(self)
@@ -1977,45 +1986,45 @@ Tooltip.SetTrackingSpell = function(self)
 	end
 
 	local data = self:GetTooltipDataForTrackingSpell(self.data)
-	if (data and data.name) then 
+	if (data and data.name) then
 
 		-- Because a millionth of a second matters.
 		local colors = self.colors
 
-		-- Shouldn't be any bars here, but if for some reason 
-		-- the tooltip wasn't properly hidden before this, 
+		-- Shouldn't be any bars here, but if for some reason
+		-- the tooltip wasn't properly hidden before this,
 		-- we make sure the bars are reset!
 		self:ClearStatusBars(true) -- suppress layout updates
 
-		if data.name then 
+		if data.name then
 			self:AddLine(data.name, colors.title[1], colors.title[2], colors.title[3], true)
 		end
-		if data.description then 
+		if data.description then
 			self:AddLine(data.description, colors.quest.green[1], colors.quest.green[2], colors.quest.green[3], true)
-		end 
+		end
 
 		self:Show()
 	end
 end
 
--- The same as the old Blizz call is doing. Bad. 
+-- The same as the old Blizz call is doing. Bad.
 Tooltip.GetUnit = function(self)
 	local unit = self.unit
-	if UnitExists(unit) then 
+	if UnitExists(unit) then
 		return UnitName(unit), unit
 	else
 		return nil, unit
-	end 
+	end
 end
 
--- Retrieve the actual unit the cursor is hovering over, 
+-- Retrieve the actual unit the cursor is hovering over,
 -- as the blizzard method for this is just subpar and buggy.
 Tooltip.GetTooltipUnit = function(self)
 	local unit = self.unit
-	if (not unit) then 
+	if (not unit) then
 		return UnitExists("mouseover") and "mouseover" or nil
-	elseif UnitExists(unit) then 
-		return UnitIsUnit(unit, "mouseover") and "mouseover" or unit 
+	elseif UnitExists(unit) then
+		return UnitIsUnit(unit, "mouseover") and "mouseover" or unit
 	end
 end
 
@@ -2032,14 +2041,14 @@ Tooltip.AddLine = function(self, msg, r, g, b, wrap)
 	self.numLines = self.numLines + 1
 
 	-- Create new lines when needed
-	if (not self.lines.left[self.numLines]) then 
+	if (not self.lines.left[self.numLines]) then
 		createNewLinePair(self, self.numLines)
-	end 
+	end
 
 	-- Always fall back to default coloring if color is not provided
-	if not (r and g and b) then 
+	if not (r and g and b) then
 		r, g, b = self.colors.offwhite[1], self.colors.offwhite[2], self.colors.offwhite[3]
-	end 
+	end
 
 	local left = self.lines.left[self.numLines]
 	left:SetText(msg)
@@ -2065,17 +2074,17 @@ Tooltip.AddDoubleLine = function(self, leftMsg, rightMsg, r, g, b, r2, g2, b2, l
 	self.numLines = self.numLines + 1
 
 	-- Create new lines when needed
-	if (not self.lines.left[self.numLines]) then 
+	if (not self.lines.left[self.numLines]) then
 		createNewLinePair(self, self.numLines)
-	end 
+	end
 
 	-- Always fall back to default coloring if color is not provided
-	if not(r and g and b) then 
+	if not(r and g and b) then
 		r, g, b = self.colors.offwhite[1], self.colors.offwhite[2], self.colors.offwhite[3]
-	end 
-	if not(r2 and g2 and b2) then 
+	end
+	if not(r2 and g2 and b2) then
 		r2, g2, b2 = self.colors.offwhite[1], self.colors.offwhite[2], self.colors.offwhite[3]
-	end 
+	end
 
 	local left = self.lines.left[self.numLines]
 	left:SetText(leftMsg)
@@ -2103,7 +2112,7 @@ end
 Tooltip.ClearLine = function(self, lineIndex, noUpdate)
 
 	-- Only clear the given line if it's visible in the first place!
-	if (self.numLines >= lineIndex) then 
+	if (self.numLines >= lineIndex) then
 
 		-- Retrieve the fontstrings, remove them from the table
 		local left = table_remove(self.lines.left[lineIndex])
@@ -2124,18 +2133,18 @@ Tooltip.ClearLine = function(self, lineIndex, noUpdate)
 		self.lines.left[#self.lines.left + 1] = left
 		self.lines.right[#self.lines.right + 1] = right
 
-		-- Anchor the line that took the removed line's place to 
+		-- Anchor the line that took the removed line's place to
 		-- the previous line (or tooltip start, if it was the first line).
 		-- The other lines are anchored to each other, so need no updates.
 		alignLine(self, lineIndex)
 
 		-- Update layout
-		if (not noUpdate) then 
+		if (not noUpdate) then
 			self:UpdateLayout()
 			self:UpdateBackdropLayout()
-		end 
+		end
 		return true
-	end 
+	end
 end
 
 Tooltip.ClearAllLines = function(self, noUpdate)
@@ -2146,10 +2155,10 @@ Tooltip.ClearAllLines = function(self, noUpdate)
 	-- Reset the line counter
 	self.numLines = 0
 
-	-- We iterate using the number of left lines, 
+	-- We iterate using the number of left lines,
 	-- but all left lines have a matching right line.
 
-	for lineIndex in ipairs(self.lines.left) do 
+	for lineIndex in ipairs(self.lines.left) do
 		local left = self.lines.left[lineIndex]
 		left:Hide()
 		left:SetText("")
@@ -2160,31 +2169,31 @@ Tooltip.ClearAllLines = function(self, noUpdate)
 		right:Hide()
 		right:SetText("")
 		right:SetTextColor(self.colors.offwhite[1], self.colors.offwhite[2], self.colors.offwhite[3])
-	end 
+	end
 
 	-- Do a second pass to re-align points from start to finish.
-	for lineIndex in ipairs(self.lines.left) do 
+	for lineIndex in ipairs(self.lines.left) do
 		alignLine(self, lineIndex)
-	end 
-	
+	end
+
 	-- Update layout
-	if needUpdate and (not noUpdate) then 
+	if needUpdate and (not noUpdate) then
 		self:UpdateLayout()
 		self:UpdateBackdropLayout()
-	end 
+	end
 	return needUpdate
 end
 
 Tooltip.ClearStatusBar = function(self, barIndex, noUpdate)
 	local needUpdate
 	local bar = self.bars[barIndex]
-	if bar then 
+	if bar then
 
 		-- Queue a layout update since we're actually hiding a bar
-		if bar:IsShown() then 
+		if bar:IsShown() then
 			needUpdate = true
 			bar:Hide()
-		end 
+		end
 
 		-- Clear the bar even if it was hidden
 		bar:SetValue(0, true)
@@ -2192,10 +2201,10 @@ Tooltip.ClearStatusBar = function(self, barIndex, noUpdate)
 
 		-- Update the layout only if a visible bar was hidden,
 		-- and only if the noUpdate flag isn't set.
-		if needUpdate and (not noUpdate) then 
+		if needUpdate and (not noUpdate) then
 			self:UpdateBarLayout()
-		end 
-	end 
+		end
+	end
 	return needUpdate
 end
 
@@ -2205,13 +2214,13 @@ Tooltip.ClearStatusBars = function(self, noUpdate)
 	self.numBars = 0
 
 	local needUpdate
-	for i,bar in ipairs(self.bars) do 
+	for i,bar in ipairs(self.bars) do
 
 		-- Queue a layout update since we're actually hiding a bar
-		if bar:IsShown() then 
+		if bar:IsShown() then
 			needUpdate = true
 			bar:Hide()
-		end 
+		end
 
 		-- Clear the bar even if it was hidden
 		bar:SetValue(0, true)
@@ -2220,11 +2229,11 @@ Tooltip.ClearStatusBars = function(self, noUpdate)
 
 	-- Update the layout only if a visible bar was hidden,
 	-- and only if the noUpdate flag isn't set.
-	if needUpdate and (not noUpdate) then 
+	if needUpdate and (not noUpdate) then
 		self:UpdateBarLayout()
-	end 
+	end
 	return needUpdate
-end 
+end
 
 Tooltip.ClearMoney = function(self)
 end
@@ -2242,7 +2251,7 @@ Tooltip.GetUnitColor = function(self, unit)
 	local r, g, b = self:GetUnitHealthColor(unit)
 	local r2, g2, b2 = self:GetUnitPowerColor(unit)
 	return r, g, b, r2, g2, b2
-end 
+end
 
 -- Special script handlers we fake
 local proxyScripts = {
@@ -2255,9 +2264,9 @@ local proxyScripts = {
 
 Tooltip.SetScript = function(self, handle, script)
 	self.scripts[handle] = script
-	if (not proxyScripts[handle]) then 
+	if (not proxyScripts[handle]) then
 		Blizzard_SetScript(self, handle, script)
-	end 
+	end
 end
 
 Tooltip.GetScript = function(self, handle)
@@ -2273,27 +2282,27 @@ Tooltip.OnShow = function(self)
 	Visible[self] = true
 
 	-- Hide all other registered tooltips when showing one
-	for tooltip in pairs(Visible) do 
-		if (tooltip ~= self) then 
+	for tooltip in pairs(Visible) do
+		if (tooltip ~= self) then
 			tooltip:Hide()
-		end 
-	end 
+		end
+	end
 
 	self:UpdateScale()
 	self:UpdateLayout()
 	self:UpdateBarLayout()
 	self:UpdateBackdropLayout()
 
-	-- Tooltips are put in their owner's strata when shown, 
+	-- Tooltips are put in their owner's strata when shown,
 	-- so we need to bump them back to where they belong.
 	self:SetFrameStrata("TOOLTIP")
 
 	-- Get rid of the Blizzard tip if possible
-	if (not GameTooltip:IsForbidden()) and (GameTooltip:IsShown()) then 
+	if (not GameTooltip:IsForbidden()) and (GameTooltip:IsShown()) then
 		GameTooltip:Hide()
-	end 
+	end
 
-end 
+end
 
 Tooltip.OnHide = function(self)
 	Visible[self] = nil
@@ -2303,14 +2312,14 @@ Tooltip.OnHide = function(self)
 	self:ClearAllLines(true)
 
 	-- Clear all bar types when hiding the tooltip
-	for i,bar in ipairs(self.bars) do 
+	for i,bar in ipairs(self.bars) do
 		bar.barType = nil
-	end 
+	end
 
 	-- Clear all data when hiding the tooltip
-	for i,v in pairs(self.data) do 
+	for i,v in pairs(self.data) do
 		self.data[i] = nil
-	end 
+	end
 
 	-- Reset the layout
 	self:UpdateLayout()
@@ -2320,10 +2329,10 @@ Tooltip.OnHide = function(self)
 	self.needsReset = true
 	self.comparing = false
 	self.default = nil
-end 
+end
 
 Tooltip.OnTooltipAddMoney = function(self, cost, maxcost)
-	if (not maxcost) then 
+	if (not maxcost) then
 		self:SetMoney(cost, nil, string_format("%s:", SELL_PRICE))
 	else
 		self:AddLine(string_format("%s:", SELL_PRICE), 1.0, 1.0, 1.0)
@@ -2331,16 +2340,16 @@ Tooltip.OnTooltipAddMoney = function(self, cost, maxcost)
 		self:SetMoney(cost, nil, string_format("%s%s:", indent, MINIMUM))
 		self:SetMoney(maxcost, nil, string_format("%s%s:", indent, MAXIMUM))
 	end
-end 
+end
 
 Tooltip.OnTooltipCleared = function(self)
 	self:ClearMoney()
 	self:ClearInsertedFrames()
-end 
+end
 
 Tooltip.OnTooltipSetDefaultAnchor = function(self)
 	self:SetDefaultAnchor("UICenter")
-end 
+end
 
 -- This will update values for bar types handled by the library.
 -- Currently only includes unit health and unit power.
@@ -2353,45 +2362,45 @@ Tooltip.UpdateBarValues = function(self, unit, noUpdate)
 	for i,bar in ipairs(self.bars) do
 		local isShown = bar:IsShown()
 		if (bar.barType == "health") then
-			if (disconnected or dead) then 
+			if (disconnected or dead) then
 				local updateNeeded = self:ClearStatusBar(i,true)
 				needUpdate = needUpdate or updateNeeded
-			else 
+			else
 				local min = UnitHealth(unit) or 0
 				local max = UnitHealthMax(unit) or 0
 				isRealValue = (max ~= 100)
-			
+
 				-- Only show units with health, hide the bar otherwise
-				if ((min > 0) and (max > 0)) then 
-					if (not isShown) then 
+				if ((min > 0) and (max > 0)) then
+					if (not isShown) then
 						bar:Show()
 						needUpdate = true
-					end 
+					end
 					bar:SetStatusBarColor(self:GetUnitHealthColor(unit))
 					bar:SetMinMaxValues(0, max, needUpdate or (guid ~= bar.guid))
 					bar:SetValue(min, needUpdate or (guid ~= bar.guid))
 					bar.guid = guid
-				else 
+				else
 					local updateNeeded = self:ClearStatusBar(i,true)
 					needUpdate = needUpdate or updateNeeded
-				end 
-			end 
+				end
+			end
 
 		elseif (bar.barType == "power") then
-			if (disconnected or dead) then 
+			if (disconnected or dead) then
 				local updateNeeded = self:ClearStatusBar(i,true)
 				needUpdate = needUpdate or updateNeeded
-			else 
+			else
 				local powerID, powerType = UnitPowerType(unit)
 				local min = UnitPower(unit, powerID) or 0
 				local max = UnitPowerMax(unit, powerID) or 0
-		
+
 				-- Only show the power bar if there's actual power to show
-				if (powerType and (min > 0) and (max > 0)) then 
-					if (not isShown) then 
+				if (powerType and (min > 0) and (max > 0)) then
+					if (not isShown) then
 						bar:Show()
 						needUpdate = true
-					end 
+					end
 					bar:SetStatusBarColor(self:GetUnitPowerColor(unit))
 					bar:SetMinMaxValues(0, max, needUpdate or (guid ~= bar.guid))
 					bar:SetValue(min, needUpdate or (guid ~= bar.guid))
@@ -2401,35 +2410,35 @@ Tooltip.UpdateBarValues = function(self, unit, noUpdate)
 					needUpdate = needUpdate or updateNeeded
 				end
 			end
-		end 
-		if (bar:IsShown() and self.PostUpdateStatusBar) then 
+		end
+		if (bar:IsShown() and self.PostUpdateStatusBar) then
 			local min, max = bar:GetMinMaxValues()
 			self:PostUpdateStatusBar(bar, bar:GetValue(), min, max, isRealValue)
-		end 
-	end 
+		end
+	end
 
 	-- Update the layout only if a visible bar was hidden,
 	-- and only if the noUpdate flag isn't set.
-	if needUpdate and (not noUpdate) then 
+	if needUpdate and (not noUpdate) then
 		self:UpdateBackdropLayout()
 		self:UpdateBarLayout()
 		self:UpdatePosition()
-	end 
+	end
 	return needUpdate
-end 
+end
 
 Tooltip.OnTooltipSetUnit = function(self)
 	local unit = self:GetTooltipUnit()
-	if (not unit) then 
+	if (not unit) then
 		self:Hide()
-		return 
-	end 
+		return
+	end
 
 	-- module post updates
-	if self.PostUpdateUnit then 
+	if self.PostUpdateUnit then
 		return self:PostUpdateUnit(unit)
-	end 
-end 
+	end
+end
 
 Tooltip.OnTooltipSetItem = function(self)
 	if (IsModifiedClick("COMPAREITEMS") or (GetCVarBool("alwaysCompareItems") and not self:IsEquippedItem())) then
@@ -2439,38 +2448,38 @@ Tooltip.OnTooltipSetItem = function(self)
 		--shoppingTooltip1:Hide()
 		--shoppingTooltip2:Hide()
 	end
-end 
+end
 
 local tooltipUpdateTime = 2/10 -- same as blizz
 Tooltip.OnUpdate = function(self, elapsed)
 	self.elapsed = (self.elapsed or 0) + elapsed
-	if (self.elapsed < tooltipUpdateTime) then 
-		return 
-	end 
+	if (self.elapsed < tooltipUpdateTime) then
+		return
+	end
 
 	local needUpdate
 
 	local unit = self:GetTooltipUnit()
-	if unit then 
-		if self:UpdateBarValues(unit, true) then 
-			needUpdate = true 
-		end 
-	end 
+	if unit then
+		if self:UpdateBarValues(unit, true) then
+			needUpdate = true
+		end
+	end
 
-	if needUpdate then 
+	if needUpdate then
 		self:UpdateBackdropLayout()
 		self:UpdateBarLayout()
-		if self.default then 
+		if self.default then
 			self:UpdatePosition()
-		end 
-	end 
+		end
+	end
 
 	local owner = self:GetOwner()
 	if (owner and owner.UpdateTooltip) then
 		owner:UpdateTooltip()
 	end
 	self.elapsed = 0
-end 
+end
 
 
 -- Library API
@@ -2478,37 +2487,37 @@ end
 
 LibTooltip.SetDefaultCValue = function(self, name, value)
 	Defaults[name] = value
-end 
+end
 
 LibTooltip.GetDefaultCValue = function(self, name)
 	return Defaults[name]
-end 
+end
 
--- Set a default position for all registered tooltips. 
--- Also used as a fallback position for Blizzard / 3rd Party addons 
--- that rely on GameTooltip_SetDefaultAnchor to position their tooltips. 
+-- Set a default position for all registered tooltips.
+-- Also used as a fallback position for Blizzard / 3rd Party addons
+-- that rely on GameTooltip_SetDefaultAnchor to position their tooltips.
 LibTooltip.SetDefaultTooltipPosition = function(self, ...)
 	local numArgs = select("#", ...)
-	if (numArgs == 1) then 
+	if (numArgs == 1) then
 		local defaultAnchor = ...
 		check(defaultAnchor, 1, "table", "function", "string")
-		if ((type("defaultAnchor") == "function") or (type("defaultAnchor") == "table")) then 
+		if ((type("defaultAnchor") == "function") or (type("defaultAnchor") == "table")) then
 			LibTooltip:SetDefaultCValue("defaultAnchor", defaultAnchor)
-		else 
+		else
 			LibTooltip:SetDefaultCValue("defaultAnchor", { defaultAnchor })
-		end 
-	else 
+		end
+	else
 		LibTooltip:SetDefaultCValue("defaultAnchor", { ... })
-	end 
+	end
 	LibTooltip:ForAllTooltips("UpdatePosition")
-end 
+end
 
 LibTooltip.SetDefaultTooltipBackdrop = function(self, backdropTable)
 	check(backdropTable, 1, "table", "nil")
 	LibTooltip:SetDefaultCValue("backdrop", backdropTable)
 	LibTooltip:ForAllTooltips("UpdateBackdropLayout")
 	LibTooltip:ForAllTooltips("UpdateBarLayout")
-end 
+end
 
 LibTooltip.SetDefaultTooltipBackdropColor = function(self, r, g, b, a)
 	check(r, 1, "number")
@@ -2517,7 +2526,7 @@ LibTooltip.SetDefaultTooltipBackdropColor = function(self, r, g, b, a)
 	check(a, 4, "number", "nil")
 	LibTooltip:SetDefaultCValue("backdropColor", { r, g, b, a })
 	LibTooltip:ForAllTooltips("UpdateBackdropLayout")
-end 
+end
 
 LibTooltip.SetDefaultTooltipBackdropBorderColor = function(self, r, g, b, a)
 	check(r, 1, "number")
@@ -2526,7 +2535,7 @@ LibTooltip.SetDefaultTooltipBackdropBorderColor = function(self, r, g, b, a)
 	check(a, 4, "number", "nil")
 	LibTooltip:SetDefaultCValue("backdropBorderColor", { r, g, b, a })
 	LibTooltip:ForAllTooltips("UpdateBackdropLayout")
-end 
+end
 
 LibTooltip.SetDefaultTooltipBackdropOffset = function(self, left, right, top, bottom)
 	check(left, 1, "number")
@@ -2535,7 +2544,7 @@ LibTooltip.SetDefaultTooltipBackdropOffset = function(self, left, right, top, bo
 	check(bottom, 4, "number")
 	LibTooltip:SetDefaultCValue("backdropOffsets", { left, right, top, bottom })
 	LibTooltip:ForAllTooltips("UpdateBackdropLayout")
-end 
+end
 
 LibTooltip.SetDefaultTooltipStatusBarInset = function(self, left, right)
 	check(left, 1, "number")
@@ -2543,53 +2552,53 @@ LibTooltip.SetDefaultTooltipStatusBarInset = function(self, left, right)
 	LibTooltip:SetDefaultCValue("barInsets", { left, right })
 	LibTooltip:ForAllTooltips("UpdateBackdropLayout")
 	LibTooltip:ForAllTooltips("UpdateBarLayout")
-end 
+end
 
 LibTooltip.SetDefaultTooltipStatusBarOffset = function(self, barOffset)
 	check(barOffset, 1, "number")
 	LibTooltip:SetDefaultCValue("barOffset", barOffset)
 	LibTooltip:ForAllTooltips("UpdateBackdropLayout")
 	LibTooltip:ForAllTooltips("UpdateBarLayout")
-end 
+end
 
 LibTooltip.SetDefaultTooltipStatusBarHeight = function(self, barHeight, barType)
 	check(barHeight, 1, "number")
 	check(barType, 2, "string", "nil")
-	if barType then 
+	if barType then
 		LibTooltip:SetDefaultCValue("barHeight"..barType, barHeight)
-	else 
+	else
 		LibTooltip:SetDefaultCValue("barHeight", barHeight)
-	end 
+	end
 	LibTooltip:ForAllTooltips("UpdateBarLayout")
 	LibTooltip:ForAllTooltips("UpdateBackdropLayout")
-end 
+end
 
 LibTooltip.SetDefaultTooltipStatusBarSpacing = function(self, barSpacing)
 	check(barSpacing, 1, "number")
 	LibTooltip:SetDefaultCValue("barSpacing", barSpacing)
 	LibTooltip:ForAllTooltips("UpdateBackdropLayout")
 	LibTooltip:ForAllTooltips("UpdateBarLayout")
-end 
+end
 
 LibTooltip.SetDefaultTooltipColorTable = function(self, colorTable)
 	check(colorTable, 1, "table")
 	Colors = colorTable -- pure override
-end 
+end
 
 LibTooltip.SetDefaultTooltipStatusBarTexture = function(self, barTexture)
 	check(barTexture, 1, "string")
 	LibTooltip:SetDefaultCValue("barTexture", barTexture)
 	LibTooltip:ForAllTooltips("SetStatusBarTexture", barTexture)
-end 
+end
 
 LibTooltip.CreateTooltip = function(self, name)
 	check(name, 1, "string")
 
-	-- Tooltip reference names aren't global, 
-	-- but they still need to be unique from other registered tooltips. 
-	if Tooltips[name] then 
-		return 
-	end 
+	-- Tooltip reference names aren't global,
+	-- but they still need to be unique from other registered tooltips.
+	if Tooltips[name] then
+		return
+	end
 
 	LibTooltip.numTooltips = LibTooltip.numTooltips + 1
 
@@ -2597,7 +2606,7 @@ LibTooltip.CreateTooltip = function(self, name)
 	local tooltipName = "GP_GameTooltip_"..LibTooltip.numTooltips
 	local tooltip = LibTooltip:CreateFrame("Frame", tooltipName, "UICenter")
 
-	-- We're going to hard embed methods from now on, 
+	-- We're going to hard embed methods from now on,
 	-- as we need our template to override any similarly named methods in the template tip.
 	for method,func in pairs(Tooltip) do
 		if (type(func) == "function") then
@@ -2616,7 +2625,7 @@ LibTooltip.CreateTooltip = function(self, name)
 	tooltip.numTextures = 0 -- current number of visible textures
 	tooltip.minimumWidth = 120 -- current minimum display width
 	tooltip.maximumWidth = 360 -- current maximum display width
-	tooltip.colors = Colors -- assign our color table, can be replaced by modules to override colors. 
+	tooltip.colors = Colors -- assign our color table, can be replaced by modules to override colors.
 	tooltip.lines = { left = {}, right = {} } -- pool of all text lines
 	tooltip.bars = {} -- pool of all bars
 	tooltip.textures = {} -- pool of all textures
@@ -2645,7 +2654,7 @@ LibTooltip.CreateTooltip = function(self, name)
 	end
 
 	-- Embed the statusbar creation methods directly into the tooltip.
-	-- This will give modules and plugins easy access to proper bars. 
+	-- This will give modules and plugins easy access to proper bars.
 	LibStatusBar:Embed(tooltip)
 
 	-- Embed scanner functionality directly into the tooltip too
@@ -2671,7 +2680,7 @@ LibTooltip.CreateTooltip = function(self, name)
 	-- Store by frame handle for internal usage.
 	Tooltips[tooltip] = true
 
-	-- Store by internal name to allow 
+	-- Store by internal name to allow
 	-- modules to retrieve each other's tooltips.
 	TooltipsByName[name] = tooltip
 
@@ -2679,51 +2688,51 @@ LibTooltip.CreateTooltip = function(self, name)
 	-- Use this with caution, though, don't let multiple modules do the same.
 	-- I recommend only adding this module method to full UI addons, not standalones.
 	LibTooltip:ForAllEmbeds("PostCreateTooltip", tooltip)
-	
+
 	return tooltip
-end 
+end
 
 LibTooltip.GetTooltip = function(self, name)
 	check(name, 1, "string")
 	return TooltipsByName[name]
-end 
+end
 
 LibTooltip.ForAllTooltips = function(self, method, ...)
 	check(method, 1, "string", "function")
-	for tooltip in pairs(Tooltips) do 
-		if (type(method) == "string") then 
-			if tooltip[method] then 
+	for tooltip in pairs(Tooltips) do
+		if (type(method) == "string") then
+			if tooltip[method] then
 				tooltip[method](tooltip, ...)
-			end 
+			end
 		else
 			method(tooltip, ...)
-		end 
-	end 
-end 
+		end
+	end
+end
 
 -- Module embedding
 local embedMethods = {
-	CreateTooltip = true, 
+	CreateTooltip = true,
 	GetTooltip = true,
-	SetDefaultTooltipPosition = true, 
-	SetDefaultTooltipColorTable = true, 
-	SetDefaultTooltipBackdrop = true, 
-	SetDefaultTooltipBackdropBorderColor = true, 
-	SetDefaultTooltipBackdropColor = true, 
+	SetDefaultTooltipPosition = true,
+	SetDefaultTooltipColorTable = true,
+	SetDefaultTooltipBackdrop = true,
+	SetDefaultTooltipBackdropBorderColor = true,
+	SetDefaultTooltipBackdropColor = true,
 	SetDefaultTooltipBackdropOffset = true,
-	SetDefaultTooltipStatusBarInset = true, 
-	SetDefaultTooltipStatusBarOffset = true, 
-	SetDefaultTooltipStatusBarTexture = true, 
-	SetDefaultTooltipStatusBarSpacing = true, 
+	SetDefaultTooltipStatusBarInset = true,
+	SetDefaultTooltipStatusBarOffset = true,
+	SetDefaultTooltipStatusBarTexture = true,
+	SetDefaultTooltipStatusBarSpacing = true,
 	SetDefaultTooltipStatusBarHeight = true,
 	ForAllTooltips = true
 }
 
 -- Iterate all embedded modules for the given method name or function
--- Silently fail if nothing exists. We don't want an error here. 
+-- Silently fail if nothing exists. We don't want an error here.
 LibTooltip.ForAllEmbeds = function(self, method, ...)
-	for target in pairs(self.embeds) do 
-		if (target) then 
+	for target in pairs(self.embeds) do
+		if (target) then
 			if (not target.IsUserDisabled) or (not target:IsUserDisabled()) then
 				if (type(method) == "string") then
 					if target[method] then
@@ -2733,9 +2742,9 @@ LibTooltip.ForAllEmbeds = function(self, method, ...)
 					method(target, ...)
 				end
 			end
-		end 
-	end 
-end 
+		end
+	end
+end
 
 LibTooltip.Embed = function(self, target)
 	for method in pairs(embedMethods) do
diff --git a/SimpleClassPower/back-end/libraries/tooltipscanner.lua b/SimpleClassPower/back-end/libraries/tooltipscanner.lua
index b610206..6790d16 100644
--- a/SimpleClassPower/back-end/libraries/tooltipscanner.lua
+++ b/SimpleClassPower/back-end/libraries/tooltipscanner.lua
@@ -1,5 +1,5 @@
-local LibTooltipScanner = Wheel:Set("LibTooltipScanner", 91)
-if (not LibTooltipScanner) then	
+local LibTooltipScanner = Wheel:Set("LibTooltipScanner", 95)
+if (not LibTooltipScanner) then
 	return
 end
 
@@ -34,7 +34,7 @@ local GetActionText = GetActionText
 local GetActionTexture = GetActionTexture
 local GetBestMapForUnit = C_Map.GetBestMapForUnit
 local GetContainerItemID = GetContainerItemID
-local GetDetailedItemLevelInfo = GetDetailedItemLevelInfo 
+local GetDetailedItemLevelInfo = GetDetailedItemLevelInfo
 local GetGuildBankItemInfo = GetSpecializationRole
 local GetGuildInfo = GetGuildInfo
 local GetItemInfo = GetItemInfo
@@ -49,7 +49,7 @@ local HasAction = HasAction
 local IsActionInRange = IsActionInRange
 local UnitAura = UnitAura
 local UnitBuff = UnitBuff
-local UnitClass = UnitClass 
+local UnitClass = UnitClass
 local UnitClassification = UnitClassification
 local UnitCreatureFamily = UnitCreatureFamily
 local UnitCreatureType = UnitCreatureType
@@ -65,18 +65,20 @@ local UnitName = UnitName
 local UnitRace = UnitRace
 local UnitReaction = UnitReaction
 local UnitSex = UnitSex
-local DoesSpellExist = C_Spell.DoesSpellExist 
+local DoesSpellExist = C_Spell.DoesSpellExist
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 LibTooltipScanner.embeds = LibTooltipScanner.embeds or {}
 
 -- Tooltip used for scanning
 LibTooltipScanner.scannerName = LibTooltipScanner.scannerName or "GP_TooltipScanner"
-LibTooltipScanner.scannerTooltip = LibTooltipScanner.scannerTooltip 
+LibTooltipScanner.scannerTooltip = LibTooltipScanner.scannerTooltip
 								or CreateFrame("GameTooltip", LibTooltipScanner.scannerName, WorldFrame, "GameTooltipTemplate")
 
 -- Shortcuts
@@ -113,7 +115,7 @@ local notSpecified = setmetatable({
 	["esMX"] = "Sin especificar",
 	["ptBR"] = "Não especificado",
 	["itIT"] = "Non Specificato"
-}, { __index = function(t,k) return "Not specified" end })[(GetLocale())] 
+}, { __index = function(t,k) return "Not specified" end })[(GetLocale())]
 
 -- Force creation of money lines.
 --[[
@@ -139,13 +141,13 @@ end
 ---------------------------------------------------------
 -- Localized Constants
 local Constants = {
-	CastChanneled = SPELL_CAST_CHANNELED, 
+	CastChanneled = SPELL_CAST_CHANNELED,
 	CastInstant = SPELL_RECAST_TIME_CHARGEUP_INSTANT,
-	CastNextMelee = SPELL_ON_NEXT_SWING, 
-	CastNextRanged = SPELL_ON_NEXT_RANGED, 
+	CastNextMelee = SPELL_ON_NEXT_SWING,
+	CastNextRanged = SPELL_ON_NEXT_RANGED,
 	CastTimeMin = SPELL_CAST_TIME_MIN,
-	CastTimeSec = SPELL_CAST_TIME_SEC, 
-	ContainerSlots = CONTAINER_SLOTS, 
+	CastTimeSec = SPELL_CAST_TIME_SEC,
+	ContainerSlots = CONTAINER_SLOTS,
 
 	CooldownRemaining = COOLDOWN_REMAINING,
 	CooldownTimeRemaining1 = ITEM_COOLDOWN_TIME,
@@ -175,18 +177,18 @@ local Constants = {
 	ItemClickable3 = ITEM_SOCKETABLE, -- "<Shift Right Click to Socket>"
 	--POWER_TYPE_ANIMA = "Anima"
 	--POWER_TYPE_ANIMA_V2 = "Anima"
-	
+
 	-- Adding these mostly to filter them out
 	ItemStartsQuest = ITEM_STARTS_QUEST, -- "This Item Begins a Quest"
 	ItemIsCrafting = PROFESSIONS_USED_IN_COOKING, -- "Crafting Reagent"
 
-	
+
 	ItemBlock = SHIELD_BLOCK_TEMPLATE,
 	ItemDamage = DAMAGE_TEMPLATE,
 	ItemDurability = DURABILITY_TEMPLATE,
 	ItemLevel = ITEM_LEVEL,
-	ItemReqLevel = ITEM_MIN_LEVEL, 
-	ItemSellPrice = SELL_PRICE, 
+	ItemReqLevel = ITEM_MIN_LEVEL,
+	ItemSellPrice = SELL_PRICE,
 	ItemUnique = ITEM_UNIQUE, -- "Unique"
 	ItemUniqueEquip = ITEM_UNIQUE_EQUIPPABLE, -- "Unique-Equipped"
 	ItemUniqueMultiple = ITEM_UNIQUE_MULTIPLE, -- "Unique (%d)"
@@ -202,9 +204,9 @@ local Constants = {
 	RangeCaster = SPELL_RANGE_AREA,
 	RangeMelee = MELEE_RANGE,
 	RangeSpell = SPELL_RANGE, -- SPELL_RANGE_DUAL = "%1$s: %2$s yd range"
-	RangeUnlimited = SPELL_RANGE_UNLIMITED, 
+	RangeUnlimited = SPELL_RANGE_UNLIMITED,
 
-	SpellRequiresForm = SPELL_REQUIRED_FORM, 
+	SpellRequiresForm = SPELL_REQUIRED_FORM,
 
 	UnitSkinnable1 = UNIT_SKINNABLE_LEATHER, -- "Skinnable"
 	UnitSkinnable2 = UNIT_SKINNABLE_BOLTS, -- "Requires Engineering"
@@ -239,7 +241,7 @@ local numberPattern = function(msg)
 	return msg
 end
 
--- Will come up with a better system as this expands, 
+-- Will come up with a better system as this expands,
 -- just doing it fast and simple for now.
 local Patterns = {
 
@@ -261,43 +263,43 @@ local Patterns = {
 	AuraTimeRemaining8 = 			   pluralPattern(SPELL_TIME_REMAINING_SEC),
 
 	-- Total Cast Time
-	CastTime1 = 				"^" .. Constants.CastInstant, 
+	CastTime1 = 				"^" .. Constants.CastInstant,
 	CastTime2 = 				"^" .. string_gsub(Constants.CastTimeSec, "%%%.%dg", "(%.+)"),
 	CastTime3 = 				"^" .. string_gsub(Constants.CastTimeMin, "%%%.%dg", "(%.+)"),
-	CastTime4 = 				"^" .. Constants.CastChanneled, 
+	CastTime4 = 				"^" .. Constants.CastChanneled,
 
 	-- On next swing/attack
-	CastQueue1 = 				"^" .. Constants.CastNextMelee, 
-	CastQueue2 = 				"^" .. Constants.CastNextRanged, 
+	CastQueue1 = 				"^" .. Constants.CastNextMelee,
+	CastQueue2 = 				"^" .. Constants.CastNextRanged,
 
 	-- CooldownRemaining
-	CooldownTimeRemaining1 = 		   numberPattern(Constants.CooldownTimeRemaining1), 
-	CooldownTimeRemaining2 = 		   numberPattern(Constants.CooldownTimeRemaining2), 
-	CooldownTimeRemaining3 = 		   numberPattern(Constants.CooldownTimeRemaining3), 
+	CooldownTimeRemaining1 = 		   numberPattern(Constants.CooldownTimeRemaining1),
+	CooldownTimeRemaining2 = 		   numberPattern(Constants.CooldownTimeRemaining2),
+	CooldownTimeRemaining3 = 		   numberPattern(Constants.CooldownTimeRemaining3),
 
 	-- Item bound to
-	ItemBound1 = 				"^" .. Constants.ItemBoundSoul, 
-	ItemBound2 = 				"^" .. Constants.ItemBoundAccount, 
-	ItemBound3 = 				"^" .. Constants.ItemBoundBnet, 
-	
-	-- Item binds 
-	ItemBind1 = 				"^" .. Constants.ItemBindBoE, 
-	ItemBind2 = 				"^" .. Constants.ItemBindBoP, 
-	ItemBind3 = 				"^" .. Constants.ItemBindUse, 
-	ItemBind4 = 				"^" .. Constants.ItemBindQuest, 
-	ItemBind5 = 				"^" .. Constants.ItemBindAccount, 
-	ItemBind6 = 				"^" .. Constants.ItemBindBnet, 
+	ItemBound1 = 				"^" .. Constants.ItemBoundSoul,
+	ItemBound2 = 				"^" .. Constants.ItemBoundAccount,
+	ItemBound3 = 				"^" .. Constants.ItemBoundBnet,
+
+	-- Item binds
+	ItemBind1 = 				"^" .. Constants.ItemBindBoE,
+	ItemBind2 = 				"^" .. Constants.ItemBindBoP,
+	ItemBind3 = 				"^" .. Constants.ItemBindUse,
+	ItemBind4 = 				"^" .. Constants.ItemBindQuest,
+	ItemBind5 = 				"^" .. Constants.ItemBindAccount,
+	ItemBind6 = 				"^" .. Constants.ItemBindBnet,
 
 	ItemBindBoE = 				"^" .. Constants.ItemBindBoE,
-	ItemBindBoU = 				"^" .. Constants.ItemBindUse, 
-	ItemBindBoA = 				"^" .. Constants.ItemBindAccount, 
+	ItemBindBoU = 				"^" .. Constants.ItemBindUse,
+	ItemBindBoA = 				"^" .. Constants.ItemBindAccount,
 
 	ItemClickable1 = 			"^" .. Constants.ItemClickable1,
 	ItemClickable2 = 			"^" .. Constants.ItemClickable2,
 	ItemClickable3 = 			"^" .. Constants.ItemClickable3,
 
-	-- Item required level 
-	ItemReqLevel = 				"^" .. Constants.ItemReqLevel, 
+	-- Item required level
+	ItemReqLevel = 				"^" .. Constants.ItemReqLevel,
 
 	-- Item sell price
 	ItemSellPrice = 			"^" .. Constants.ItemSellPrice,
@@ -308,28 +310,28 @@ local Patterns = {
 	ItemUnique3 = 				"^" .. numberPattern(Constants.ItemUniqueMultiple),
 
 	-- Item effects
-	ItemEquipEffect = 			"^" .. Constants.ItemEquipEffect, 
-	ItemUseEffect = 			"^" .. Constants.ItemUseEffect, 
+	ItemEquipEffect = 			"^" .. Constants.ItemEquipEffect,
+	ItemUseEffect = 			"^" .. Constants.ItemUseEffect,
 
 	-- Recharge Remaining
-	RechargeTimeRemaining1 = 	"^" .. numberPattern(Constants.RechargeTimeRemaining1), 
-	RechargeTimeRemaining2 = 	"^" .. numberPattern(Constants.RechargeTimeRemaining2), 
-	RechargeTimeRemaining3 = 	"^" .. numberPattern(Constants.RechargeTimeRemaining3), 
-	
+	RechargeTimeRemaining1 = 	"^" .. numberPattern(Constants.RechargeTimeRemaining1),
+	RechargeTimeRemaining2 = 	"^" .. numberPattern(Constants.RechargeTimeRemaining2),
+	RechargeTimeRemaining3 = 	"^" .. numberPattern(Constants.RechargeTimeRemaining3),
+
 	-- Spell Range
 	Range1 = 					"^" .. Constants.RangeMelee,
 	Range2 = 					"^" .. Constants.RangeUnlimited,
-	Range3 = 					"^" .. Constants.RangeCaster, 
+	Range3 = 					"^" .. Constants.RangeCaster,
 	Range4 = 					"^" .. string_gsub(Constants.RangeSpell, "%%s", "(%.+)"),
 
-	-- Power Types for Spell Cost 
+	-- Power Types for Spell Cost
 	PowerType1 = 				"^(.+)" .. Constants.PowerType1,
 	PowerType2 = 				"^(.+)" .. Constants.PowerType2,
 	PowerType3 = 				"^(.+)" .. Constants.PowerType3,
 	PowerType4 = 				"^(.+)" .. Constants.PowerType4,
 
 	-- Spell Requirements
-	SpellRequiresForm = 			   "(" .. (string_gsub(Constants.SpellRequiresForm, "%%s", "(.+)")) .. ")", 
+	SpellRequiresForm = 			   "(" .. (string_gsub(Constants.SpellRequiresForm, "%%s", "(.+)")) .. ")",
 
 	-- Skinnables
 	UnitSkinnable1 = 			"^" .. Constants.UnitSkinnable1,
@@ -353,49 +355,49 @@ local sorted1stStats = {
 }
 
 local isSecondaryStat = {
-	ITEM_MOD_CRIT_RATING_SHORT = true, 
-	ITEM_MOD_HASTE_RATING_SHORT = true, 
-	ITEM_MOD_MASTERY_RATING_SHORT = true, 
-	ITEM_MOD_VERSATILITY = true, 
+	ITEM_MOD_CRIT_RATING_SHORT = true,
+	ITEM_MOD_HASTE_RATING_SHORT = true,
+	ITEM_MOD_MASTERY_RATING_SHORT = true,
+	ITEM_MOD_VERSATILITY = true,
 
-	ITEM_MOD_CR_LIFESTEAL_SHORT = true, 
-	ITEM_MOD_CR_AVOIDANCE_SHORT = true, 
-	ITEM_MOD_CR_SPEED_SHORT = true, 
+	ITEM_MOD_CR_LIFESTEAL_SHORT = true,
+	ITEM_MOD_CR_AVOIDANCE_SHORT = true,
+	ITEM_MOD_CR_SPEED_SHORT = true,
 
 	ITEM_MOD_DEFENSE_SKILL_RATING_SHORT = true,
-	ITEM_MOD_DODGE_RATING_SHORT = true, 
-	ITEM_MOD_PARRY_RATING_SHORT = true, 
+	ITEM_MOD_DODGE_RATING_SHORT = true,
+	ITEM_MOD_PARRY_RATING_SHORT = true,
 
-	ITEM_MOD_BLOCK_VALUE_SHORT = true, 
+	ITEM_MOD_BLOCK_VALUE_SHORT = true,
 	ITEM_MOD_BLOCK_RATING_SHORT = true
 }
 
 local sorted2ndStats = {
-	"ITEM_MOD_CRIT_RATING_SHORT", 
-	"ITEM_MOD_HASTE_RATING_SHORT", 
-	"ITEM_MOD_MASTERY_RATING_SHORT", 
-	"ITEM_MOD_VERSATILITY", 
+	"ITEM_MOD_CRIT_RATING_SHORT",
+	"ITEM_MOD_HASTE_RATING_SHORT",
+	"ITEM_MOD_MASTERY_RATING_SHORT",
+	"ITEM_MOD_VERSATILITY",
 
-	"ITEM_MOD_CR_LIFESTEAL_SHORT", 
-	"ITEM_MOD_CR_AVOIDANCE_SHORT", 
-	"ITEM_MOD_CR_SPEED_SHORT", 
+	"ITEM_MOD_CR_LIFESTEAL_SHORT",
+	"ITEM_MOD_CR_AVOIDANCE_SHORT",
+	"ITEM_MOD_CR_SPEED_SHORT",
 
 	"ITEM_MOD_DEFENSE_SKILL_RATING_SHORT",
-	"ITEM_MOD_DODGE_RATING_SHORT", 
-	"ITEM_MOD_PARRY_RATING_SHORT", 
+	"ITEM_MOD_DODGE_RATING_SHORT",
+	"ITEM_MOD_PARRY_RATING_SHORT",
 
-	"ITEM_MOD_BLOCK_VALUE_SHORT", 
+	"ITEM_MOD_BLOCK_VALUE_SHORT",
 	"ITEM_MOD_BLOCK_RATING_SHORT"
 }
 
 -- Utility Functions
 ---------------------------------------------------------
--- Syntax check 
+-- Syntax check
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -419,7 +421,7 @@ local clearSpace = function(msg)
 		msg = string_gsub(msg, "(%s+)$", "")
 	end
 	return msg
-end 
+end
 
 -- Strip away color codes
 local clearColors = function(msg)
@@ -432,48 +434,48 @@ end
 
 -- Library API
 ---------------------------------------------------------
--- *Methods will return nil if no data was found, 
+-- *Methods will return nil if no data was found,
 --  or a table populated with data if something was found.
 -- *Methods can provide an optional table
 --  to be populated by the retrieved data.
 
 LibTooltipScanner.IsActionItem = function(self, actionSlot, tbl)
-	if HasAction(actionSlot) then 
+	if HasAction(actionSlot) then
 		local actionType, id = GetActionInfo(actionSlot)
-		if (actionType == "item") then 
+		if (actionType == "item") then
 			return true
 
-		elseif (actionType == "macro") then 
+		elseif (actionType == "macro") then
 			-- Initiate the scanner tooltip
 			Scanner:Hide()
 			Scanner.owner = UIParent
 			Scanner:SetOwner(UIParent, "ANCHOR_NONE")
 			Scanner:SetAction(actionSlot)
 
-			local numLines = Scanner:NumLines() 
-			for lineIndex = 2, (numLines < 4) and numLines or 4 do 
+			local numLines = Scanner:NumLines()
+			for lineIndex = 2, (numLines < 4) and numLines or 4 do
 				local line = _G[ScannerName.."TextLeft"..lineIndex]
-				if (line) then 
+				if (line) then
 					local msg = line:GetText()
 
 					-- item binds
 					local id = 1
-					while Patterns["ItemBound"..id] do 
-						if (string_find(msg, Patterns["ItemBound"..id])) then 
+					while Patterns["ItemBound"..id] do
+						if (string_find(msg, Patterns["ItemBound"..id])) then
 							return true
-						end 
+						end
 						id = id + 1
-					end 
+					end
 
 					-- item unique stats
 					if (not isMacroItem) then
 						id = 1
-						while Patterns["ItemUnique"..id] do 
-							if (string_find(msg, Patterns["ItemUnique"..id])) then 
+						while Patterns["ItemUnique"..id] do
+							if (string_find(msg, Patterns["ItemUnique"..id])) then
 								return true
-							end 
+							end
 							id = id + 1
-						end 
+						end
 					end
 				end
 			end
@@ -487,33 +489,33 @@ LibTooltipScanner.GetTooltipDataForAction = function(self, actionSlot, tbl)
 	Scanner.owner = UIParent
 	Scanner:SetOwner(UIParent, "ANCHOR_NONE")
 
-	--  Blizz Action Tooltip Structure: 
+	--  Blizz Action Tooltip Structure:
 	--  *the order is consistent, bracketed elements optional
-	--  
+	--
 	--------------------------------------------
 	--	Name                    [School/Type] --
 	--	[Cost][Range]                 [Range] --
 	--	[CastTime]             [CooldownTime] --
-	--	[Cooldown/Chargetime remaining      ] -- 
+	--	[Cooldown/Chargetime remaining      ] --
 	--	[                                   ] --
 	--	[            Description            ] --
 	--	[                                   ] --
 	--	[Resource awarded / Max charges     ] --
 	--------------------------------------------
 
-	if HasAction(actionSlot) then 
+	if HasAction(actionSlot) then
 
 		-- Switch to action item function if the action contains an item
-		if (self:IsActionItem(actionSlot)) then 
+		if (self:IsActionItem(actionSlot)) then
 			return self:GetTooltipDataForActionItem(actionSlot)
-		end 
+		end
 
 		Scanner:SetAction(actionSlot)
 
 		tbl = tbl or {}
-		for i,v in pairs(tbl) do 
+		for i,v in pairs(tbl) do
 			tbl[i] = nil
-		end 
+		end
 
 		-- Retrieve generic data
 		local macroName = GetActionText(actionSlot)
@@ -545,39 +547,39 @@ LibTooltipScanner.GetTooltipDataForAction = function(self, actionSlot, tbl)
 
 		-- Action Name
 		left = _G[ScannerName.."TextLeft1"]
-		if left:IsShown() then 
+		if left:IsShown() then
 			local msg = left:GetText()
-			if msg and (msg ~= "") then 
+			if msg and (msg ~= "") then
 				tbl.name = msg
-			else 
+			else
 				-- if the name isn't there, no point going on
 				return nil
-			end 
+			end
 		end
 
-		if (tbl.name == ATTACK) then 
-			tbl.isAutoAttack = true 
+		if (tbl.name == ATTACK) then
+			tbl.isAutoAttack = true
 
 			local speed, offhandSpeed = UnitAttackSpeed("player")
 			local minDamage
 			local maxDamage
 			local minOffHandDamage
-			local maxOffHandDamage 
+			local maxOffHandDamage
 			local physicalBonusPos
 			local physicalBonusNeg
 			local percent
 			minDamage, maxDamage, minOffHandDamage, maxOffHandDamage, physicalBonusPos, physicalBonusNeg, percent = UnitDamage("player")
 			local displayMin = max(floor(minDamage),1)
 			local displayMax = max(ceil(maxDamage),1)
-		
+
 			minDamage = (minDamage / percent) - physicalBonusPos - physicalBonusNeg
 			maxDamage = (maxDamage / percent) - physicalBonusPos - physicalBonusNeg
-		
+
 			local baseDamage = (minDamage + maxDamage) * 0.5
 			local fullDamage = (baseDamage + physicalBonusPos + physicalBonusNeg) * percent
 			local totalBonus = (fullDamage - baseDamage)
 			local damagePerSecond = (max(fullDamage,1) / speed)
-		
+
 			-- If there's an offhand speed then add the offhand info to the tooltip
 			local offhandAttackSpeed, offhandDps
 			if ( offhandSpeed ) then
@@ -590,7 +592,7 @@ LibTooltipScanner.GetTooltipDataForAction = function(self, actionSlot, tbl)
 
 				offhandAttackSpeed = offhandSpeed
 				offhandDps = offhandDamagePerSecond
-			end 
+			end
 
 			-- INVTYPE_WEAPONMAINHAND
 			tbl.attackSpeed = string_format("%.2f", speed)
@@ -607,44 +609,44 @@ LibTooltipScanner.GetTooltipDataForAction = function(self, actionSlot, tbl)
 			end
 
 			return validateResults(tbl)
-		end 
+		end
 
 		-- Spell school / Spell Type (could be "Racial")
 		right = _G[ScannerName.."TextRight1"]
-		if right:IsShown() then 
+		if right:IsShown() then
 			local msg = right:GetText()
-			if msg and (msg ~= "") then 
+			if msg and (msg ~= "") then
 				tbl.schoolType = msg
-			end 
-		end 
-		
+			end
+		end
+
 		local foundCost, foundRange
 		local foundCastTime, foundCooldownTime
 		local foundRemainingCooldown, foundRemainingRecharge
 		local foundDescription
 		local foundResourceMod
 		local foundRequirement, foundUnmetRequirement
-		
+
 		local numLines = Scanner:NumLines() -- total number of lines
 		local lastInfoLine = 1 -- The last line where information exists
 
 		-- Iterate available lines for action information
-		for lineIndex = 2, (numLines < 4) and numLines or 4 do 
+		for lineIndex = 2, (numLines < 4) and numLines or 4 do
 
 			left, right = _G[ScannerName.."TextLeft"..lineIndex], _G[ScannerName.."TextRight"..lineIndex]
-			if (left and right) then 
+			if (left and right) then
 
 				local leftMsg, rightMsg = left:GetText(), right:GetText()
 
 				-- Left side iterations
-				if (leftMsg and (leftMsg ~= "")) then 
+				if (leftMsg and (leftMsg ~= "")) then
 
 					-- search for range
-					if (not foundRange) then 
+					if (not foundRange) then
 						local id = 1
-						while Patterns["Range"..id] do 
-							if (string_find(leftMsg, Patterns["Range"..id])) then 
-							
+						while Patterns["Range"..id] do
+							if (string_find(leftMsg, Patterns["Range"..id])) then
+
 								-- found the range line
 								foundRange = lineIndex
 								tbl.spellRange = leftMsg
@@ -653,235 +655,235 @@ LibTooltipScanner.GetTooltipDataForAction = function(self, actionSlot, tbl)
 								-- it has no cost if the range is on this side
 								foundCost = true
 
-								if (lastInfoLine < foundRange) then 
+								if (lastInfoLine < foundRange) then
 									lastInfoLine = foundRange
-								end 
-	
+								end
+
 								break
-							end 
+							end
 							id = id + 1
-						end 
-					end 
+						end
+					end
 
 					-- search for cast time
-					if (not foundCastTime) then 
+					if (not foundCastTime) then
 						local id = 1
-						while Patterns["CastTime"..id] do 
-							if (string_find(leftMsg, Patterns["CastTime"..id])) then 
+						while Patterns["CastTime"..id] do
+							if (string_find(leftMsg, Patterns["CastTime"..id])) then
 
 								-- found the range line
 								foundCastTime = lineIndex
 								tbl.castTime = leftMsg
 
-								if (lastInfoLine < foundCastTime) then 
+								if (lastInfoLine < foundCastTime) then
 									lastInfoLine = foundCastTime
-								end 
+								end
 
 								-- if there is something on the right side, it's the total cooldown
-								if (rightMsg and (rightMsg ~= "")) then 
+								if (rightMsg and (rightMsg ~= "")) then
 									foundCooldownTime = foundCooldownTime
 									tbl.cooldownTime = rightMsg
-								end  
+								end
 
 								break
-							end 
+							end
 							id = id + 1
-						end 
-					end 
+						end
+					end
 
 					-- search for attacks on next swing
-					if (not foundCastTime) then 
+					if (not foundCastTime) then
 						local id = 1
-						while Patterns["CastQueue"..id] do 
-							if (string_find(leftMsg, Patterns["CastQueue"..id])) then 
+						while Patterns["CastQueue"..id] do
+							if (string_find(leftMsg, Patterns["CastQueue"..id])) then
 
 								-- found the range line
 								foundCastTime = lineIndex
 								tbl.castTime = leftMsg
 
-								if (lastInfoLine < foundCastTime) then 
+								if (lastInfoLine < foundCastTime) then
 									lastInfoLine = foundCastTime
-								end 
+								end
 
 								-- if there is something on the right side, it's the total cooldown
-								if (rightMsg and (rightMsg ~= "")) then 
+								if (rightMsg and (rightMsg ~= "")) then
 									foundCooldownTime = foundCooldownTime
 									tbl.cooldownTime = rightMsg
-								end  
+								end
 
 								-- The cost is usually listed on the line before these
-								if (not foundCost) then 
+								if (not foundCost) then
 									local costLineID = lineIndex - 1
 									local costLine = _G[ScannerName.."TextLeft"..costLineID]
-									if costLine then 
+									if costLine then
 										local costLineMsg = costLine and costLine:GetText()
-										if (costLineMsg and (costLineMsg ~= "")) then 
+										if (costLineMsg and (costLineMsg ~= "")) then
 											foundCost = costLineID
 											tbl.spellCost = costLineMsg
-										end 
-									end 
-								end 
+										end
+									end
+								end
 
 								break
-							end 
+							end
 							id = id + 1
-						end 
-					end 
+						end
+					end
 
-					if not(foundUnmetRequirement or foundRequirement) and string_find(leftMsg, Patterns.SpellRequiresForm) then 
+					if not(foundUnmetRequirement or foundRequirement) and string_find(leftMsg, Patterns.SpellRequiresForm) then
 						local r, g, b = left:GetTextColor()
-						if (r + g + b < 2) then 
+						if (r + g + b < 2) then
 							foundUnmetRequirement = lineIndex
 							tbl.unmetRequirement = leftMsg
-						else 
+						else
 							foundRequirement = lineIndex
 							tbl.requirement = leftMsg
-						end 
-					end 
+						end
+					end
 
 					-- Search for remaining cooldown, if one is active (?)
-					if (not foundRemainingCooldown) then 
+					if (not foundRemainingCooldown) then
 						local id = 1
-						while Patterns["CooldownTimeRemaining"..id] do 
-							if (string_find(leftMsg, Patterns["CooldownTimeRemaining"..id])) then 
+						while Patterns["CooldownTimeRemaining"..id] do
+							if (string_find(leftMsg, Patterns["CooldownTimeRemaining"..id])) then
 
 								-- Need this to figure out how far down the description starts!
 								foundRemainingCooldown = lineIndex
 
-								if (lastInfoLine < foundRemainingCooldown) then 
+								if (lastInfoLine < foundRemainingCooldown) then
 									lastInfoLine = foundRemainingCooldown
-								end 
+								end
 
 								-- *not needed, we're getting that from API calls above!
 								--tbl.cooldownTimeRemaining = leftMsg
 
 								break
-							end 
+							end
 							id = id + 1
-						end 
-					end  
+						end
+					end
 
 					-- Search for remaining cooldown, if one is active (?)
-					if (not foundRemainingRecharge) then 
+					if (not foundRemainingRecharge) then
 						local id = 1
-						while Patterns["RechargeTimeRemaining"..id] do 
-							if (string_find(leftMsg, Patterns["RechargeTimeRemaining"..id])) then 
+						while Patterns["RechargeTimeRemaining"..id] do
+							if (string_find(leftMsg, Patterns["RechargeTimeRemaining"..id])) then
 
 								-- Need this to figure out how far down the description starts!
 								foundRemainingRecharge = lineIndex
 
-								if (lastInfoLine < foundRemainingRecharge) then 
+								if (lastInfoLine < foundRemainingRecharge) then
 									lastInfoLine = foundRemainingRecharge
-								end 
+								end
 
 								-- *not needed, we're getting that from API calls above!
 								--tbl.rechargeTimeRemaining = leftMsg
 
 								break
-							end 
+							end
 							id = id + 1
-						end 
-					end  
-					
-				end 
+						end
+					end
+
+				end
 
 				-- Right side iterations
-				if (rightMsg and (rightMsg ~= "")) then 
+				if (rightMsg and (rightMsg ~= "")) then
 
 					-- search for range
-					if (not foundRange) then 
+					if (not foundRange) then
 						local id = 1
-						while Patterns["Range"..id] do 
-							if (string_find(rightMsg, Patterns["Range"..id])) then 
-						
+						while Patterns["Range"..id] do
+							if (string_find(rightMsg, Patterns["Range"..id])) then
+
 								-- found the range line
 								foundRange = lineIndex
 								tbl.spellRange = rightMsg
 
-								if (lastInfoLine < foundRange) then 
+								if (lastInfoLine < foundRange) then
 									lastInfoLine = foundRange
-								end 
-	
+								end
+
 								-- if there is something on the left side, it's the cost
-								if (not foundCost) then 
-									if (leftMsg and (leftMsg ~= "")) then 
+								if (not foundCost) then
+									if (leftMsg and (leftMsg ~= "")) then
 										foundCost = lineIndex
 										tbl.spellCost = leftMsg
-									end 
-								end 
+									end
+								end
 
 								break
-							end 
+							end
 							id = id + 1
-						end 
-					end 
+						end
+					end
 
-				end 
+				end
 
-			end 
+			end
 		end
 
-		-- Costs sometimes elude our previous filters. 
-		if (not foundCost) then 
+		-- Costs sometimes elude our previous filters.
+		if (not foundCost) then
 			for lineIndex = 2, (numLines < 4) and numLines or 4  do
 				left = _G[ScannerName.."TextLeft"..lineIndex]
-				if (left) then 
+				if (left) then
 					local leftMsg = left:GetText()
-					if (leftMsg and (leftMsg ~= "")) then 
-						-- We're working under the assumption that only range and 
+					if (leftMsg and (leftMsg ~= "")) then
+						-- We're working under the assumption that only range and
 						-- resource cost is displayed with an integer and a text.
 						-- The range can only be written in a few ways, and is easy to find,
 						-- meaning if there is no range, or the range is on another line,
 						-- this instance matching that search pattern should be the cost.
 						local cost,type = string_match(leftMsg, "^(%d+)%s(.+)$")
 						if (cost and type) and (not foundRange or foundRange ~= lineIndex) then
-						
+
 							-- found the cost line
 							foundCost = lineIndex
 							tbl.spellCost = leftMsg
 						end
 					end
 				end
-				-- Need to break here, or it will keep on parsing 
+				-- Need to break here, or it will keep on parsing
 				-- and use faulty lines as the spell cost. (e.g. Omen of Clarity, this bugged out)
-				if (foundCost) then 
+				if (foundCost) then
 					break
 				end
 			end
-		end 
+		end
 
-		-- Just assume all remaining lines are description, 
-		-- and bunch them together to a single line. 
-		if (numLines > lastInfoLine) then 
-			for lineIndex = lastInfoLine+1, numLines do 
+		-- Just assume all remaining lines are description,
+		-- and bunch them together to a single line.
+		if (numLines > lastInfoLine) then
+			for lineIndex = lastInfoLine+1, numLines do
 				left = _G[ScannerName.."TextLeft"..lineIndex]
-				if left and (lineIndex ~= foundRequirement) and (lineIndex ~= foundUnmetRequirement) then 
+				if left and (lineIndex ~= foundRequirement) and (lineIndex ~= foundUnmetRequirement) then
 					local msg = left:GetText()
 					if msg then
-						if tbl.description then 
-							if (msg == "") then 
+						if tbl.description then
+							if (msg == "") then
 								tbl.description = tbl.description .. "|n|n" -- empty line/space
-							else 
+							else
 								tbl.description = tbl.description .. "|n" .. msg -- normal line break
-							end 
-						else 
+							end
+						else
 							tbl.description = msg -- first line
-						end 
-					end 
-				end 
-			end 
-		end 
+						end
+					end
+				end
+			end
+		end
 
 		return validateResults(tbl)
-	end 
+	end
 
 end
 
 -- General method to populate the item info data table.
 -- As items can be part of multiple tooltip types, we use this for all of them.
--- Todo: avoid calling GetItemInfo() so many times through the proxies. 
+-- Todo: avoid calling GetItemInfo() so many times through the proxies.
 local SetItemData = function(itemLink, tbl)
-	
+
 	-- Get some blizzard info about the current item
 	local itemName, _itemLink, itemRarity, itemLevel, itemMinLevel, itemType, itemSubType, itemStackCount, itemEquipLoc, iconFileDataID, itemSellPrice, itemClassID, itemSubClassID, bindType, expacID, itemSetID, isCraftingReagent = GetItemInfo(itemLink)
 
@@ -902,7 +904,7 @@ local SetItemData = function(itemLink, tbl)
 	tbl.itemEquipLoc = itemEquipLoc
 	tbl.itemClassID = itemClassID
 	tbl.itemSubClassID = itemSubClassID
-	tbl.itemBindType = bindType 
+	tbl.itemBindType = bindType
 	tbl.itemSetID = itemSetID
 	tbl.isCraftingReagent = isCraftingReagent
 	tbl.itemArmor = itemStats and tonumber(itemStats.RESISTANCE0_NAME)
@@ -944,9 +946,9 @@ local SetItemData = function(itemLink, tbl)
 		-- acquire stats, add to own lines
 
 	-- Note: This could be done by an eventhandler, and stored.
-	-- Not a problem when only called for pure tooltip usage, 
-	-- but when used as info retrieval on hidden scanner tooltips, 
-	-- this could stack up to a micro lag we do not want. 
+	-- Not a problem when only called for pure tooltip usage,
+	-- but when used as info retrieval on hidden scanner tooltips,
+	-- this could stack up to a micro lag we do not want.
 	local primaryStatID, spec, role
 	if (IsRetail) then
 		spec = GetSpecialization()
@@ -956,45 +958,45 @@ local SetItemData = function(itemLink, tbl)
 		end
 
 		local primaryKey
-		if (primaryStatID == LE_UNIT_STAT_STRENGTH) then 
+		if (primaryStatID == LE_UNIT_STAT_STRENGTH) then
 			primaryKey = "ITEM_MOD_STRENGTH_SHORT"
 			tbl.primaryStatID = ITEM_MOD_STRENGTH_SHORT
 			tbl.primaryStatValue = itemStats and tonumber(itemStats.ITEM_MOD_STRENGTH_SHORT)
-		elseif (primaryStatID == LE_UNIT_STAT_AGILITY) then 
+		elseif (primaryStatID == LE_UNIT_STAT_AGILITY) then
 			primaryKey = "ITEM_MOD_AGILITY_SHORT"
 			tbl.primaryStatID = ITEM_MOD_AGILITY_SHORT
 			tbl.primaryStatValue = itemStats and tonumber(itemStats.ITEM_MOD_AGILITY_SHORT)
-		elseif (primaryStatID == LE_UNIT_STAT_INTELLECT) then 
+		elseif (primaryStatID == LE_UNIT_STAT_INTELLECT) then
 			primaryKey = "ITEM_MOD_INTELLECT_SHORT"
 			tbl.primaryStatID = ITEM_MOD_INTELLECT_SHORT
 			tbl.primaryStatValue = itemStats and tonumber(itemStats.ITEM_MOD_INTELLECT_SHORT)
-		end 
+		end
 		tbl.primaryStatKey = primaryKey
 	end
-	
+
 	local has2ndStats
 	if itemStats then
-		for key,value in pairs(itemStats) do 
-			if (isPrimaryStat[key] and (key ~= primaryKey)) then 
+		for key,value in pairs(itemStats) do
+			if (isPrimaryStat[key] and (key ~= primaryKey)) then
 				tbl.primaryStats[key] = value
-			end 
-			if (isSecondaryStat[key]) then 
+			end
+			if (isSecondaryStat[key]) then
 				tbl.secondaryStats[key] = value
 				has2ndStats = true
-			end 
-		end 
-	end 
+			end
+		end
+	end
 
 	-- make a sort table of secondary stats
-	if has2ndStats then 
+	if has2ndStats then
 		tbl.sorted2ndStats = {}
-		for i,key in pairs(sorted2ndStats) do 
+		for i,key in pairs(sorted2ndStats) do
 			local value = tbl.secondaryStats[key]
-			if value then 
+			if value then
 				tbl.sorted2ndStats[#tbl.sorted2ndStats + 1] = string_format("%s %s", (value > 0) and ("+"..tostring(value)) or tostring(value), _G[key])
-			end 
-		end 
-	end 
+			end
+		end
+	end
 
 	-- Get the item level
 	local line = _G[ScannerName.."TextLeft2"]
@@ -1021,69 +1023,69 @@ local SetItemData = function(itemLink, tbl)
 	end
 
 	local foundItemBlock, foundItemBind, foundItemBound, foundItemUnique, foundItemDurability, foundItemDamage, foundItemSpeed, foundItemSellPrice, foundItemReqLevel, foundUseEffect, foundEquipEffect, foundClickable
-				
+
 	local numLines = Scanner:NumLines()
 	local firstLine, lastLine = 2, numLines
 
-	for lineIndex = 2,numLines do 
+	for lineIndex = 2,numLines do
 		local line = _G[ScannerName.."TextLeft"..lineIndex]
-		if line then 
+		if line then
 			local msg = line:GetText()
-			if msg then 
+			if msg then
 
 				-- clean away color codes
 				msg = clearColors(msg)
 
-				-- item damage 
-				if ((not foundItemDamage) and (string_find(msg, Patterns.ItemDamage))) then 
+				-- item damage
+				if ((not foundItemDamage) and (string_find(msg, Patterns.ItemDamage))) then
 					local min,max = string_match(msg, Patterns.ItemDamage)
-					if (max) then 
+					if (max) then
 						foundItemDamage = lineIndex
 						tbl.itemDamageMin = tonumber(min)
 						tbl.itemDamageMax = tonumber(max)
-						if (not foundItemSpeed) then 
+						if (not foundItemSpeed) then
 							local line = _G[ScannerName.."TextRight"..lineIndex]
-							if line then 
+							if line then
 								local msg = line:GetText()
-								if msg then 
+								if msg then
 									local int,float = string_match(msg, "(%d+)%.(%d+)")
-									if (int or float) then 
-										if (lineIndex >= firstLine) then 
+									if (int or float) then
+										if (lineIndex >= firstLine) then
 											firstLine = lineIndex + 1
-										end 
+										end
 										foundItemSpeed = lineIndex
 										tbl.itemSpeed = int .. "." .. (float or 00)
-									end 
-								end 
-							end 
-						end 
-					end 
-				end 
+									end
+								end
+							end
+						end
+					end
+				end
 
 				-- item durability
-				if ((not foundItemDurability) and (string_find(msg, Patterns.ItemDurability))) then 
+				if ((not foundItemDurability) and (string_find(msg, Patterns.ItemDurability))) then
 					local min,max = string_match(msg, Patterns.ItemDurability)
-					if (max) then 
-						if (lineIndex <= lastLine) then 
+					if (max) then
+						if (lineIndex <= lastLine) then
 							lastLine = lineIndex - 1
-						end 
+						end
 						foundItemDurability = lineIndex
 						tbl.itemDurability = tonumber(min)
 						tbl.itemDurabilityMax = tonumber(max)
-					end 
-				end 
+					end
+				end
 
 				-- shield block isn't included in the itemstats table for some reason
-				if ((not foundItemBlock) and (string_find(msg, Patterns.ItemBlock))) then 
+				if ((not foundItemBlock) and (string_find(msg, Patterns.ItemBlock))) then
 					local itemBlock = tonumber(string_match(msg, Patterns.ItemBlock))
-					if (itemBlock and (itemBlock ~= 0)) then 
-						if (lineIndex >= firstLine) then 
+					if (itemBlock and (itemBlock ~= 0)) then
+						if (lineIndex >= firstLine) then
 							firstLine = lineIndex + 1
-						end 
+						end
 						foundItemBlock = lineIndex
 						tbl.itemBlock = itemBlock
-					end 
-				end 
+					end
+				end
 
 				--TRANSMOGRIFIED = "Transmogrified to:\n%s"
 				--TRANSMOGRIFIED_ENCHANT = "Illusion: %s"
@@ -1094,11 +1096,11 @@ local SetItemData = function(itemLink, tbl)
 				-- item clickable
 				if (not foundClickable) then
 					local id = 1
-					while Patterns["ItemClickable"..id] do 
-						if (string_find(msg, Patterns["ItemClickable"..id])) then 
-							if (lineIndex >= firstLine) then 
+					while Patterns["ItemClickable"..id] do
+						if (string_find(msg, Patterns["ItemClickable"..id])) then
+							if (lineIndex >= firstLine) then
 								firstLine = lineIndex + 1
-							end 
+							end
 
 							-- found the bind line
 							foundClickable = lineIndex
@@ -1111,19 +1113,19 @@ local SetItemData = function(itemLink, tbl)
 							end
 
 							break
-						end 
+						end
 						id = id + 1
 					end
 				end
 
 				-- item bound to
-				if (not foundItemBound) then 
+				if (not foundItemBound) then
 					local id = 1
-					while Patterns["ItemBound"..id] do 
-						if (string_find(msg, Patterns["ItemBound"..id])) then 
-							if (lineIndex >= firstLine) then 
+					while Patterns["ItemBound"..id] do
+						if (string_find(msg, Patterns["ItemBound"..id])) then
+							if (lineIndex >= firstLine) then
 								firstLine = lineIndex + 1
-							end 
+							end
 
 							-- found the bind line
 							foundItemBound = lineIndex
@@ -1131,19 +1133,19 @@ local SetItemData = function(itemLink, tbl)
 							tbl.itemIsBound = true
 
 							break
-						end 
+						end
 						id = id + 1
-					end 
-				end 
+					end
+				end
 
 				-- item binds when
 				if (not foundItemBound) and (not foundItemBind) and ((bindType == 1) or (bindType == 2) or (bindType == 3)) then
 					local id = 1
-					while Patterns["ItemBind"..id] do 
-						if (string_find(msg, Patterns["ItemBind"..id])) then 
-							if (lineIndex >= firstLine) then 
+					while Patterns["ItemBind"..id] do
+						if (string_find(msg, Patterns["ItemBind"..id])) then
+							if (lineIndex >= firstLine) then
 								firstLine = lineIndex + 1
-							end 
+							end
 
 							-- found the bind line
 							foundItemBind = lineIndex
@@ -1153,81 +1155,81 @@ local SetItemData = function(itemLink, tbl)
 							tbl.itemCanBind = true
 
 							break
-						end 
+						end
 						id = id + 1
-					end 
-				end 
+					end
+				end
 
 				-- item unique stats
-				if (not foundItemUnique) then 
+				if (not foundItemUnique) then
 					local id = 1
-					while Patterns["ItemUnique"..id] do 
-						if (string_find(msg, Patterns["ItemUnique"..id])) then 
-							if (lineIndex >= firstLine) then 
-								firstLine = lineIndex + 1 
-							end 
-							
+					while Patterns["ItemUnique"..id] do
+						if (string_find(msg, Patterns["ItemUnique"..id])) then
+							if (lineIndex >= firstLine) then
+								firstLine = lineIndex + 1
+							end
+
 							-- found the unique line
 							foundItemUnique = lineIndex
 							tbl.itemUnique = msg
 							tbl.itemIsUnique = true
 
 							break
-						end 
+						end
 						id = id + 1
-					end 
-				end 
+					end
+				end
 
-				-- item Use effect. Can only be one. I think. 
-				if ((not foundUseEffect) and (string_find(msg, Patterns.ItemUseEffect))) then 
+				-- item Use effect. Can only be one. I think.
+				if ((not foundUseEffect) and (string_find(msg, Patterns.ItemUseEffect))) then
 					foundUseEffect = lineIndex
 					tbl.itemUseEffect = msg
 					tbl.itemHasUseEffect = true
-				end 
+				end
 
 				-- Items can have multiple Equip effects
-				--if ((not foundEquipEffect) and (string_find(msg, Patterns.ItemEquipEffect))) then 
-				if (string_find(msg, Patterns.ItemEquipEffect)) then 
-					if (not tbl.itemEquipEffects) then 
+				--if ((not foundEquipEffect) and (string_find(msg, Patterns.ItemEquipEffect))) then
+				if (string_find(msg, Patterns.ItemEquipEffect)) then
+					if (not tbl.itemEquipEffects) then
 						tbl.itemEquipEffects = {}
-					end 
+					end
 					if (not foundEquipEffect) then
 						foundEquipEffect = {}
-					end  
+					end
 					foundEquipEffect[#foundEquipEffect + 1] = lineIndex
 					tbl.itemEquipEffects[#tbl.itemEquipEffects + 1] = msg
 					tbl.itemHasEquipEffect = true
-				end 
+				end
 
 				-- item sell price
 				-- *we don't retrieve this from here, but need to know the line number
-				if ((not foundItemSellPrice) and (string_find(msg, Patterns.ItemSellPrice))) then 
-					if (lineIndex <= lastLine) then 
+				if ((not foundItemSellPrice) and (string_find(msg, Patterns.ItemSellPrice))) then
+					if (lineIndex <= lastLine) then
 						lastLine = lineIndex - 1
-					end 
+					end
 					foundItemSellPrice = lineIndex
-				end 
+				end
 
 				-- item required level
 				-- *we don't retrieve this from here, but need to know the line number
-				if ((not foundItemReqLevel) and (string_find(msg, Patterns.ItemReqLevel))) then 
-					if (lineIndex <= lastLine) then 
+				if ((not foundItemReqLevel) and (string_find(msg, Patterns.ItemReqLevel))) then
+					if (lineIndex <= lastLine) then
 						lastLine = lineIndex - 1
-					end 
+					end
 					foundItemReqLevel = lineIndex
-				end 
+				end
 
-			end 
-		end 
-	end 
+			end
+		end
+	end
 
 	-- Figure out a description for select items
 	if (itemClassID == LE_ITEM_CLASS_MISCELLANEOUS) -- 15
-	or (itemClassID == LE_ITEM_CLASS_CONSUMABLE) -- 0 
+	or (itemClassID == LE_ITEM_CLASS_CONSUMABLE) -- 0
 	or (itemClassID == LE_ITEM_CLASS_QUESTITEM) -- 12
 	or (itemClassID == LE_ITEM_CLASS_TRADEGOODS) -- 7
-	then 
-		for lineIndex = firstLine, lastLine do 
+	then
+		for lineIndex = firstLine, lastLine do
 			if (lineIndex ~= foundItemBlock)
 				and (lineIndex ~= foundItemBind)
 				and (lineIndex ~= foundItemBound)
@@ -1238,21 +1240,21 @@ local SetItemData = function(itemLink, tbl)
 				and (lineIndex ~= foundItemSellPrice)
 				and (lineIndex ~= foundItemReqLevel)
 				and (lineIndex ~= foundUseEffect)
-			then 
+			then
 				local skip
-				if foundEquipEffect then 
-					for lineID in pairs(foundEquipEffect) do 
-						if (lineID == lineIndex) then 
-							skip = true 
-							break 
+				if foundEquipEffect then
+					for lineID in pairs(foundEquipEffect) do
+						if (lineID == lineIndex) then
+							skip = true
+							break
 						end
 					end
-				end 
-				if (not skip) then 
+				end
+				if (not skip) then
 					local line = _G[ScannerName.."TextLeft"..lineIndex]
-					if line then 
+					if line then
 						local msg = line:GetText()
-						if (msg and (msg ~= "") and (msg ~= " ")) then 
+						if (msg and (msg ~= "") and (msg ~= " ")) then
 							local ignore
 							msg = clearColors(msg)
 							for i,v in pairs(Constants) do
@@ -1262,17 +1264,17 @@ local SetItemData = function(itemLink, tbl)
 								end
 							end
 							if (not ignore) then
-								if (not tbl.itemDescription) then 
+								if (not tbl.itemDescription) then
 									tbl.itemDescription = {}
-								end 
+								end
 								tbl.itemDescription[#tbl.itemDescription + 1] = msg
 							end
-						end 
-					end 
-				end 
+						end
+					end
+				end
 			end
-		end 
-	end 
+		end
+	end
 
 	return tbl
 
@@ -1287,44 +1289,44 @@ LibTooltipScanner.GetTooltipDataForActionItem = function(self, actionSlot, tbl)
 	Scanner.owner = UIParent
 	Scanner:SetOwner(UIParent, "ANCHOR_NONE")
 
-	--  Blizz Action Tooltip Structure: 
+	--  Blizz Action Tooltip Structure:
 	--  *the order is consistent, bracketed elements optional
-	--  
+	--
 	--------------------------------------------
 	--	Name                    [School/Type] --
 	--	[Cost]                        [Range] --
 	--	[CastTime]             [CooldownTime] --
-	--	[Cooldown/Chargetime remaining      ] -- 
+	--	[Cooldown/Chargetime remaining      ] --
 	--	[                                   ] --
 	--	[            Description            ] --
 	--	[                                   ] --
 	--	[Resource awarded / Max charges     ] --
 	--------------------------------------------
 
-	if HasAction(actionSlot) then 
+	if HasAction(actionSlot) then
 		Scanner:SetAction(actionSlot)
 
 		tbl = tbl or {}
-		for i,v in pairs(tbl) do 
+		for i,v in pairs(tbl) do
 			tbl[i] = nil
-		end 
+		end
 
 		local itemName, itemLink = Scanner:GetItem()
-		if (not itemName) then 
-			return 
-		end 
+		if (not itemName) then
+			return
+		end
 
 		tbl = SetItemData(itemLink, tbl)
 
 		return validateResults(tbl)
-	end 
-end 
+	end
+end
 
 LibTooltipScanner.GetTooltipDataForPetAction = function(self, actionSlot, tbl)
 
 	local name, texture, isToken, isActive, autoCastAllowed, autoCastEnabled, spellID = GetPetActionInfo(actionSlot)
-	if name then 
-		
+	if name then
+
 		-- Initiate the scanner tooltip
 		Scanner:Hide()
 		Scanner.owner = UIParent
@@ -1332,9 +1334,9 @@ LibTooltipScanner.GetTooltipDataForPetAction = function(self, actionSlot, tbl)
 		Scanner:SetPetAction(actionSlot)
 
 		tbl = tbl or {}
-		for i,v in pairs(tbl) do 
+		for i,v in pairs(tbl) do
 			tbl[i] = nil
-		end 
+		end
 
 		tbl.name = name
 		tbl.texture = texture
@@ -1345,17 +1347,17 @@ LibTooltipScanner.GetTooltipDataForPetAction = function(self, actionSlot, tbl)
 		tbl.spellID = spellID
 
 		local left, right
-	
+
 		-- Action Name
 		left = _G[ScannerName.."TextLeft1"]
-		if left:IsShown() then 
+		if left:IsShown() then
 			local msg = left:GetText()
-			if msg and (msg ~= "") then 
+			if msg and (msg ~= "") then
 				tbl.name = msg
-			else 
+			else
 				-- if the name isn't there, no point going on
 				return nil
-			end 
+			end
 		end
 
 		local foundCost, foundRange
@@ -1363,27 +1365,27 @@ LibTooltipScanner.GetTooltipDataForPetAction = function(self, actionSlot, tbl)
 		local foundRemainingCooldown, foundRemainingRecharge
 		local foundDescription
 		local foundResourceMod
-		
+
 		local numLines = Scanner:NumLines() -- total number of lines
 		local lastInfoLine = 1 -- The last line where information exists
 
 		-- Iterate available lines for action information
-		for lineIndex = 2, (numLines < 4) and numLines or 4  do 
+		for lineIndex = 2, (numLines < 4) and numLines or 4  do
 
 			left, right = _G[ScannerName.."TextLeft"..lineIndex],  _G[ScannerName.."TextRight"..lineIndex]
-			if (left and right) then 
+			if (left and right) then
 
 				local leftMsg, rightMsg = left:GetText(), right:GetText()
 
 				-- Left side iterations
-				if (leftMsg and (leftMsg ~= "")) then 
+				if (leftMsg and (leftMsg ~= "")) then
 
 					-- search for range
-					if (not foundRange) then 
+					if (not foundRange) then
 						local id = 1
-						while Patterns["Range"..id] do 
-							if (string_find(leftMsg, Patterns["Range"..id])) then 
-							
+						while Patterns["Range"..id] do
+							if (string_find(leftMsg, Patterns["Range"..id])) then
+
 								-- found the range line
 								foundRange = lineIndex
 								tbl.spellRange = leftMsg
@@ -1392,149 +1394,149 @@ LibTooltipScanner.GetTooltipDataForPetAction = function(self, actionSlot, tbl)
 								-- it has no cost if the range is on this side
 								foundCost = true
 
-								if (lastInfoLine < foundRange) then 
+								if (lastInfoLine < foundRange) then
 									lastInfoLine = foundRange
-								end 
-	
+								end
+
 								break
-							end 
+							end
 							id = id + 1
-						end 
-					end 
+						end
+					end
 
 					-- search for cast time
-					if (not foundCastTime) then 
+					if (not foundCastTime) then
 						local id = 1
-						while Patterns["CastTime"..id] do 
-							if (string_find(leftMsg, Patterns["CastTime"..id])) then 
+						while Patterns["CastTime"..id] do
+							if (string_find(leftMsg, Patterns["CastTime"..id])) then
 
 								-- found the range line
 								foundCastTime = lineIndex
 								tbl.castTime = leftMsg
 
-								if (lastInfoLine < foundCastTime) then 
+								if (lastInfoLine < foundCastTime) then
 									lastInfoLine = foundCastTime
-								end 
+								end
 
 								-- if there is something on the right side, it's the total cooldown
-								if (rightMsg and (rightMsg ~= "")) then 
+								if (rightMsg and (rightMsg ~= "")) then
 									foundCooldownTime = foundCooldownTime
 									tbl.cooldownTime = rightMsg
-								end  
+								end
 
 								break
-							end 
+							end
 							id = id + 1
-						end 
-					end 
+						end
+					end
 
-					--if (string_find(msg, Patterns.CooldownRemaining)) then 
-					--end 
+					--if (string_find(msg, Patterns.CooldownRemaining)) then
+					--end
 
-					--if (string_find(msg, SPELL_RECHARGE_TIME)) then 
-					--end 
+					--if (string_find(msg, SPELL_RECHARGE_TIME)) then
+					--end
 
 					-- Search for remaining cooldown, if one is active (?)
-					if (not foundRemainingCooldown) then 
+					if (not foundRemainingCooldown) then
 						local id = 1
-						while Patterns["CooldownTimeRemaining"..id] do 
-							if (string_find(leftMsg, Patterns["CooldownTimeRemaining"..id])) then 
+						while Patterns["CooldownTimeRemaining"..id] do
+							if (string_find(leftMsg, Patterns["CooldownTimeRemaining"..id])) then
 
 								-- Need this to figure out how far down the description starts!
 								foundRemainingCooldown = lineIndex
 
-								if (lastInfoLine < foundRemainingCooldown) then 
+								if (lastInfoLine < foundRemainingCooldown) then
 									lastInfoLine = foundRemainingCooldown
-								end 
+								end
 
 								-- *not needed, we're getting that from API calls above!
 								--tbl.cooldownTimeRemaining = leftMsg
 
 								break
-							end 
+							end
 							id = id + 1
-						end 
-					end  
+						end
+					end
 
 					-- Search for remaining cooldown, if one is active (?)
-					if (not foundRemainingRecharge) then 
+					if (not foundRemainingRecharge) then
 						local id = 1
-						while Patterns["RechargeTimeRemaining"..id] do 
-							if (string_find(leftMsg, Patterns["RechargeTimeRemaining"..id])) then 
+						while Patterns["RechargeTimeRemaining"..id] do
+							if (string_find(leftMsg, Patterns["RechargeTimeRemaining"..id])) then
 
 								-- Need this to figure out how far down the description starts!
 								foundRemainingRecharge = lineIndex
 
-								if (lastInfoLine < foundRemainingRecharge) then 
+								if (lastInfoLine < foundRemainingRecharge) then
 									lastInfoLine = foundRemainingRecharge
-								end 
+								end
 
 								-- *not needed, we're getting that from API calls above!
 								--tbl.rechargeTimeRemaining = leftMsg
 
 								break
-							end 
+							end
 							id = id + 1
-						end 
-					end  
-					
-				end 
+						end
+					end
+
+				end
 
 				-- Right side iterations
-				if (rightMsg and (rightMsg ~= "")) then 
+				if (rightMsg and (rightMsg ~= "")) then
 
 					-- search for range
-					if (not foundRange) then 
+					if (not foundRange) then
 						local id = 1
-						while Patterns["Range"..id] do 
-							if (string_find(rightMsg, Patterns["Range"..id])) then 
-							
+						while Patterns["Range"..id] do
+							if (string_find(rightMsg, Patterns["Range"..id])) then
+
 								-- found the range line
 								foundRange = lineIndex
 								tbl.spellRange = rightMsg
 
-								if (lastInfoLine < foundRange) then 
+								if (lastInfoLine < foundRange) then
 									lastInfoLine = foundRange
-								end 
-	
+								end
+
 								-- if there is something on the left side, it's the cost
-								if (leftMsg and (leftMsg ~= "")) then 
+								if (leftMsg and (leftMsg ~= "")) then
 									foundCost = lineIndex
 									tbl.spellCost = leftMsg
-								end  
+								end
 
 								break
-							end 
+							end
 							id = id + 1
-						end 
-					end 
+						end
+					end
 
-				end 
+				end
 
-			end 
+			end
 		end
 
-		-- Just assume all remaining lines are description, 
-		-- and bunch them together to a single line. 
-		if (numLines > lastInfoLine) then 
-			for lineIndex = lastInfoLine+1, numLines do 
+		-- Just assume all remaining lines are description,
+		-- and bunch them together to a single line.
+		if (numLines > lastInfoLine) then
+			for lineIndex = lastInfoLine+1, numLines do
 				left = _G[ScannerName.."TextLeft"..lineIndex]
-				if left then 
+				if left then
 					local msg = left:GetText()
 					if msg then
-						if tbl.description then 
-							if (msg == "") then 
+						if tbl.description then
+							if (msg == "") then
 								tbl.description = tbl.description .. "|n|n" -- empty line/space
-							else 
+							else
 								tbl.description = tbl.description .. "|n" .. msg -- normal line break
-							end 
-						else 
+							end
+						else
 							tbl.description = msg -- first line
-						end 
-					end 
-				end 
-			end 
-		end 
+						end
+					end
+				end
+			end
+		end
 
 		return validateResults(tbl)
 	end
@@ -1542,7 +1544,7 @@ end
 
 LibTooltipScanner.GetTooltipDataForSpellID = function(self, spellID, tbl)
 
-	if (spellID and DoesSpellExist(spellID)) then 
+	if (spellID and DoesSpellExist(spellID)) then
 		-- Initiate the scanner tooltip
 		Scanner:Hide()
 		Scanner.owner = UIParent
@@ -1550,15 +1552,15 @@ LibTooltipScanner.GetTooltipDataForSpellID = function(self, spellID, tbl)
 		Scanner:SetSpellByID(spellID)
 
 		tbl = tbl or {}
-		for i,v in pairs(tbl) do 
+		for i,v in pairs(tbl) do
 			tbl[i] = nil
-		end 
+		end
 
 		local name, _, icon, castTime, minRange, maxRange, spellId = GetSpellInfo(spellID)
-		if name then 
+		if name then
 			tbl.name = name
-			tbl.icon = icon 
-			tbl.castTime = castTime 
+			tbl.icon = icon
+			tbl.castTime = castTime
 			tbl.minRange = minRange
 			tbl.maxRange = maxRange
 			tbl.spellID = spellID
@@ -1567,51 +1569,51 @@ LibTooltipScanner.GetTooltipDataForSpellID = function(self, spellID, tbl)
 
 			-- Action Name
 			left = _G[ScannerName.."TextLeft1"]
-			if left:IsShown() then 
+			if left:IsShown() then
 				local msg = left:GetText()
-				if msg and (msg ~= "") then 
+				if msg and (msg ~= "") then
 					tbl.name = msg
-				else 
+				else
 					-- if the name isn't there, no point going on
 					return nil
-				end 
+				end
 			end
 
 			-- Spell school / Spell Type (could be "Racial")
 			right = _G[ScannerName.."TextRight1"]
-			if right:IsShown() then 
+			if right:IsShown() then
 				local msg = right:GetText()
-				if msg and (msg ~= "") then 
+				if msg and (msg ~= "") then
 					tbl.schoolType = msg
-				end 
-			end 
-			
+				end
+			end
+
 			local foundCost, foundRange
 			local foundCastTime, foundCooldownTime
 			local foundRemainingCooldown, foundRemainingRecharge
 			local foundDescription
 			local foundResourceMod
-			
+
 			local numLines = Scanner:NumLines() -- total number of lines
 			local lastInfoLine = 1 -- The last line where information exists
 
 			-- Iterate available lines for action information
-			for lineIndex = 2, (numLines < 4) and numLines or 4  do 
+			for lineIndex = 2, (numLines < 4) and numLines or 4  do
 
 				left, right = _G[ScannerName.."TextLeft"..lineIndex],  _G[ScannerName.."TextRight"..lineIndex]
-				if (left and right) then 
+				if (left and right) then
 
 					local leftMsg, rightMsg = left:GetText(), right:GetText()
 
 					-- Left side iterations
-					if (leftMsg and (leftMsg ~= "")) then 
+					if (leftMsg and (leftMsg ~= "")) then
 
 						-- search for range
-						if (not foundRange) then 
+						if (not foundRange) then
 							local id = 1
-							while Patterns["Range"..id] do 
-								if (string_find(leftMsg, Patterns["Range"..id])) then 
-								
+							while Patterns["Range"..id] do
+								if (string_find(leftMsg, Patterns["Range"..id])) then
+
 									-- found the range line
 									foundRange = lineIndex
 									tbl.spellRange = leftMsg
@@ -1620,160 +1622,160 @@ LibTooltipScanner.GetTooltipDataForSpellID = function(self, spellID, tbl)
 									-- it has no cost if the range is on this side
 									foundCost = true
 
-									if (lastInfoLine < foundRange) then 
+									if (lastInfoLine < foundRange) then
 										lastInfoLine = foundRange
-									end 
-		
+									end
+
 									break
-								end 
+								end
 								id = id + 1
-							end 
-						end 
+							end
+						end
 
 						-- search for cast time
-						if (not foundCastTime) then 
+						if (not foundCastTime) then
 							local id = 1
-							while Patterns["CastTime"..id] do 
-								if (string_find(leftMsg, Patterns["CastTime"..id])) then 
+							while Patterns["CastTime"..id] do
+								if (string_find(leftMsg, Patterns["CastTime"..id])) then
 
 									-- found the range line
 									foundCastTime = lineIndex
 									tbl.castTime = leftMsg
 
-									if (lastInfoLine < foundCastTime) then 
+									if (lastInfoLine < foundCastTime) then
 										lastInfoLine = foundCastTime
-									end 
+									end
 
 									-- if there is something on the right side, it's the total cooldown
-									if (rightMsg and (rightMsg ~= "")) then 
+									if (rightMsg and (rightMsg ~= "")) then
 										foundCooldownTime = foundCooldownTime
 										tbl.cooldownTime = rightMsg
-									end  
+									end
 
 									break
-								end 
+								end
 								id = id + 1
-							end 
-						end 
+							end
+						end
 
-						--if (string_find(msg, Patterns.CooldownRemaining)) then 
-						--end 
+						--if (string_find(msg, Patterns.CooldownRemaining)) then
+						--end
 
-						--if (string_find(msg, SPELL_RECHARGE_TIME)) then 
-						--end 
+						--if (string_find(msg, SPELL_RECHARGE_TIME)) then
+						--end
 
 						-- Search for remaining cooldown, if one is active (?)
-						if (not foundRemainingCooldown) then 
+						if (not foundRemainingCooldown) then
 							local id = 1
-							while Patterns["CooldownTimeRemaining"..id] do 
-								if (string_find(leftMsg, Patterns["CooldownTimeRemaining"..id])) then 
+							while Patterns["CooldownTimeRemaining"..id] do
+								if (string_find(leftMsg, Patterns["CooldownTimeRemaining"..id])) then
 
 									-- Need this to figure out how far down the description starts!
 									foundRemainingCooldown = lineIndex
 
-									if (lastInfoLine < foundRemainingCooldown) then 
+									if (lastInfoLine < foundRemainingCooldown) then
 										lastInfoLine = foundRemainingCooldown
-									end 
+									end
 
 									-- *not needed, we're getting that from API calls above!
 									--tbl.cooldownTimeRemaining = leftMsg
 
 									break
-								end 
+								end
 								id = id + 1
-							end 
-						end  
+							end
+						end
 
 						-- Search for remaining cooldown, if one is active (?)
-						if (not foundRemainingRecharge) then 
+						if (not foundRemainingRecharge) then
 							local id = 1
-							while Patterns["RechargeTimeRemaining"..id] do 
-								if (string_find(leftMsg, Patterns["RechargeTimeRemaining"..id])) then 
+							while Patterns["RechargeTimeRemaining"..id] do
+								if (string_find(leftMsg, Patterns["RechargeTimeRemaining"..id])) then
 
 									-- Need this to figure out how far down the description starts!
 									foundRemainingRecharge = lineIndex
 
-									if (lastInfoLine < foundRemainingRecharge) then 
+									if (lastInfoLine < foundRemainingRecharge) then
 										lastInfoLine = foundRemainingRecharge
-									end 
+									end
 
 									-- *not needed, we're getting that from API calls above!
 									--tbl.rechargeTimeRemaining = leftMsg
 
 									break
-								end 
+								end
 								id = id + 1
-							end 
-						end  
-						
-					end 
+							end
+						end
+
+					end
 
 					-- Right side iterations
-					if (rightMsg and (rightMsg ~= "")) then 
+					if (rightMsg and (rightMsg ~= "")) then
 
 						-- search for range
-						if (not foundRange) then 
+						if (not foundRange) then
 							local id = 1
-							while Patterns["Range"..id] do 
-								if (string_find(rightMsg, Patterns["Range"..id])) then 
-								
+							while Patterns["Range"..id] do
+								if (string_find(rightMsg, Patterns["Range"..id])) then
+
 									-- found the range line
 									foundRange = lineIndex
 									tbl.spellRange = rightMsg
 
-									if (lastInfoLine < foundRange) then 
+									if (lastInfoLine < foundRange) then
 										lastInfoLine = foundRange
-									end 
-		
+									end
+
 									-- if there is something on the left side, it's the cost
-									if (leftMsg and (leftMsg ~= "")) then 
+									if (leftMsg and (leftMsg ~= "")) then
 										foundCost = lineIndex
 										tbl.spellCost = leftMsg
-									end  
+									end
 
 									break
-								end 
+								end
 								id = id + 1
-							end 
-						end 
+							end
+						end
 
-					end 
+					end
 
-				end 
+				end
 			end
 
-			-- Just assume all remaining lines are description, 
-			-- and bunch them together to a single line. 
-			if (numLines > lastInfoLine) then 
-				for lineIndex = lastInfoLine+1, numLines do 
+			-- Just assume all remaining lines are description,
+			-- and bunch them together to a single line.
+			if (numLines > lastInfoLine) then
+				for lineIndex = lastInfoLine+1, numLines do
 					left = _G[ScannerName.."TextLeft"..lineIndex]
-					if left then 
+					if left then
 						local msg = left:GetText()
 						if msg then
-							if tbl.description then 
-								if (msg == "") then 
+							if tbl.description then
+								if (msg == "") then
 									tbl.description = tbl.description .. "|n|n" -- empty line/space
-								else 
+								else
 									tbl.description = tbl.description .. "|n" .. msg -- normal line break
-								end 
-							else 
+								end
+							else
 								tbl.description = msg -- first line
-							end 
-						end 
-					end 
-				end 
-			end 
+							end
+						end
+					end
+				end
+			end
 
-		end 
+		end
 
 		return validateResults(tbl)
-	end 
+	end
 
 end
 
 LibTooltipScanner.GetTooltipDataForUnit = function(self, unit, tbl)
 
-	if UnitExists(unit) then 
+	if UnitExists(unit) then
 		-- Initiate the scanner tooltip
 		Scanner:Hide()
 		Scanner.owner = UIParent
@@ -1781,9 +1783,9 @@ LibTooltipScanner.GetTooltipDataForUnit = function(self, unit, tbl)
 		Scanner:SetUnit(unit)
 
 		tbl = tbl or {}
-		for i,v in pairs(tbl) do 
+		for i,v in pairs(tbl) do
 			tbl[i] = nil
-		end 
+		end
 
 		-- Retrieve generic data
 		local isPlayer = UnitIsPlayer(unit)
@@ -1802,7 +1804,7 @@ LibTooltipScanner.GetTooltipDataForUnit = function(self, unit, tbl)
 		-- Retrieve special data from the tooltip
 
 		-- Players
-		if (isPlayer) then 
+		if (isPlayer) then
 			local classDisplayName, class, classID = UnitClass(unit)
 			local englishFaction, localizedFaction = UnitFactionGroup(unit)
 			local guildName, guildRankName, guildRankIndex, realm = GetGuildInfo(unit)
@@ -1828,7 +1830,7 @@ LibTooltipScanner.GetTooltipDataForUnit = function(self, unit, tbl)
 			if (pvpRankNumber and pvpRanks[pvpRankNumber]) then
 				if (englishFaction == "Horde") then
 					pvpRankName = pvpRanks[pvpRankNumber][1]
-				elseif (englishFaction == "Alliance") then 
+				elseif (englishFaction == "Alliance") then
 					pvpRankName = pvpRanks[pvpRankNumber][2]
 				end
 			end
@@ -1857,9 +1859,9 @@ LibTooltipScanner.GetTooltipDataForUnit = function(self, unit, tbl)
 			tbl.inParty = inParty
 			tbl.inRaid = inRaid
 			tbl.uiMapID = uiMapID
-	
+
 		-- NPCs
-		else 
+		else
 
 			local englishFaction, localizedFaction = UnitFactionGroup(unit)
 			local reaction = UnitReaction(unit, "player")
@@ -1867,7 +1869,7 @@ LibTooltipScanner.GetTooltipDataForUnit = function(self, unit, tbl)
 			if (unitLevel < 0) then
 				classification = "worldboss"
 			end
-	
+
 			tbl.englishFaction = englishFaction
 			tbl.localizedFaction = localizedFaction
 			tbl.level = unitLevel
@@ -1880,44 +1882,44 @@ LibTooltipScanner.GetTooltipDataForUnit = function(self, unit, tbl)
 			end
 			tbl.isBoss = classification == "worldboss"
 
-			-- Flags to track what has been found, 
-			-- since things are always placed in a certain order. 
-			-- We'll be able to guesstimate what the content means by this. 
+			-- Flags to track what has been found,
+			-- since things are always placed in a certain order.
+			-- We'll be able to guesstimate what the content means by this.
 			local foundTitle, foundLevel, foundCity, foundPvP, foundLeader
 			local foundSkinnable, foundCivilian
 
 			local numLines = Scanner:NumLines()
-			for lineIndex = 2,numLines do 
+			for lineIndex = 2,numLines do
 				local line = _G[ScannerName.."TextLeft"..lineIndex]
-				if line then 
+				if line then
 					local msg = line:GetText()
-					if msg then 
-						if (string_find(msg, Patterns.Level)) then 
+					if msg then
+						if (string_find(msg, Patterns.Level)) then
 
 							foundLevel = lineIndex
 
 							-- We found the level, let's backtrack to figure out the title!
-							if (not foundTitle) and (lineIndex > 2) then 
+							if (not foundTitle) and (lineIndex > 2) then
 								foundTitle = lineIndex - 1
 								tbl.title = _G[ScannerName.."TextLeft"..foundTitle]:GetText()
-							end 
-						end 
+							end
+						end
 
-						if (msg == PVP_RANK_CIVILIAN) and (not foundCivilian) then 
+						if (msg == PVP_RANK_CIVILIAN) and (not foundCivilian) then
 							tbl.isCivilian = true
 							tbl.civilianColor = { line:GetTextColor() }
 							foundCivilian = lineIndex
 						end
-			
+
 						if (msg == PVP_ENABLED) and (not foundPvP) then
 							tbl.isPvPEnabled = true
 							foundPvP = lineIndex
 
 							-- We found PvP, is there a city line between this and level?
-							if (not foundCity) and (foundLevel) and (lineIndex > foundLevel + 1) then 
+							if (not foundCity) and (foundLevel) and (lineIndex > foundLevel + 1) then
 								foundCity = lineIndex - 1
 								tbl.city = _G[ScannerName.."TextLeft"..foundCity]:GetText()
-							end 
+							end
 						end
 
 						if (msg == FACTION_ALLIANCE) or (msg == FACTION_HORDE) then
@@ -1925,26 +1927,26 @@ LibTooltipScanner.GetTooltipDataForUnit = function(self, unit, tbl)
 						end
 
 						-- search for range
-						if (not foundSkinnable) then 
+						if (not foundSkinnable) then
 							local id = 1
-							while Patterns["UnitSkinnable"..id] do 
-								if (string_find(msg, Patterns["UnitSkinnable"..id])) then 
-								
+							while Patterns["UnitSkinnable"..id] do
+								if (string_find(msg, Patterns["UnitSkinnable"..id])) then
+
 									-- found the range line
 									foundSkinnable = lineIndex
 									tbl.skinnableMsg = msg
 									tbl.skinnableColor = { line:GetTextColor() }
 									tbl.isSkinnable = true
 									break
-								end 
+								end
 								id = id + 1
-							end 
-						end 
+							end
+						end
 
-					end 
-				end 
-			end 
-		end 
+					end
+				end
+			end
+		end
 
 		-- Textures
 		local objectives = {}
@@ -1957,18 +1959,23 @@ LibTooltipScanner.GetTooltipDataForUnit = function(self, unit, tbl)
 			local texPath = texture:GetTexture()
 
 			local hasObjective, objectiveType
-			if (texPath == 3083385) then -- Incomplete objective
-				hasObjective = true
-				objectiveType = "incomplete"
-			elseif (texPath == 628564) then -- Completed objective
-				hasObjective = true
-				objectiveType = "complete"
-			else
-				local texID = tonumber(texPath) or 0
-				if (texID ~= 0) then
-					print(string_format("|cffffd200LibTooltipScanner:|r |cfff0f0f0Unhandled textureID |r'|cff33aa33%d|r'.", texPath))
+			if not(IsClassic or IsTBC or IsWrath) then
+				if (texPath == 3083385) then -- Incomplete objective
+					hasObjective = true
+					objectiveType = "incomplete"
+				elseif (texPath == 628564) then -- Completed objective
+					hasObjective = true
+					objectiveType = "complete"
+				elseif (texPath == 237631) then -- Something in Wrath...?
+					--hasObjective = true
+					--objectiveType = "complete"
+				else
+					--local texID = tonumber(texPath) or 0
+					--if (texID ~= 0) then
+					--	print(string_format("|cffffd200LibTooltipScanner:|r |cfff0f0f0Unhandled textureID |r'|cff33aa33%d|r'.", texPath))
+					--end
 				end
-			end 
+			end
 
 			if (hasObjective) then
 				local _,textLine = texture:GetPoint()
@@ -2009,7 +2016,7 @@ LibTooltipScanner.GetTooltipDataForUnit = function(self, unit, tbl)
 		end
 
 		-- Check for Questie data
-		if (IsClassic or IsTBC) and (Questie) then
+		if (IsAnyClassic and Questie) then
 
 			-- Only do this if the Questie
 			-- tooltip option is enabled(?)
@@ -2048,10 +2055,10 @@ LibTooltipScanner.GetTooltipDataForUnit = function(self, unit, tbl)
 
 										-- Set a new local objective ID
 										objectiveID = #objectives + 1
-										objectives[objectiveID] = { 
-											questTitle = objectiveTitle, 
-											questLevel = objectiveLevel, 
-											questObjectives = {} 
+										objectives[objectiveID] = {
+											questTitle = objectiveTitle,
+											questLevel = objectiveLevel,
+											questObjectives = {}
 										}
 
 									else
@@ -2097,8 +2104,8 @@ LibTooltipScanner.GetTooltipDataForUnit = function(self, unit, tbl)
 									end
 
 								end
-							
-								
+
+
 							end
 						end
 					end
@@ -2111,26 +2118,26 @@ LibTooltipScanner.GetTooltipDataForUnit = function(self, unit, tbl)
 		end
 
 		return validateResults(tbl)
-	end 
+	end
 end
 
 -- Will only return generic data based on mere itemID, no special instances of the item.
--- This is basically just a proxy for GetTooltipDataForItemLink. 
+-- This is basically just a proxy for GetTooltipDataForItemLink.
 LibTooltipScanner.GetTooltipDataForItemID = function(self, itemID, tbl)
 
 	local itemName, itemLink, itemRarity, itemLevel, itemMinLevel, itemType, itemSubType, itemStackCount, itemEquipLoc, iconFileDataID, itemSellPrice, itemClassID, itemSubClassID, bindType, expacID, itemSetID, isCraftingReagent = GetItemInfo(itemID)
 
-	if itemName then 
+	if itemName then
 		return self:GetTooltipDataForItemLink(itemLink, tbl)
 	end
 end
 
 -- Returns specific data for the specific itemLink
 -- TODO: Add in everything from GetTooltipDataForActionItem()
--- TODO: Add in scanning for sets, enchants, and descriptions. 
+-- TODO: Add in scanning for sets, enchants, and descriptions.
 LibTooltipScanner.GetTooltipDataForItemLink = function(self, itemLink, tbl)
 
-	if itemLink then 
+	if itemLink then
 		-- Initiate the scanner tooltip
 		Scanner:Hide()
 		Scanner.owner = UIParent
@@ -2138,9 +2145,9 @@ LibTooltipScanner.GetTooltipDataForItemLink = function(self, itemLink, tbl)
 		Scanner:SetHyperlink(itemLink)
 
 		tbl = tbl or {}
-		for i,v in pairs(tbl) do 
+		for i,v in pairs(tbl) do
 			tbl[i] = nil
-		end 
+		end
 
 		tbl = SetItemData(itemLink, tbl)
 
@@ -2152,7 +2159,7 @@ LibTooltipScanner.GetTooltipDataForItemLink = function(self, itemLink, tbl)
 		--tbl.itemStackCount = itemStackCount
 
 		return validateResults(tbl)
-	end 
+	end
 end
 
 -- Returns data about the exact bag- or bank slot. Will return all current modifications.
@@ -2161,7 +2168,7 @@ LibTooltipScanner.GetTooltipDataForContainerSlot = function(self, bagID, slotID,
 	local itemIcon, itemCount, locked, quality, readable, lootable, itemLink, isFiltered, noValue, itemID = GetContainerItemInfo(bagID, slotID)
 
 	--local itemID = GetContainerItemID(bagID, slotID)
-	if (itemLink) then 
+	if (itemLink) then
 
 		-- Take care to only set the scanner here, do NOT reset it to an itemLink later.
 		Scanner:Hide()
@@ -2170,9 +2177,9 @@ LibTooltipScanner.GetTooltipDataForContainerSlot = function(self, bagID, slotID,
 		local hasCooldown, repairCost, speciesID, level, breedQuality, maxHealth, power, speed, name = Scanner:SetBagItem(bagID, slotID)
 
 		tbl = tbl or {}
-		for i,v in pairs(tbl) do 
+		for i,v in pairs(tbl) do
 			tbl[i] = nil
-		end 
+		end
 
 		if (itemLink) then
 
@@ -2188,7 +2195,7 @@ LibTooltipScanner.GetTooltipDataForContainerSlot = function(self, bagID, slotID,
 			if (string_find(itemLink, "battlepet:")) then
 				local _, speciesID, level, breedQuality, maxHealth, power, speed = strsplit(":", itemLink)
 				local name = itemLink:match("%[(.-)%]")
-				if (name) then 
+				if (name) then
 					tbl.speciesID = tonumber(speciesID)
 					tbl.maxHealth = tonumber(maxHealth)
 					tbl.power = tonumber(power)
@@ -2216,7 +2223,7 @@ LibTooltipScanner.GetTooltipDataForContainerSlot = function(self, bagID, slotID,
 		end
 
 		return validateResults(tbl)
-	end 
+	end
 
 end
 
@@ -2224,7 +2231,7 @@ end
 LibTooltipScanner.GetTooltipDataForGuildBankSlot = function(self, tabID, slotID, tbl)
 
 	local itemLink = GetGuildBankItemInfo(tabID, slotID)
-	if itemLink then 
+	if itemLink then
 		local texturePath, itemCount, locked, isFiltered = GetGuildBankItemInfo(tabID, slotID)
 
 		-- Initiate the scanner tooltip
@@ -2234,13 +2241,13 @@ LibTooltipScanner.GetTooltipDataForGuildBankSlot = function(self, tabID, slotID,
 		Scanner:SetGuildBankItem(tabID, slotID)
 
 		tbl = tbl or {}
-		for i,v in pairs(tbl) do 
+		for i,v in pairs(tbl) do
 			tbl[i] = nil
-		end 
+		end
 
 
 		return validateResults(tbl)
-	end 
+	end
 end
 
 -- Returns data about equipped items
@@ -2254,12 +2261,12 @@ LibTooltipScanner.GetTooltipDataForInventorySlot = function(self, unit, inventor
 	-- https://wow.gamepedia.com/InventorySlotId
 	local hasItem, hasCooldown, repairCost = Scanner:SetInventoryItem(unit, inventorySlotID)
 
-	if hasItem then 
+	if hasItem then
 
 		tbl = tbl or {}
-		for i,v in pairs(tbl) do 
+		for i,v in pairs(tbl) do
 			tbl[i] = nil
-		end 
+		end
 
 		return validateResults(tbl)
 	end
@@ -2279,20 +2286,20 @@ LibTooltipScanner.GetTooltipDataForInboxItem = function(self, inboxID, attachInd
 
 
 		tbl = tbl or {}
-		for i,v in pairs(tbl) do 
+		for i,v in pairs(tbl) do
 			tbl[i] = nil
-		end 
+		end
 
 
 	return validateResults(tbl)
 end
 
--- Returns data about unit auras 
+-- Returns data about unit auras
 LibTooltipScanner.GetTooltipDataForUnitAura = function(self, unit, auraID, filter, tbl)
 
 	local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId, canApplyAura, isBossDebuff, isCastByPlayer, nameplateShowAll, timeMod, value1, value2, value3 = UnitAura(unit, auraID, filter)
 
-	if name then 
+	if name then
 		-- Initiate the scanner tooltip
 		Scanner:Hide()
 		Scanner.owner = UIParent
@@ -2300,9 +2307,9 @@ LibTooltipScanner.GetTooltipDataForUnitAura = function(self, unit, auraID, filte
 		Scanner:SetUnitAura(unit, auraID, filter)
 
 		tbl = tbl or {}
-		for i,v in pairs(tbl) do 
+		for i,v in pairs(tbl) do
 			tbl[i] = nil
-		end 
+		end
 
 		tbl.name = name
 		tbl.icon = icon
@@ -2324,7 +2331,7 @@ LibTooltipScanner.GetTooltipDataForUnitAura = function(self, unit, auraID, filte
 		tbl.value3 = value3
 
 		local line = _G[ScannerName.."TextRight1"]
-		if line then 
+		if line then
 			local msg = line:GetText()
 			if msg then
 				tbl.debuffTypeLabel = msg
@@ -2342,55 +2349,55 @@ LibTooltipScanner.GetTooltipDataForUnitAura = function(self, unit, auraID, filte
 					local isTime
 
 					local id = 1
-					while Patterns["AuraTimeRemaining"..id] do 
-						if (string_find(msg, Patterns["AuraTimeRemaining"..id])) then 
-						
+					while Patterns["AuraTimeRemaining"..id] do
+						if (string_find(msg, Patterns["AuraTimeRemaining"..id])) then
+
 							-- found the range line
 							foundTimeRemaining = lineIndex
 							tbl.timeRemaining = msg
 
 							break
-						end 
+						end
 						id = id + 1
-					end 
+					end
 				end
 			end
 		end
 
-		-- Just assume all remaining lines are description, 
-		-- and bunch them together to a single line. 
-		if (numLines > 1) then 
-			for lineIndex = 2, numLines do 
-				if (lineIndex ~= foundTimeRemaining) then 
+		-- Just assume all remaining lines are description,
+		-- and bunch them together to a single line.
+		if (numLines > 1) then
+			for lineIndex = 2, numLines do
+				if (lineIndex ~= foundTimeRemaining) then
 					local line = _G[ScannerName.."TextLeft"..lineIndex]
-					if line then 
+					if line then
 						local msg = line:GetText()
 						if msg then
-							if tbl.description then 
-								if (msg == "") then 
+							if tbl.description then
+								if (msg == "") then
 									tbl.description = tbl.description .. "|n|n" -- empty line/space
-								else 
+								else
 									tbl.description = tbl.description .. "|n" .. msg -- normal line break
-								end 
-							else 
+								end
+							else
 								tbl.description = msg -- first line
-							end 
-						end 
-					end 
-				end 
-			end 
-		end 
+							end
+						end
+					end
+				end
+			end
+		end
 
 		return validateResults(tbl)
-	end 
-end 
+	end
+end
 
 -- Returns data about unit buffs
 LibTooltipScanner.GetTooltipDataForUnitBuff = function(self, unit, buffID, filter, tbl)
 
 	local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId, canApplyAura, isBossDebuff, isCastByPlayer, nameplateShowAll, timeMod, value1, value2, value3 = UnitBuff(unit, buffID, filter)
 
-	if name then 
+	if name then
 		-- Initiate the scanner tooltip
 		Scanner:Hide()
 		Scanner.owner = UIParent
@@ -2398,9 +2405,9 @@ LibTooltipScanner.GetTooltipDataForUnitBuff = function(self, unit, buffID, filte
 		Scanner:SetUnitBuff(unit, buffID, filter)
 
 		tbl = tbl or {}
-		for i,v in pairs(tbl) do 
+		for i,v in pairs(tbl) do
 			tbl[i] = nil
-		end 
+		end
 
 		tbl.isBuff = true
 		tbl.name = name
@@ -2423,16 +2430,16 @@ LibTooltipScanner.GetTooltipDataForUnitBuff = function(self, unit, buffID, filte
 		tbl.value3 = value3
 
 		local line = _G[ScannerName.."TextRight1"]
-		if line then 
+		if line then
 			local msg = line:GetText()
 			if msg then
 				tbl.debuffTypeLabel = msg
 			end
 		end
-		
+
 		local foundTimeRemaining
 		local numLines = Scanner:NumLines()
-		
+
 		for lineIndex = 2,numLines do
 			local line = _G[ScannerName.."TextLeft"..lineIndex]
 			if line then
@@ -2441,47 +2448,47 @@ LibTooltipScanner.GetTooltipDataForUnitBuff = function(self, unit, buffID, filte
 					local isTime
 
 					local id = 1
-					while Patterns["AuraTimeRemaining"..id] do 
-						if (string_find(msg, Patterns["AuraTimeRemaining"..id])) then 
-						
+					while Patterns["AuraTimeRemaining"..id] do
+						if (string_find(msg, Patterns["AuraTimeRemaining"..id])) then
+
 							-- found the range line
 							foundTimeRemaining = lineIndex
 							tbl.timeRemaining = msg
 
 							break
-						end 
+						end
 						id = id + 1
-					end 
+					end
 				end
 			end
 		end
 
-		-- Just assume all remaining lines are description, 
-		-- and bunch them together to a single line. 
-		if (numLines > 1) then 
-			for lineIndex = 2, numLines do 
-				if (lineIndex ~= foundTimeRemaining) then 
+		-- Just assume all remaining lines are description,
+		-- and bunch them together to a single line.
+		if (numLines > 1) then
+			for lineIndex = 2, numLines do
+				if (lineIndex ~= foundTimeRemaining) then
 					local line = _G[ScannerName.."TextLeft"..lineIndex]
-					if line then 
+					if line then
 						local msg = line:GetText()
 						if msg then
-							if tbl.description then 
-								if (msg == "") then 
+							if tbl.description then
+								if (msg == "") then
 									tbl.description = tbl.description .. "|n|n" -- empty line/space
-								else 
+								else
 									tbl.description = tbl.description .. "|n" .. msg -- normal line break
-								end 
-							else 
+								end
+							else
 								tbl.description = msg -- first line
-							end 
-						end 
-					end 
-				end 
-			end 
-		end 
+							end
+						end
+					end
+				end
+			end
+		end
 
 		return validateResults(tbl)
-	end 
+	end
 end
 
 -- Returns data about unit buffs
@@ -2489,7 +2496,7 @@ LibTooltipScanner.GetTooltipDataForUnitDebuff = function(self, unit, debuffID, f
 
 	local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId, canApplyAura, isBossDebuff, isCastByPlayer, nameplateShowAll, timeMod, value1, value2, value3 = UnitDebuff(unit, debuffID, filter)
 
-	if name then 
+	if name then
 		-- Initiate the scanner tooltip
 		Scanner:Hide()
 		Scanner.owner = UIParent
@@ -2497,9 +2504,9 @@ LibTooltipScanner.GetTooltipDataForUnitDebuff = function(self, unit, debuffID, f
 		Scanner:SetUnitDebuff(unit, debuffID, filter)
 
 		tbl = tbl or {}
-		for i,v in pairs(tbl) do 
+		for i,v in pairs(tbl) do
 			tbl[i] = nil
-		end 
+		end
 
 		tbl.name = name
 		tbl.icon = icon
@@ -2521,16 +2528,16 @@ LibTooltipScanner.GetTooltipDataForUnitDebuff = function(self, unit, debuffID, f
 		tbl.value3 = value3
 
 		local line = _G[ScannerName.."TextRight1"]
-		if line then 
+		if line then
 			local msg = line:GetText()
 			if msg then
 				tbl.debuffTypeLabel = msg
 			end
 		end
-		
+
 		local foundTimeRemaining
 		local numLines = Scanner:NumLines()
-		
+
 		for lineIndex = 2,numLines do
 			local line = _G[ScannerName.."TextLeft"..lineIndex]
 			if line then
@@ -2539,44 +2546,44 @@ LibTooltipScanner.GetTooltipDataForUnitDebuff = function(self, unit, debuffID, f
 					local isTime
 
 					local id = 1
-					while Patterns["AuraTimeRemaining"..id] do 
-						if (string_find(msg, Patterns["AuraTimeRemaining"..id])) then 
-						
+					while Patterns["AuraTimeRemaining"..id] do
+						if (string_find(msg, Patterns["AuraTimeRemaining"..id])) then
+
 							-- found the range line
 							foundTimeRemaining = lineIndex
 							tbl.timeRemaining = msg
 
 							break
-						end 
+						end
 						id = id + 1
-					end 
+					end
 				end
 			end
 		end
 
-		-- Just assume all remaining lines are description, 
-		-- and bunch them together to a single line. 
-		if (numLines > 1) then 
-			for lineIndex = 2, numLines do 
-				if (lineIndex ~= foundTimeRemaining) then 
+		-- Just assume all remaining lines are description,
+		-- and bunch them together to a single line.
+		if (numLines > 1) then
+			for lineIndex = 2, numLines do
+				if (lineIndex ~= foundTimeRemaining) then
 					local line = _G[ScannerName.."TextLeft"..lineIndex]
-					if line then 
+					if line then
 						local msg = line:GetText()
 						if msg then
-							if tbl.description then 
-								if (msg == "") then 
+							if tbl.description then
+								if (msg == "") then
 									tbl.description = tbl.description .. "|n|n" -- empty line/space
-								else 
+								else
 									tbl.description = tbl.description .. "|n" .. msg -- normal line break
-								end 
-							else 
+								end
+							else
 								tbl.description = msg -- first line
-							end 
-						end 
-					end 
-				end 
-			end 
-		end 
+							end
+						end
+					end
+				end
+			end
+		end
 
 		return validateResults(tbl)
 	end
@@ -2585,13 +2592,13 @@ end
 LibTooltipScanner.GetTooltipDataForTrackingSpell = function(self, tbl)
 
 	local trackingTexture = GetTrackingTexture()
-	if trackingTexture then 
+	if trackingTexture then
 		-- Initiate the scanner tooltip
 		Scanner:Hide()
 		Scanner.owner = UIParent
 		Scanner:SetOwner(UIParent, "ANCHOR_NONE")
 		Scanner:SetTrackingSpell()
-		
+
 		tbl = tbl or {}
 		tbl.icon = trackingTexture
 
@@ -2603,28 +2610,28 @@ LibTooltipScanner.GetTooltipDataForTrackingSpell = function(self, tbl)
 			end
 		end
 
-		-- Just assume all remaining lines are description, 
-		-- and bunch them together to a single line. 
+		-- Just assume all remaining lines are description,
+		-- and bunch them together to a single line.
 		local numLines = Scanner:NumLines()
-		if (numLines > 1) then 
-			for lineIndex = 2, numLines do 
+		if (numLines > 1) then
+			for lineIndex = 2, numLines do
 				local line = _G[ScannerName.."TextLeft"..lineIndex]
-				if line then 
+				if line then
 					local msg = line:GetText()
 					if msg then
-						if tbl.description then 
-							if (msg == "") then 
+						if tbl.description then
+							if (msg == "") then
 								tbl.description = tbl.description .. "|n|n" -- empty line/space
-							else 
+							else
 								tbl.description = tbl.description .. "|n" .. msg -- normal line break
-							end 
-						else 
+							end
+						else
 							tbl.description = msg -- first line
-						end 
-					end 
-				end 
-			end 
-		end 
+						end
+					end
+				end
+			end
+		end
 
 		return validateResults(tbl)
 	end
@@ -2633,16 +2640,16 @@ end
 -- Module embedding
 local embedMethods = {
 	GetTooltipDataForAction = true,
-	GetTooltipDataForActionItem = true, 
+	GetTooltipDataForActionItem = true,
 	GetTooltipDataForPetAction = true,
 	GetTooltipDataForUnit = true,
-	GetTooltipDataForUnitAura = true, 
-	GetTooltipDataForUnitBuff = true, 
+	GetTooltipDataForUnitAura = true,
+	GetTooltipDataForUnitBuff = true,
 	GetTooltipDataForUnitDebuff = true,
 	GetTooltipDataForItemID = true,
 	GetTooltipDataForItemLink = true,
 	GetTooltipDataForContainerSlot = true,
-	GetTooltipDataForInventorySlot = true, 
+	GetTooltipDataForInventorySlot = true,
 	GetTooltipDataForInboxItem = true,
 	GetTooltipDataForSpellID = true,
 	GetTooltipDataForTrackingSpell = true,
diff --git a/SimpleClassPower/back-end/libraries/unitframe.lua b/SimpleClassPower/back-end/libraries/unitframe.lua
index b8eba6d..8c5309f 100644
--- a/SimpleClassPower/back-end/libraries/unitframe.lua
+++ b/SimpleClassPower/back-end/libraries/unitframe.lua
@@ -1,5 +1,5 @@
-local LibUnitFrame = Wheel:Set("LibUnitFrame", 93)
-if (not LibUnitFrame) then	
+local LibUnitFrame = Wheel:Set("LibUnitFrame", 96)
+if (not LibUnitFrame) then
 	return
 end
 
@@ -64,9 +64,12 @@ local UnitIsFriend = UnitIsFriend
 local UnitName = UnitName
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
+local IsDragonflight = LibClientBuild:IsDragonflight()
 
 -- Library Registries
 LibUnitFrame.embeds = LibUnitFrame.embeds or {} -- who embeds this?
@@ -93,13 +96,13 @@ local hex = function(r, g, b)
 	return ("|cff%02x%02x%02x"):format(math_floor(r*255), math_floor(g*255), math_floor(b*255))
 end
 
--- Convert a Blizzard Color or RGB value set 
--- into our own custom color table format. 
+-- Convert a Blizzard Color or RGB value set
+-- into our own custom color table format.
 local prepare = function(...)
 	local tbl
 	if (select("#", ...) == 1) then
 		local old = ...
-		if (old.r) then 
+		if (old.r) then
 			tbl = {}
 			tbl[1] = old.r or 1
 			tbl[2] = old.g or 1
@@ -119,11 +122,11 @@ end
 -- Convert a whole Blizzard color table
 local prepareGroup = function(group)
 	local tbl = {}
-	for i,v in pairs(group) do 
+	for i,v in pairs(group) do
 		tbl[i] = prepare(v)
-	end 
+	end
 	return tbl
-end 
+end
 
 -- Default Color Table
 local Colors = {
@@ -164,24 +167,24 @@ local Colors = {
 	xp = prepare( 18/255, 179/255, 21/255 )
 }
 
--- Adding this for semantic reasons, 
+-- Adding this for semantic reasons,
 -- so that plugins can use it for friendly players
 -- and the modules will have the choice of overriding it.
 Colors.reaction.civilian = Colors.reaction[5]
 
--- Power bar colors need special handling, 
+-- Power bar colors need special handling,
 -- as some of them contain sub tables.
-for powerType, powerColor in pairs(PowerBarColor) do 
-	if (type(powerType) == "string") then 
-		if (powerColor.r) then 
+for powerType, powerColor in pairs(PowerBarColor) do
+	if (type(powerType) == "string") then
+		if (powerColor.r) then
 			Colors.power[powerType] = prepare(powerColor)
-		else 
-			if powerColor[1] and (type(powerColor[1]) == "table") then 
+		else
+			if powerColor[1] and (type(powerColor[1]) == "table") then
 				Colors.power[powerType] = prepareGroup(powerColor)
-			end 
-		end  
-	end 
-end 
+			end
+		end
+	end
+end
 
 -- Secure Snippets
 --------------------------------------------------------------------------
@@ -191,12 +194,12 @@ local secureSnippets = {
 
 -- Utility Functions
 --------------------------------------------------------------------------
--- Syntax check 
+-- Syntax check
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -209,7 +212,7 @@ local IsAddOnEnabled = function(target)
 	local target = string_lower(target)
 	for i = 1,GetNumAddOns() do
 		local name, _, _, loadable = GetAddOnInfo(i)
-		local enabled = not(GetAddOnEnableState(UnitName("player"), i) == 0) 
+		local enabled = not(GetAddOnEnableState(UnitName("player"), i) == 0)
 		if (string_lower(name) == target) then
 			if (enabled and loadable) then
 				return true
@@ -224,10 +227,10 @@ local IS_TOTALRP3_ENABLED = IsAddOnEnabled("totalRP3")
 -- Library Updates
 --------------------------------------------------------------------------
 -- global update limit, no elements can go above this
-local THROTTLE = 1/30 
+local THROTTLE = 1/30
 local OnUpdate = function(self, elapsed)
 
-	-- Throttle the updates, to increase the performance. 
+	-- Throttle the updates, to increase the performance.
 	self.elapsed = (self.elapsed or 0) + elapsed
 	if (self.elapsed < THROTTLE) then
 		return
@@ -239,7 +242,7 @@ local OnUpdate = function(self, elapsed)
 			if frequency.hz then
 				frequency.elapsed = frequency.elapsed + elapsed
 				if (frequency.elapsed >= frequency.hz) then
-					elements[element].Update(frame, "FrequentUpdate", frame.unit, elapsed) 
+					elements[element].Update(frame, "FrequentUpdate", frame.unit, elapsed)
 					frequency.elapsed = 0
 				end
 			else
@@ -253,20 +256,20 @@ end
 
 -- Unitframe Template
 --------------------------------------------------------------------------
-local UnitFrame = {} 
+local UnitFrame = {}
 local UnitFrame_MT = { __index = UnitFrame }
 
 -- Return or create the library default tooltip
--- This is shared by all unitframes, unless these methods 
+-- This is shared by all unitframes, unless these methods
 -- are specifically overwritten by the modules.
 UnitFrame.GetTooltip = function(self)
 	return LibUnitFrame:GetUnitFrameTooltip()
-end 
+end
 
 UnitFrame.OnEnter = function(self)
-	if ((not self.unit) or (not UnitExists(self.unit))) then 
-		return 
-	end 
+	if ((not self.unit) or (not UnitExists(self.unit))) then
+		return
+	end
 
 	self.isMouseOver = true
 
@@ -285,9 +288,9 @@ UnitFrame.OnEnter = function(self)
 		tooltip:SetMinimumWidth(160)
 		tooltip:SetUnit(self.unit)
 
-		if self.PostEnter then 
+		if self.PostEnter then
 			self:PostEnter()
-		end 
+		end
 	end
 end
 
@@ -304,9 +307,9 @@ UnitFrame.OnLeave = function(self)
 		local tooltip = self:GetTooltip()
 		tooltip:Hide()
 
-		if self.PostLeave then 
+		if self.PostLeave then
 			self:PostLeave()
-		end 
+		end
 	end
 end
 
@@ -316,8 +319,8 @@ end
 
 UnitFrame.OverrideAllElements = function(self, event, ...)
 	local unit = self.unit
-	if (not unit) or (not UnitExists(unit) and not ShowBossFrameWhenUninteractable(unit)) then 
-		return 
+	if (not unit) or (not UnitExists(unit) and not ShowBossFrameWhenUninteractable(unit)) then
+		return
 	end
 	if (self.isMouseOver) then
 		local OnEnter = self:GetScript("OnEnter")
@@ -328,15 +331,15 @@ UnitFrame.OverrideAllElements = function(self, event, ...)
 	return self:UpdateAllElements(event, ...)
 end
 
--- Special method that only updates the elements if the GUID has changed. 
--- Intention is to avoid performance drops from people coming and going in PuG raids. 
+-- Special method that only updates the elements if the GUID has changed.
+-- Intention is to avoid performance drops from people coming and going in PuG raids.
 UnitFrame.OverrideAllElementsOnChangedGUID = function(self, event, ...)
 	local unit = self.unit
-	if (not unit) or (not UnitExists(unit) and not ShowBossFrameWhenUninteractable(unit)) then 
-		return 
+	if (not unit) or (not UnitExists(unit) and not ShowBossFrameWhenUninteractable(unit)) then
+		return
 	end
 	local currentGUID = UnitGUID(unit)
-	if currentGUID and (self.unitGUID ~= currentGUID) then 
+	if currentGUID and (self.unitGUID ~= currentGUID) then
 		self.unitGUID = currentGUID
 		if (self.isMouseOver) then
 			local OnEnter = self:GetScript("OnEnter")
@@ -390,9 +393,9 @@ LibUnitFrame.SetScript = function(self, scriptHandler, script)
 		if (not scriptFrame) then
 			scriptFrame = CreateFrame("Frame", nil, LibFrame:GetFrame())
 		end
-		if script then 
-			scriptFrame:SetScript("OnUpdate", function(self, ...) 
-				script(LibUnitFrame, ...) 
+		if script then
+			scriptFrame:SetScript("OnUpdate", function(self, ...)
+				script(LibUnitFrame, ...)
 			end)
 		else
 			scriptFrame:SetScript("OnUpdate", nil)
@@ -409,8 +412,15 @@ LibUnitFrame.GetUnitFrameVisibilityDriver = function(self, unit, hideInVehicles)
 	if (unit == "player") then
 		if (IsClassic or IsTBC) then
 			visDriver = "[@player,exists][mounted]show;hide"
+		elseif (IsWrath) then
+			-- UNTESTED!
+			if (hideInVehicles) then
+				visDriver = "[vehicleui]hide;[@player,exists][possessbar][overridebar][mounted]show;hide"
+			else
+				visDriver = "[@player,exists][vehicleui][possessbar][overridebar][mounted]show;hide"
+			end
 		elseif (IsRetail) then
-			-- Might seem stupid, but I want the player frame to disappear along with the actionbars 
+			-- Might seem stupid, but I want the player frame to disappear along with the actionbars
 			-- when we've blown the flight master's whistle and are getting picked up.
 			if (hideInVehicles) then
 				visDriver = "[vehicleui]hide;[@player,exists][possessbar][overridebar][mounted]show;hide"
@@ -419,10 +429,18 @@ LibUnitFrame.GetUnitFrameVisibilityDriver = function(self, unit, hideInVehicles)
 			end
 		end
 	elseif (unit == "pet") then
-		if (IsRetail) then
-			-- Adding this to avoid situations where the player frame is hidden, 
+		if (IsWrath) then
+			-- UNTESTED!
+			local prefix = "[@player,noexists]hide;"
+			if (hideInVehicles) then
+				visDriver = prefix .. "[vehicleui]hide;[@pet,exists]show;hide"
+			else
+				visDriver = prefix .. "[@pet,exists][nooverridebar,vehicleui]show;hide"
+			end
+		elseif (IsRetail) then
+			-- Adding this to avoid situations where the player frame is hidden,
 			-- yet a pet frame hovers in mid-air.
-			-- This only happens in short periods, like when a quest requires you to 
+			-- This only happens in short periods, like when a quest requires you to
 			-- take a flight on a dragon to fly to or return to someplace.
 			-- Still, looks silly. We want it fixed.
 			local prefix = "[@player,noexists]hide;"
@@ -451,25 +469,36 @@ LibUnitFrame.GetUnitFrameVisibilityDriver = function(self, unit, hideInVehicles)
 			return string_format("[@%s,exists]show;hide", unit)
 		end
 	end
-end 
+end
 
 LibUnitFrame.GetUnitFrameUnitDriver = function(self, unit)
 	local unitDriver
-	if (IsRetail) then
-		if (unit == "player") then 
+	if (IsWrath) then
+		-- UNTESTED!
+		if (unit == "player") then
+			unitDriver = "[nooverridebar,vehicleui]pet;[overridebar,@vehicle,exists]vehicle;player"
+		elseif (unit == "pet") then
+			unitDriver = "[nooverridebar,vehicleui]player;pet"
+		elseif (string_match(unit, "^party(%d+)")) then
+			unitDriver = string_format("[unithasvehicleui,@%s]%s;%s", unit, unit.."pet", unit)
+		elseif (string_match(unit, "^raid(%d+)")) then
+			unitDriver = string_format("[unithasvehicleui,@%s]%s;%s", unit, unit.."pet", unit)
+		end
+	elseif (IsRetail) then
+		if (unit == "player") then
 			-- Should work in all cases where the unitframe is replaced. It should always be the "pet" unit.
 			--unitDriver = "[vehicleui]pet;player"
 			unitDriver = "[nooverridebar,vehicleui]pet;[overridebar,@vehicle,exists]vehicle;player"
-		elseif (unit == "pet") then 
+		elseif (unit == "pet") then
 			unitDriver = "[nooverridebar,vehicleui]player;pet"
-		elseif (string_match(unit, "^party(%d+)")) then 
+		elseif (string_match(unit, "^party(%d+)")) then
 			unitDriver = string_format("[unithasvehicleui,@%s]%s;%s", unit, unit.."pet", unit)
-		elseif (string_match(unit, "^raid(%d+)")) then 
+		elseif (string_match(unit, "^raid(%d+)")) then
 			unitDriver = string_format("[unithasvehicleui,@%s]%s;%s", unit, unit.."pet", unit)
 		end
 	end
 	return unitDriver
-end 
+end
 
 -- spawn and style a new unitframe
 LibUnitFrame.SpawnUnitFrame = function(self, unit, parent, styleFunc, ...)
@@ -477,41 +506,45 @@ LibUnitFrame.SpawnUnitFrame = function(self, unit, parent, styleFunc, ...)
 	check(parent, 2, "table", "string", "nil")
 	check(styleFunc, 3, "function", "string", "nil")
 
-	-- Alllow modules to use methods as styling functions. 
-	-- We don't want to allow this in the widgetcontainer back-end,  
-	-- so we need a bit of trickery here to make it happen. 
-	if (type(styleFunc) == "string") then 
+	-- Alllow modules to use methods as styling functions.
+	-- We don't want to allow this in the widgetcontainer back-end,
+	-- so we need a bit of trickery here to make it happen.
+	if (type(styleFunc) == "string") then
 		local func = self[styleFunc]
-		if func then 
+		if func then
 			local module, method = self, styleFunc
-			styleFunc = function(...) 
-				-- Always call the method by name, 
-				-- don't assume the function is the same each time. 
-				-- Even though it is. So this is weird. 
+			styleFunc = function(...)
+				-- Always call the method by name,
+				-- don't assume the function is the same each time.
+				-- Even though it is. So this is weird.
 				return module[method](self, ...)
-			end 
-		end 
-	end 
-	
+			end
+		end
+	end
+
 	local frame = LibUnitFrame:CreateWidgetContainer("Button", parent, "SecureUnitButtonTemplate", unit, styleFunc, ...)
-	for method,func in pairs(UnitFrame) do 
+	for method,func in pairs(UnitFrame) do
 		frame[method] = func
-	end 
+	end
 
 	frame.requireUnit = true
 	frame.colors = frame.colors or Colors
 	frame.ignoredEvents = {}
 
-	if (frame.ignoreMouseOver) then 
+	if (frame.ignoreMouseOver) then
 		frame:EnableMouse(false)
-		frame:RegisterForClicks("")
-	else 
+		if (IsDragonflight) then
+			frame:RegisterForClicks()
+		else
+			frame:RegisterForClicks("")
+		end
+	else
 		frame:SetAttribute("*type1", "target")
 		frame:SetAttribute("*type2", "togglemenu")
 		frame:SetScript("OnEnter", UnitFrame.OnEnter)
 		frame:SetScript("OnLeave", UnitFrame.OnLeave)
 		frame:RegisterForClicks("AnyUp")
-	end 
+	end
 
 	frame:SetScript("OnHide", UnitFrame.OnHide)
 
@@ -549,7 +582,7 @@ LibUnitFrame.SpawnUnitFrame = function(self, unit, parent, styleFunc, ...)
 		frame:RegisterEvent("UNIT_TARGETABLE_CHANGED", OverrideAllElements, true)
 		frame.ignoredEvents["UNIT_TARGETABLE_CHANGED"] = true
 
-	elseif (string_match(unit, "^party(%d+)")) then 
+	elseif (string_match(unit, "^party(%d+)")) then
 		frame.unitGroup = "party"
 		frame:RegisterEvent("GROUP_ROSTER_UPDATE", OverrideAllElements, true)
 		frame.ignoredEvents["GROUP_ROSTER_UPDATE"] = true
@@ -558,7 +591,7 @@ LibUnitFrame.SpawnUnitFrame = function(self, unit, parent, styleFunc, ...)
 			frame:RegisterEvent("UNIT_PET", UpdatePet)
 		end
 
-	elseif (string_match(unit, "^raid(%d+)")) then 
+	elseif (string_match(unit, "^raid(%d+)")) then
 		frame.unitGroup = "raid"
 		frame:RegisterEvent("GROUP_ROSTER_UPDATE", UnitFrame.OverrideAllElementsOnChangedGUID, true)
 		frame.ignoredEvents["GROUP_ROSTER_UPDATE"] = true
@@ -580,23 +613,23 @@ LibUnitFrame.SpawnUnitFrame = function(self, unit, parent, styleFunc, ...)
 	frame:SetAttribute("unit", unit)
 
 	local unitDriver = frame.unitOverrideDriver or LibUnitFrame:GetUnitFrameUnitDriver(unit)
-	if (unitDriver) and (not frame.hideInVehicles) then 
+	if (unitDriver) and (not frame.hideInVehicles) then
 		local unitSwitcher = CreateFrame("Frame", nil, nil, "SecureHandlerAttributeTemplate")
 		unitSwitcher:SetFrameRef("UnitFrame", frame)
 		unitSwitcher:SetAttribute("unit", unit)
 		unitSwitcher:SetAttribute("_onattributechanged", [=[
-			local frame = self:GetFrameRef("UnitFrame"); 
-			frame:SetAttribute("unit", value); 
+			local frame = self:GetFrameRef("UnitFrame");
+			frame:SetAttribute("unit", value);
 		]=])
 		frame.realUnit = unit
 		frame:SetAttribute("unit", SecureCmdOptionParse(unitDriver))
 		RegisterAttributeDriver(unitSwitcher, "state-vehicleswitch", unitDriver)
 	else
 		frame:SetAttribute("unit", unit)
-	end 
+	end
 
 	local visDriver = LibUnitFrame:GetUnitFrameVisibilityDriver(unit, frame.hideInVehicles)
-	if (frame.visibilityOverrideDriver) then 
+	if (frame.visibilityOverrideDriver) then
 		visDriver = frame.visibilityOverrideDriver
 	elseif (frame.visibilityPreDriver) then
 		visDriver = frame.visibilityPreDriver .. visDriver
@@ -605,7 +638,7 @@ LibUnitFrame.SpawnUnitFrame = function(self, unit, parent, styleFunc, ...)
 	frame:SetAttribute("visibilityDriver", visDriver)
 	RegisterAttributeDriver(frame, "state-visibility", visDriver)
 
-	-- This and a global name is pretty much  
+	-- This and a global name is pretty much
 	-- the shortest route to Clique compatibility.
 	_G.ClickCastFrames = ClickCastFrames or {}
 	ClickCastFrames[frame] = true
@@ -614,20 +647,20 @@ LibUnitFrame.SpawnUnitFrame = function(self, unit, parent, styleFunc, ...)
 
 	if (frame.PostCreate) then
 		frame:PostCreate()
-	end 
-	
+	end
+
 	return frame
 end
 
 -- Make this a proxy for development purposes
 LibUnitFrame.RegisterElement = function(self, ...)
 	LibWidgetContainer:RegisterElement(...)
-end 
+end
 
 -- Module embedding
 local embedMethods = {
 	SpawnUnitFrame = true,
-	GetUnitFrameVisibilityDriver = true, 
+	GetUnitFrameVisibilityDriver = true,
 	GetUnitFrameTooltip = true
 }
 
diff --git a/SimpleClassPower/back-end/plugins/generic_reputation.lua b/SimpleClassPower/back-end/plugins/generic_reputation.lua
index 869020b..23800f4 100644
--- a/SimpleClassPower/back-end/plugins/generic_reputation.lua
+++ b/SimpleClassPower/back-end/plugins/generic_reputation.lua
@@ -20,7 +20,10 @@ local GetWatchedFactionInfo = GetWatchedFactionInfo
 local IsFactionParagon = C_Reputation and C_Reputation.IsFactionParagon
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
+local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 -- Number Abbreviation
@@ -28,47 +31,47 @@ local short = LibNumbers:GetNumberAbbreviationShort()
 local large = LibNumbers:GetNumberAbbreviationLong()
 
 local UpdateValue = function(element, current, min, max, factionName, standingID, standingLabel, isFriend)
-	local value = element.Value or element:IsObjectType("FontString") and element 
-	local barMax = max - min 
+	local value = element.Value or element:IsObjectType("FontString") and element
+	local barMax = max - min
 	local barValue = current - min
-	if value.showPercent then 
-		if (barMax > 0) then 
+	if value.showPercent then
+		if (barMax > 0) then
 			value:SetFormattedText("%.0f%%", barValue/barMax*100)
-		else 
+		else
 			value:SetText(MAXIMUM)
-		end 
-	elseif value.showDeficit then 
-		if (barMax > 0) then 
+		end
+	elseif value.showDeficit then
+		if (barMax > 0) then
 			value:SetFormattedText(short(barMax - barValue))
-		else 
+		else
 			value:SetText(MAXIMUM)
-		end 
-	else 
+		end
+	else
 		value:SetFormattedText(short(barValue))
 	end
 	local percent = value.Percent
-	if percent then 
-		if (barMax > 0) then 
+	if percent then
+		if (barMax > 0) then
 			percent:SetFormattedText("%.0f%%", barValue/barMax*100)
-		else 
+		else
 			percent:SetText(MAXIMUM)
-		end 
-	end 
-	if element.colorValue then 
+		end
+	end
+	if element.colorValue then
 		local color
-		if restedLeft then 
+		if restedLeft then
 			local colors = element._owner.colors
 			color = colors[isFriend and "friendship" or "reaction"][standingID]
-		else 
+		else
 			local colors = element._owner.colors
 			color = colors.xpValue or colors.xp
-		end 
+		end
 		value:SetTextColor(color[1], color[2], color[3])
-		if percent then 
+		if percent then
 			percent:SetTextColor(color[1], color[2], color[3])
-		end 
-	end 
-end 
+		end
+	end
+end
 
 local Update = function(self, event, unit)
 	local element = self.Reputation
@@ -79,7 +82,7 @@ local Update = function(self, event, unit)
 	local name, reaction, min, max, current, factionID = GetWatchedFactionInfo()
 	if (not name) then
 		return element:Hide()
-	end 
+	end
 
 	if (IsRetail) then
 		if (factionID and IsFactionParagon(factionID)) then
@@ -102,18 +105,18 @@ local Update = function(self, event, unit)
 			if (IsRetail) then
 				local friendID, friendRep, friendMaxRep, friendName, friendText, friendTexture, friendTextLevel, friendThreshold, nextFriendThreshold = GetFriendshipReputation(factionID)
 
-				if (friendID) then 
+				if (friendID) then
 					isFriend = true
-					if (nextFriendThreshold) then 
+					if (nextFriendThreshold) then
 						min = friendThreshold
 						max = nextFriendThreshold
 					else
 						min = 0
 						max = friendMaxRep
 						current = friendRep
-					end 
+					end
 					standingLabel = friendTextLevel
-				end 
+				end
 			end
 
 			standingID = standingId
@@ -121,47 +124,47 @@ local Update = function(self, event, unit)
 		end
 	end
 
-	if (not standingID) then 
+	if (not standingID) then
 		return element:Hide()
 	end
 
-	if (not isFriend) then 
+	if (not isFriend) then
 		standingLabel = _G["FACTION_STANDING_LABEL"..standingID]
 	end
 
-	if (element:IsObjectType("StatusBar")) then 
-		local barMax = max - min 
+	if (element:IsObjectType("StatusBar")) then
+		local barMax = max - min
 		local barValue = current - min
-		if (barMax == 0) then 
+		if (barMax == 0) then
 			element:SetMinMaxValues(0,1)
 			element:SetValue(1)
-		else 
+		else
 			element:SetMinMaxValues(0, max-min)
 			element:SetValue(current-min)
-		end 
-		if (element.colorStanding) then 
+		end
+		if (element.colorStanding) then
 			local color = self.colors[isFriend and "friendship" or "reaction"][standingID]
 			element:SetStatusBarColor(color[1], color[2], color[3])
-		end 
-	end 
-	
-	if (element.Value) then 
+		end
+	end
+
+	if (element.Value) then
 		(element.OverrideValue or element.UpdateValue) (element, current, min, max, name, standingID, standingLabel, isFriend)
-	end 
-	
-	if (not element:IsShown()) then 
+	end
+
+	if (not element:IsShown()) then
 		element:Show()
 	end
 
-	if (element.PostUpdate) then 
+	if (element.PostUpdate) then
 		return element:PostUpdate(current, min, max, name, standingID, standingLabel, isFriend)
-	end 
-	
-end 
+	end
+
+end
 
 local Proxy = function(self, ...)
 	return (self.Reputation.Override or Update)(self, ...)
-end 
+end
 
 local ForceUpdate = function(element, ...)
 	return Proxy(element._owner, "Forced", ...)
@@ -178,7 +181,7 @@ local Enable = function(self)
 
 		return true
 	end
-end 
+end
 
 local Disable = function(self)
 	local element = self.Reputation
@@ -186,9 +189,9 @@ local Disable = function(self)
 		element:Hide()
 		self:UnregisterEvent("UPDATE_FACTION", Proxy)
 	end
-end 
+end
 
 -- Register it with compatible libraries
-for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)), (Wheel("LibMinimap", true)) }) do 
-	Lib:RegisterElement("Reputation", Enable, Disable, Proxy, 3)
-end 
+for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)), (Wheel("LibMinimap", true)) }) do
+	Lib:RegisterElement("Reputation", Enable, Disable, Proxy, 5)
+end
diff --git a/SimpleClassPower/back-end/plugins/unit_auras.lua b/SimpleClassPower/back-end/plugins/unit_auras.lua
index 33e585f..c975266 100644
--- a/SimpleClassPower/back-end/plugins/unit_auras.lua
+++ b/SimpleClassPower/back-end/plugins/unit_auras.lua
@@ -31,6 +31,7 @@ local UnitIsUnit = UnitIsUnit
 
 -- Constants for client version
 local IsRetail = LibClientBuild:IsRetail()
+local IsWrath = LibClientBuild:IsWrath()
 
 -- Blizzard Textures
 local EDGE_TEXTURE = [[Interface\Cooldown\edge]]
@@ -62,15 +63,15 @@ local formatTime = function(time)
 		return "%.0f%s", math_ceil(time / HOUR), "h"
 	elseif (time > MINUTE) then -- more than a minute
 		return "%.0f%s", math_ceil(time / MINUTE), "m"
-	elseif (time > 5) then 
+	elseif (time > 5) then
 		return "%.0f", math_ceil(time)
-	elseif (time > .9) then 
+	elseif (time > .9) then
 		return "|cffff8800%.0f|r", math_ceil(time)
 	elseif (time > .05) then
 		return "|cffff0000%.0f|r", time*10 - time*10%1
 	else
 		return ""
-	end	
+	end
 end
 
 local auraSort = function(a,b)
@@ -103,7 +104,7 @@ local auraSort = function(a,b)
 				else
 
 					-- Sort by remaining time, first expiring first.
-					return (a.expirationTime < b.expirationTime) 
+					return (a.expirationTime < b.expirationTime)
 				end
 			end
 		end
@@ -145,7 +146,7 @@ local auraSortBuffsFirst = function(a,b)
 					else
 
 						-- Sort by remaining time, first expiring first.
-						return (a.expirationTime < b.expirationTime) 
+						return (a.expirationTime < b.expirationTime)
 					end
 				end
 			else
@@ -191,7 +192,7 @@ local auraSortDebuffsFirst = function(a,b)
 					else
 
 						-- Sort by remaining time, first expiring first.
-						return (a.expirationTime < b.expirationTime) 
+						return (a.expirationTime < b.expirationTime)
 					end
 				end
 			else
@@ -276,12 +277,12 @@ Aura.CreateButton = function(element)
 	cooldown:SetFrameLevel(button:GetFrameLevel() + 1)
 	cooldown:SetReverse(false)
 	cooldown:SetSwipeColor(0, 0, 0, .75)
-	cooldown:SetBlingTexture(BLING_TEXTURE, .3, .6, 1, .75) 
+	cooldown:SetBlingTexture(BLING_TEXTURE, .3, .6, 1, .75)
 	cooldown:SetEdgeTexture(EDGE_TEXTURE)
 	cooldown:SetDrawSwipe(true)
 	cooldown:SetDrawBling(true)
 	cooldown:SetDrawEdge(false)
-	cooldown:SetHideCountdownNumbers(true) 
+	cooldown:SetHideCountdownNumbers(true)
 	button.Cooldown = cooldown
 
 	local time = overlay:CreateFontString()
@@ -307,65 +308,65 @@ Aura.CreateButton = function(element)
 	button.Count = count
 
 	-- Borrow the unitframe tooltip
-	-- *Note that this method is created after element initialization, 
-	-- so we should probably use a smarter callback here. 
-	-- For now this is "safe", though, since auras won't be parsed this early anyway. 
+	-- *Note that this method is created after element initialization,
+	-- so we should probably use a smarter callback here.
+	-- For now this is "safe", though, since auras won't be parsed this early anyway.
 	button.GetTooltip = element._owner.GetTooltip
 
 	-- Run user post creation method
-	if element.PostCreateButton then 
+	if element.PostCreateButton then
 		element:PostCreateButton(button)
-	end 
+	end
 
 	-- Apply script handlers
-	-- * Note that we only provide out of combat aura cancelling, 
-	-- any other functionality including tooltips should be added by the modules. 
+	-- * Note that we only provide out of combat aura cancelling,
+	-- any other functionality including tooltips should be added by the modules.
 	-- * Also note that we apply these AFTER the post creation callbacks!
-	if (not element.disableMouse) then 
+	if (not element.disableMouse) then
 		button:SetScript("OnEnter", Aura.OnEnter)
 		button:SetScript("OnLeave", Aura.OnLeave)
 		button:SetScript("OnClick", Aura.OnClick)
 		button:SetScript("PreClick", Aura.PreClick)
 		button:SetScript("PostClick", Aura.PostClick)
-	end 
+	end
 
 	return button
-end 
+end
 
 Aura.OnEnter = function(button)
-	if (button.OnEnter) then 
+	if (button.OnEnter) then
 		return button:OnEnter()
-	end 
+	end
 	button.isMouseOver = true
 	button.UpdateTooltip = Aura.UpdateTooltip
 	button:UpdateTooltip()
-	if (button.PostEnter) then 
+	if (button.PostEnter) then
 		return button:PostEnter()
-	end 
+	end
 end
 
 Aura.OnLeave = function(button)
-	if (button.OnLeave) then 
+	if (button.OnLeave) then
 		return button:OnLeave()
-	end 
+	end
 
 	button.UpdateTooltip = nil
 
 	local tooltip = button:GetTooltip()
 	tooltip:Hide()
 
-	if (button.PostLeave) then 
+	if (button.PostLeave) then
 		return button:PostLeave()
-	end 
+	end
 end
 
 Aura.OnClick = function(button, buttonPressed, down)
-	if (button.OnClick) then 
+	if (button.OnClick) then
 		return button:OnClick(buttonPressed, down)
-	end 
+	end
 	-- Only called if no override exists above
 	if (buttonPressed == "RightButton") and (not InCombatLockdown()) then
-		-- Some times an update is run right after the unit has been removed, 
+		-- Some times an update is run right after the unit has been removed,
 		-- causing a myriad of nil bugs. Avoid it!
 		if (button.isBuff and UnitExists(button.unit)) then
 			CancelUnitBuff(button.unit, button:GetID(), button.filter)
@@ -374,16 +375,16 @@ Aura.OnClick = function(button, buttonPressed, down)
 end
 
 Aura.PreClick = function(button, buttonPressed, down)
-	if (button.PreClick) then 
+	if (button.PreClick) then
 		return button:PreClick(buttonPressed, down)
-	end 
-end 
+	end
+end
 
 Aura.PostClick = function(button, buttonPressed, down)
-	if (button.PostClick) then 
+	if (button.PostClick) then
 		return button:PostClick(buttonPressed, down)
-	end 
-end 
+	end
+end
 
 Aura.SetCooldownTimer = function(button, start, duration)
 	if (button._owner.showSpirals) then
@@ -398,10 +399,10 @@ Aura.SetCooldownTimer = function(button, start, duration)
 		else
 			cooldown:Hide()
 		end
-	else 
+	else
 		button.Cooldown:Hide()
-	end 
-end 
+	end
+end
 
 Aura.SetTimer = function(button, fullDuration, expirationTime)
 	if (fullDuration) and (fullDuration > 0) then
@@ -430,10 +431,10 @@ Aura.SetPosition = function(element, button, buttonNum)
 	elementW = (elementW + .5) - (elementW + .5)%1
 	elementH = (elementH + .5) - (elementH + .5)%1
 
-	-- Get the accurate size of the slots with spacing 
+	-- Get the accurate size of the slots with spacing
 	local width = (element.auraSize or element.auraWidth) + element.spacingH
 	local height = (element.auraSize or element.auraHeight) + element.spacingV
-	
+
 	-- Number of columns
 	local numCols = (elementW + element.spacingH)/width
 	numCols = numCols - numCols%1
@@ -443,15 +444,15 @@ Aura.SetPosition = function(element, button, buttonNum)
 	numRows = numRows - numRows%1
 
 	-- No room for this aura, return in panic!
-	if (buttonNum > numCols*numRows) then 
+	if (buttonNum > numCols*numRows) then
 		return true
-	end 
+	end
 
 	-- Figure out the origin
 	local point = ((element.growthY == "UP") and "BOTTOM" or (element.growthY == "DOWN") and "TOP") .. ((element.growthX == "RIGHT") and "LEFT" or (element.growthX == "LEFT") and "RIGHT")
 
 	-- Figure out the positions in the grid
-	buttonNum = buttonNum - 1 
+	buttonNum = buttonNum - 1
 	local posX = buttonNum%numCols
 	local posY = buttonNum/numCols - buttonNum/numCols%1
 
@@ -462,26 +463,26 @@ Aura.SetPosition = function(element, button, buttonNum)
 	-- Position the button
 	button:ClearAllPoints()
 	button:SetPoint(point, offsetX, offsetY)
-end 
+end
 
 Aura.UpdateTooltip = function(button)
 	local tooltip = button:GetTooltip()
 	tooltip:Hide()
 	tooltip:SetMinimumWidth(160)
 	local element = button._owner
-	if (element.tooltipDefaultPosition) then 
+	if (element.tooltipDefaultPosition) then
 		tooltip:SetDefaultAnchor(button)
-	elseif (element.tooltipPoint) then 
+	elseif (element.tooltipPoint) then
 		tooltip:SetOwner(button)
 		tooltip:Place(element.tooltipPoint, element.tooltipAnchor or button, element.tooltipRelPoint or element.tooltipPoint, element.tooltipOffsetX or 0, element.tooltipOffsetY or 0)
-	else 
+	else
 		tooltip:SetSmartAnchor(button, element.tooltipOffsetX or 10, element.tooltipOffsetY or 10)
-	end 
-	if (button.isBuff) then 
+	end
+	if (button.isBuff) then
 		tooltip:SetUnitBuff(button.unit, button:GetID(), button.filter)
-	else 
+	else
 		tooltip:SetUnitDebuff(button.unit, button:GetID(), button.filter)
-	end 
+	end
 end
 
 Aura.UpdateTimer = function(button, elapsed)
@@ -491,17 +492,17 @@ Aura.UpdateTimer = function(button, elapsed)
 			local element = button._owner
 			local timeLeft = button.expirationTime - GetTime()
 			if (timeLeft > 0) then
-				if (element.showDurations) and ((timeLeft < LONG_THRESHOLD) or (element.showLongDurations)) then 
+				if (element.showDurations) and ((timeLeft < LONG_THRESHOLD) or (element.showLongDurations)) then
 					button.Time:SetFormattedText(formatTime(timeLeft))
 				else
 					button.Time:SetText("")
-				end 
+				end
 			else
 				button:SetScript("OnUpdate", nil)
 				Aura.SetCooldownTimer(button, 0,0)
 				button.Time:SetText("")
 				element:ForceUpdate()
-			end	
+			end
 			if (button:IsShown() and element.PostUpdateButton) then
 				element:PostUpdateButton(button, "Timer")
 			end
@@ -520,7 +521,7 @@ local CacheBuffs = function(element)
 	local cache = element.cache or get()
 	local unit = element._owner.unit or element.unit
 
-	for i = 1, BUFF_MAX_DISPLAY do 
+	for i = 1, BUFF_MAX_DISPLAY do
 
 		name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId, canApplyAura, isBossDebuff, isCastByPlayer, nameplateShowAll, timeMod, value1, value2, value3 = LibAura:GetUnitBuff(unit, i, element.filter)
 
@@ -554,7 +555,7 @@ local CacheBuffs = function(element)
 		entry.value3 = value3
 
 		cache[#cache + 1] = entry
-	end 
+	end
 
 	element.cache = cache
 
@@ -567,14 +568,14 @@ local CacheDebuffs = function(element)
 	local cache = element.cache or get()
 	local unit = element._owner.unit or element.unit
 
-	for i = 1, DEBUFF_MAX_DISPLAY do 
+	for i = 1, DEBUFF_MAX_DISPLAY do
 
 		name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellId, canApplyAura, isBossDebuff, isCastByPlayer, nameplateShowAll, timeMod, value1, value2, value3 = LibAura:GetUnitDebuff(unit, i, element.filter)
 
 		if (not name) then
 			break
 		end
-		
+
 		local entry = get()
 		entry.isBuff = false
 		entry.id = i
@@ -601,7 +602,7 @@ local CacheDebuffs = function(element)
 		entry.value3 = value3
 
 		cache[#cache + 1] = entry
-	end 
+	end
 
 	element.cache = cache
 
@@ -612,69 +613,69 @@ local Iterate = function(element)
 		return
 	end
 
-	for i,entry in ipairs(element.cache) do 
+	for i,entry in ipairs(element.cache) do
 		if (entry.id) then
 
 			local hideAura
 			local auraPriority
-			
-			if (element.customFilter) then 
+
+			if (element.customFilter) then
 				local displayAura, displayPriority = element:customFilter(
-					entry.isBuff, 
-					entry.unit, 
-					entry.isOwnedByPlayer, 
-					entry.name, 
-					entry.icon, 
-					entry.count, 
-					entry.debuffType, 
-					entry.duration, 
-					entry.expirationTime, 
-					entry.unitCaster, 
-					entry.isStealable, 
-					entry.nameplateShowPersonal, 
-					entry.spellId, 
-					entry.canApplyAura, 
-					entry.isBossDebuff, 
-					entry.isCastByPlayer, 
-					entry.nameplateShowAll, 
-					entry.timeMod, 
-					entry.value1, 
-					entry.value2, 
+					entry.isBuff,
+					entry.unit,
+					entry.isOwnedByPlayer,
+					entry.name,
+					entry.icon,
+					entry.count,
+					entry.debuffType,
+					entry.duration,
+					entry.expirationTime,
+					entry.unitCaster,
+					entry.isStealable,
+					entry.nameplateShowPersonal,
+					entry.spellId,
+					entry.canApplyAura,
+					entry.isBossDebuff,
+					entry.isCastByPlayer,
+					entry.nameplateShowAll,
+					entry.timeMod,
+					entry.value1,
+					entry.value2,
 					entry.value3
 				)
-				if (displayAura) then 
+				if (displayAura) then
 					auraPriority = displayPriority
-				else 
+				else
 					hideAura = true
-				end 
-			end 
+				end
+			end
 
 			-- Stop iteration if we've hit the maximum displayed allowed.
 			if (element.maxVisible and (element.maxVisible == element.visibleAuras)) then
-				break 
-			end 
+				break
+			end
 
-			if (not hideAura) then 
+			if (not hideAura) then
 
 				-- We can have reached the max of buffs or debuffs, yet have space for the opposite.
 				-- So we check whether or not we should display each single aura.
-				local skip = ((element.maxBuffs) and (entry.isBuff) and (element.maxBuffs == element.visibleBuffs)) 
-						or ((element.maxDebuffs) and (not entry.isBuff) and (element.maxDebuffs == element.visibleDebuffs))  
+				local skip = ((element.maxBuffs) and (entry.isBuff) and (element.maxBuffs == element.visibleBuffs))
+						or ((element.maxDebuffs) and (not entry.isBuff) and (element.maxDebuffs == element.visibleDebuffs))
 
 				-- Go ahead and display this button.
-				if (not skip) then 
+				if (not skip) then
 					-- Increase the total visible counter
 					element.visibleAuras = element.visibleAuras + 1
 
 					-- Increase the other counters
-					if (entry.isBuff) then 
+					if (entry.isBuff) then
 						element.visibleBuffs = element.visibleBuffs + 1
 					else
 						element.visibleDebuffs = element.visibleDebuffs + 1
 					end
 
-					-- Can't have frames that only are referenced by indexed table entries, 
-					-- we need a hashed key or for some reason /framestack will bug out. 
+					-- Can't have frames that only are referenced by indexed table entries,
+					-- we need a hashed key or for some reason /framestack will bug out.
 					local visibleKey = tostring(element.visibleAuras)
 
 					-- Create a new button, and initially hide it while setting it up
@@ -724,7 +725,7 @@ local Iterate = function(element)
 			end
 
 		end
-	end 
+	end
 
 	-- Position them all
 	--*Why on earth would this bug out?
@@ -751,15 +752,15 @@ local EvaluateVisibilities = function(element, visible)
 	end
 
 	-- Decide visibility of the whole frame
-	if (visible == 0) then 
+	if (visible == 0) then
 		if (element:IsShown()) then
 			element:Hide()
 		end
-	else 
+	else
 		if (not element:IsShown()) then
 			element:Show()
 		end
-	end 
+	end
 end
 
 local Update = function(self, event, unit, ...)
@@ -772,9 +773,9 @@ local Update = function(self, event, unit, ...)
 	end
 
 	-- Bail out on missing unit, which should never happen, but does.
-	if (not unit) or (unit ~= self.unit) then 
-		return 
-	end 
+	if (not unit) or (unit ~= self.unit) then
+		return
+	end
 
 	local isEnemy = UnitCanAttack("player", unit)
 	local isFriend = UnitIsFriend("player", unit)
@@ -784,7 +785,7 @@ local Update = function(self, event, unit, ...)
 	local Buffs = self.Buffs
 	local Debuffs = self.Debuffs
 
-	if (Auras) then 
+	if (Auras) then
 		Auras.unit = unit
 
 		if (Auras.PreUpdate) then
@@ -802,7 +803,7 @@ local Update = function(self, event, unit, ...)
 		local numBoss, numMagic, numCurse, numDisease, numPoison = 0, 0, 0, 0, 0
 		local visible, visibleBuffs, visibleDebuffs = 0, 0, 0
 
-		-- Parse the cached auras for meta info. 
+		-- Parse the cached auras for meta info.
 		for i,entry in ipairs(cache) do
 			if (entry.isBossDebuff) then
 				numBoss = numBoss + 1
@@ -852,10 +853,10 @@ local Update = function(self, event, unit, ...)
 		-- Evaluate if the element should be shown
 		EvaluateVisibilities(Auras, Auras.visibleAuras)
 
-		if (Auras.PostUpdate) then 
+		if (Auras.PostUpdate) then
 			Auras:PostUpdate(unit, Auras.visibleAuras)
-		end 
-	end 
+		end
+	end
 
 	if (Buffs) then
 		Buffs.unit = unit
@@ -873,7 +874,7 @@ local Update = function(self, event, unit, ...)
 		local numBoss, numMagic, numCurse, numDisease, numPoison = 0, 0, 0, 0, 0
 		local visible, visibleBuffs, visibleDebuffs = 0, 0, 0
 
-		-- Parse the cached auras for meta info. 
+		-- Parse the cached auras for meta info.
 		for i,entry in ipairs(cache) do
 			if (entry.isBossDebuff) then
 				numBoss = numBoss + 1
@@ -923,12 +924,12 @@ local Update = function(self, event, unit, ...)
 		-- Evaluate if the element should be shown
 		EvaluateVisibilities(Buffs, Buffs.visibleAuras)
 
-		if (Buffs.PostUpdate) then 
+		if (Buffs.PostUpdate) then
 			Buffs:PostUpdate(unit, Buffs.visibleAuras)
-		end 
-	end 
+		end
+	end
 
-	if (Debuffs) then 
+	if (Debuffs) then
 		Debuffs.unit = unit
 
 		if (Debuffs.PreUpdate) then
@@ -944,7 +945,7 @@ local Update = function(self, event, unit, ...)
 		local numBoss, numMagic, numCurse, numDisease, numPoison = 0, 0, 0, 0, 0
 		local visible, visibleBuffs, visibleDebuffs = 0, 0, 0
 
-		-- Parse the cached auras for meta info. 
+		-- Parse the cached auras for meta info.
 		for i,entry in ipairs(cache) do
 			if (entry.isBossDebuff) then
 				numBoss = numBoss + 1
@@ -994,16 +995,16 @@ local Update = function(self, event, unit, ...)
 		-- Evaluate if the element should be shown
 		EvaluateVisibilities(Debuffs, Debuffs.visibleAuras)
 
-		if (Debuffs.PostUpdate) then 
+		if (Debuffs.PostUpdate) then
 			Debuffs:PostUpdate(unit, Debuffs.visibleAuras)
-		end 
-	end 
+		end
+	end
 
-end 
+end
 
 local Proxy = function(self, ...)
 	return Update(self, ...)
-end 
+end
 
 local ForceUpdate = function(element)
 	return Proxy(element._owner, "Forced", element._owner.unit)
@@ -1033,7 +1034,7 @@ local Enable = function(self)
 			DisplayCache[Buffs] = DisplayCache[Buffs] or {}
 			BuffCache[Buffs] = BuffCache[Buffs] or {}
 		end
-		
+
 		if (Debuffs) then
 			Debuffs._owner = self
 			Debuffs.unit = unit
@@ -1051,7 +1052,7 @@ local Enable = function(self)
 			self:RegisterEvent("PLAYER_REGEN_DISABLED", Proxy, true)
 			self:RegisterEvent("PLAYER_REGEN_ENABLED", Proxy, true)
 
-			if (IsRetail) then
+			if (IsRetail or IsWrath) then
 				self:RegisterEvent("UNIT_ENTERED_VEHICLE", Proxy)
 				self:RegisterEvent("UNIT_ENTERING_VEHICLE", Proxy)
 				self:RegisterEvent("UNIT_EXITING_VEHICLE", Proxy)
@@ -1066,7 +1067,7 @@ local Enable = function(self)
 
 		return true
 	end
-end 
+end
 
 local Disable = function(self)
 	local Auras = self.Auras
@@ -1074,43 +1075,43 @@ local Disable = function(self)
 	local Debuffs = self.Debuffs
 
 	if (Auras or Buffs or Debuffs) then
-	
+
 		if (Auras) then
 			Auras.unit = nil
 			Auras:Hide()
-			if (DisplayCache[Auras]) then 
+			if (DisplayCache[Auras]) then
 				table_wipe(DisplayCache[Auras])
 			end
-			if (BuffCache[Auras]) then 
+			if (BuffCache[Auras]) then
 				table_wipe(BuffCache[Auras])
 			end
-			if (DebuffCache[Auras]) then 
+			if (DebuffCache[Auras]) then
 				table_wipe(DebuffCache[Auras])
 			end
 		end
-	
+
 		if (Buffs) then
 			Buffs.unit = nil
 			Buffs:Hide()
-			if (DisplayCache[Buffs]) then 
+			if (DisplayCache[Buffs]) then
 				table_wipe(DisplayCache[Buffs])
 			end
-			if (BuffCache[Buffs]) then 
+			if (BuffCache[Buffs]) then
 				table_wipe(BuffCache[Buffs])
 			end
 		end
-	
+
 		if (Debuffs) then
 			Debuffs.unit = nil
 			Debuffs:Hide()
-			if (DisplayCache[Debuffs]) then 
+			if (DisplayCache[Debuffs]) then
 				table_wipe(DisplayCache[Debuffs])
 			end
-			if (DebuffCache[Debuffs]) then 
+			if (DebuffCache[Debuffs]) then
 				table_wipe(DebuffCache[Debuffs])
 			end
 		end
-	
+
 		if not ((Auras and Auras.frequent) or (Buffs and Buffs.frequent) or (Debuffs and Debuffs.frequent)) then
 			self:UnregisterEvent("UNIT_AURA", Proxy)
 			self:UnregisterEvent("PLAYER_ENTERING_WORLD", Proxy)
@@ -1127,9 +1128,9 @@ local Disable = function(self)
 			end
 		end
 	end
-end 
+end
 
 -- Register it with compatible libraries
-for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do 
-	Lib:RegisterElement("Auras", Enable, Disable, Proxy, 74)
-end 
+for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do
+	Lib:RegisterElement("Auras", Enable, Disable, Proxy, 75)
+end
diff --git a/SimpleClassPower/back-end/plugins/unit_cast.lua b/SimpleClassPower/back-end/plugins/unit_cast.lua
index c43aa59..73d3468 100644
--- a/SimpleClassPower/back-end/plugins/unit_cast.lua
+++ b/SimpleClassPower/back-end/plugins/unit_cast.lua
@@ -38,8 +38,10 @@ local L_MILLISECONDS_ABBR = MILLISECONDS_ABBR
 local DAY, HOUR, MINUTE = 86400, 3600, 60
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 local playerGUID = UnitGUID("player")
@@ -91,7 +93,7 @@ local formatTime = function(time)
 		return ("%.1f"):format(time)
 	else
 		return ""
-	end	
+	end
 end
 
 
@@ -105,44 +107,44 @@ local clear = function(element)
 	element.total = nil
 	element.name = nil
 	element.text = nil
-	if (element.Name) then 
+	if (element.Name) then
 		element.Name:SetText("")
 	end
-	if (element.Value) then 
+	if (element.Value) then
 		element.Value:SetText("")
 	end
-	if (element.Failed) then 
+	if (element.Failed) then
 		element.Failed:SetText("")
 	end
-	if (element.SpellQueue) then 
+	if (element.SpellQueue) then
 		element.SpellQueue:SetValue(0, true)
 	end
 	element:SetValue(0, true)
 end
 
 local updateSpellQueueOrientation = function(element)
-	if (element.channeling) then 
+	if (element.channeling) then
 		local orientation = element:GetOrientation()
-		if (orientation ~= element.SpellQueue:GetOrientation()) then 
+		if (orientation ~= element.SpellQueue:GetOrientation()) then
 			element.SpellQueue:SetOrientation(orientation)
-		end 
-	else 
+		end
+	else
 		local orientation
 		local barDirection = element:GetOrientation()
 		if (barDirection == "LEFT") then
-			orientation = "RIGHT" 
-		elseif (barDirection == "RIGHT") then 
-			orientation = "LEFT" 
-		elseif (barDirection == "UP") then 
-			orientation = "DOWN" 
-		elseif (barDirection == "DOWN") then 
-			orientation = "UP" 
+			orientation = "RIGHT"
+		elseif (barDirection == "RIGHT") then
+			orientation = "LEFT"
+		elseif (barDirection == "UP") then
+			orientation = "DOWN"
+		elseif (barDirection == "DOWN") then
+			orientation = "UP"
 		end
 		local spellQueueDirection = element.SpellQueue:GetOrientation()
-		if (spellQueueDirection ~= orientation) then 
+		if (spellQueueDirection ~= orientation) then
 			element.SpellQueue:SetOrientation(orientation)
 		end
-	end 
+	end
 end
 
 local updateSpellQueueValue = function(element)
@@ -165,12 +167,12 @@ local updateSpellQueueDisplay = function(element)
 			value = max
 		end
 
-		-- Hide the overlay if it'd take up less than 5% of your bar, 
-		-- or if the total length of the window is shorter than 100ms. 
-		local ratio = value / max 
-		if (ratio < .05) or (ms < 100) then 
+		-- Hide the overlay if it'd take up less than 5% of your bar,
+		-- or if the total length of the window is shorter than 100ms.
+		local ratio = value / max
+		if (ratio < .05) or (ms < 100) then
 			value = 0
-		end 
+		end
 
 	else
 		max = 1
@@ -191,32 +193,32 @@ local UpdateColor = function(element, unit)
 	if (element.colorClass and UnitIsPlayer(unit)) then
 		local _, class = UnitClass(unit)
 		color = class and self.colors.class[class]
-	elseif (element.colorPetAsPlayer and UnitIsUnit(unit, "pet")) then 
+	elseif (element.colorPetAsPlayer and UnitIsUnit(unit, "pet")) then
 		local _, class = UnitClass("player")
 		color = class and self.colors.class[class]
 	elseif (element.colorReaction and UnitReaction(unit, "player")) then
 		color = self.colors.reaction[UnitReaction(unit, "player")]
 	end
-	if color then 
+	if color then
 		r, g, b = color[1], color[2], color[3]
-	end 
-	if (r) then 
+	end
+	if (r) then
 		element:SetStatusBarColor(r, g, b)
-	end 
-	if element.PostUpdateColor then 
+	end
+	if element.PostUpdateColor then
 		element:PostUpdateColor(unit)
-	end 
+	end
 end
 
 local OnUpdate = function(element, elapsed)
 	local self = element._owner
 	local unit = self.unit
-	if (not unit) or (not UnitExists(unit)) or (UnitIsDeadOrGhost(unit)) then 
+	if (not unit) or (not UnitExists(unit)) or (UnitIsDeadOrGhost(unit)) then
 		clear(element)
 		element:Hide()
 		element.max = 0
 		element.delay = 0
-		if (element.PostUpdate) then 
+		if (element.PostUpdate) then
 			return element:PostUpdate(unit)
 		end
 		return
@@ -225,11 +227,11 @@ local OnUpdate = function(element, elapsed)
 	if (element.casting or element.tradeskill) then
 		local duration = element.duration + elapsed
 		if (duration >= element.max) then
-			clear(element) 
+			clear(element)
 			element:Hide()
 			element.max = 0
 			element.delay = 0
-			if (element.PostUpdate) then 
+			if (element.PostUpdate) then
 				return element:PostUpdate(unit)
 			end
 			return
@@ -243,12 +245,12 @@ local OnUpdate = function(element, elapsed)
 				element.Value:SetText(formatTime(element.max - duration))
 			end
 		end
-		if (element.SpellQueue) and (not element.disableSpellQueue) then 
+		if (element.SpellQueue) and (not element.disableSpellQueue) then
 			updateSpellQueueDisplay(element)
-		end 
+		end
 		element.duration = duration
 		element:SetValue(duration)
-		if (element.PostUpdate) then 
+		if (element.PostUpdate) then
 			element:PostUpdate(unit)
 		end
 
@@ -259,7 +261,7 @@ local OnUpdate = function(element, elapsed)
 			element:Hide()
 			element.max = 0
 			element.delay = 0
-			if (element.PostUpdate) then 
+			if (element.PostUpdate) then
 				return element:PostUpdate(unit)
 			end
 			return
@@ -273,22 +275,22 @@ local OnUpdate = function(element, elapsed)
 				element.Value:SetText(formatTime(duration))
 			end
 		end
-		if (element.SpellQueue) and (not element.disableSpellQueue) then 
+		if (element.SpellQueue) and (not element.disableSpellQueue) then
 			updateSpellQueueDisplay(element)
-		end 
+		end
 		element.duration = duration
 		element:SetValue(duration)
-		if (element.PostUpdate) then 
+		if (element.PostUpdate) then
 			element:PostUpdate(unit)
 		end
-		
-	elseif (element.failedMessageTimer) then 
+
+	elseif (element.failedMessageTimer) then
 		element.failedMessageTimer = element.failedMessageTimer - elapsed
-		if (element.failedMessageTimer > 0) then 
-			return 
-		end 
+		if (element.failedMessageTimer > 0) then
+			return
+		end
 		element.failedMessageTimer = nil
-		if (element.Failed) then 
+		if (element.Failed) then
 			element.Failed:SetText("")
 		end
 	else
@@ -301,22 +303,22 @@ local OnUpdate = function(element, elapsed)
 		end
 		return
 	end
-end 
+end
 
 Update = function(self, event, unit, ...)
 	-- This just messes with our system here.
-	if (event == "FrequentUpdate") then 
+	if (event == "FrequentUpdate") then
 		return
 	end
 
 	-- Our custom events only return unitGUID, not unit
 	local unitGUID = UnitGUID(self.unit)
-	if (unit == unitGUID) then 
+	if (unit == unitGUID) then
 		unit = self.unit
 	end
-	if (not unit) or (unit ~= self.unit) then 
-		return 
-	end 
+	if (not unit) or (unit ~= self.unit) then
+		return
+	end
 
 	local element = self.Cast
 	if (element.PreUpdate) then
@@ -341,24 +343,24 @@ Update = function(self, event, unit, ...)
 			element.starttime = nil
 			element.failedMessageTimer = nil
 			element:SetMinMaxValues(0, element.total or element.max, true)
-			element:SetValue(element.duration, true) 
+			element:SetValue(element.duration, true)
 			element:UpdateColor(unit)
 
 			if (element.Failed) then element.Failed:SetText("") end
 			if (element.Name) then element.Name:SetText(utf8sub(text, element.maxNameChars or 32, true)) end
 			if (element.Icon) then element.Icon:SetTexture(texture) end
 			if (element.Value) then element.Value:SetText("") end
-			if (element.Shield) then 
+			if (element.Shield) then
 				if (element.notInterruptible) and (not UnitIsUnit(unit ,"player")) then
 					element.Shield:Show()
 				else
 					element.Shield:Hide()
 				end
 			end
-			if (element.SpellQueue) and (not element.disableSpellQueue) then 
+			if (element.SpellQueue) and (not element.disableSpellQueue) then
 				updateSpellQueueOrientation(element)
 				updateSpellQueueDisplay(element)
-			end 
+			end
 			element:Show()
 			element:SetScript("OnUpdate", OnUpdate)
 		else
@@ -366,45 +368,45 @@ Update = function(self, event, unit, ...)
 			element:SetValue(0, true)
 			element:SetScript("OnUpdate", nil)
 		end
-		
+
 	elseif (event == "GP_SPELL_CAST_FAILED") then
 
 		local timeLeft
 		if (element.timeToHold) then
 			timeLeft = GetTime() - (element.starttime or 0) -- should be there
 		end
-		
+
 		clear(element)
 
-		if (element.Shield) then 
-			element.Shield:Hide() 
-		end 
+		if (element.Shield) then
+			element.Shield:Hide()
+		end
 
 		if (element.timeToHold) then
 			local spellQueueWindow = updateSpellQueueValue(element) / 1e3 -- get value in seconds
 			if (timeLeft >= spellQueueWindow) then
 				element.failedMessageTimer = element.timeToHold
 				local msg = element.Failed or element.Value or element.Name
-				if (msg) then 
-					msg:SetText(utf8sub(L_FAILED, element.maxNameChars or 32, true)) 
-				end 
+				if (msg) then
+					msg:SetText(utf8sub(L_FAILED, element.maxNameChars or 32, true))
+				end
 			else
 				element.failedMessageTimer = nil
 				local msg = element.Failed or element.Value or element.Name
-				if (msg) then 
-					msg:SetText("") 
-				end 
+				if (msg) then
+					msg:SetText("")
+				end
 			end
 
 		else
 			element:Hide()
 			element:SetScript("OnUpdate", nil)
 			local msg = element.Failed or element.Value or element.Name
-			if (msg) then 
-				msg:SetText("") 
-			end 
+			if (msg) then
+				msg:SetText("")
+			end
 		end
-		
+
 	elseif (event == "GP_SPELL_CAST_SUCCESS") or (event == "GP_SPELL_CAST_STOP") or (event == "GP_SPELL_CAST_CHANNEL_STOP") then
 
 		clear(element)
@@ -414,13 +416,13 @@ Update = function(self, event, unit, ...)
 
 		-- Clear leftovers from earlier casts
 		local msg = element.Failed or element.Value or element.Name
-		if (msg) then 
-			msg:SetText("") 
-		end 
-		if (element.Shield) then 
-			element.Shield:Hide() 
-		end 
-		
+		if (msg) then
+			msg:SetText("")
+		end
+		if (element.Shield) then
+			element.Shield:Hide()
+		end
+
 	elseif (event == "GP_SPELL_CAST_INTERRUPTED") then
 
 		local timeLeft
@@ -430,9 +432,9 @@ Update = function(self, event, unit, ...)
 
 		clear(element)
 
-		if (element.Shield) then 
-			element.Shield:Hide() 
-		end 
+		if (element.Shield) then
+			element.Shield:Hide()
+		end
 
 		if (element.timeToHold) then
 
@@ -440,32 +442,32 @@ Update = function(self, event, unit, ...)
 			if (timeLeft >= spellQueueWindow) then
 				element.failedMessageTimer = element.timeToHold
 				local msg = element.Failed or element.Value or element.Name
-				if (msg) then 
-					msg:SetText(utf8sub(L_INTERRUPTED, element.maxNameChars or 32, true)) 
-				end 
+				if (msg) then
+					msg:SetText(utf8sub(L_INTERRUPTED, element.maxNameChars or 32, true))
+				end
 			else
 				element.failedMessageTimer = nil
 				local msg = element.Failed or element.Value or element.Name
-				if (msg) then 
-					msg:SetText("") 
-				end 
+				if (msg) then
+					msg:SetText("")
+				end
 			end
 
 		else
 			element:Hide()
 			element:SetScript("OnUpdate", nil)
 			local msg = element.Failed or element.Value or element.Name
-			if (msg) then 
-				msg:SetText("") 
-			end 
-			if (element.Shield) then 
-				element.Shield:Hide() 
-			end 
-		end 
-
-	elseif (event == "GP_SPELL_CAST_INTERRUPTIBLE") then 
+			if (msg) then
+				msg:SetText("")
+			end
+			if (element.Shield) then
+				element.Shield:Hide()
+			end
+		end
+
+	elseif (event == "GP_SPELL_CAST_INTERRUPTIBLE") then
 		element.notInterruptible = nil
-		if (element.Shield) then 
+		if (element.Shield) then
 			if (unitGUID ~= playerGUID) then
 				element.Shield:Show()
 			else
@@ -473,9 +475,9 @@ Update = function(self, event, unit, ...)
 			end
 		end
 
-	elseif (event == "GP_SPELL_CAST_NOT_INTERRUPTIBLE") then 
+	elseif (event == "GP_SPELL_CAST_NOT_INTERRUPTIBLE") then
 		element.notInterruptible = true
-		if (element.Shield) then 
+		if (element.Shield) then
 			if (unitGUID ~= playerGUID) then
 				element.Shield:Show()
 			else
@@ -485,20 +487,20 @@ Update = function(self, event, unit, ...)
 
 	elseif (event == "GP_SPELL_CAST_DELAYED") then
 		local name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID = LibCast:UnitCastingInfo(unit)
-		if (not startTime) or (not element.duration) then 
-			return 
+		if (not startTime) or (not element.duration) then
+			return
 		end
-		
+
 		local duration = GetTime() - startTime
-		if (duration < 0) then 
-			duration = 0 
+		if (duration < 0) then
+			duration = 0
 		end
 
 		element.delay = (element.delay or 0) + element.duration - duration
 		element.duration = duration
 		element:SetValue(duration)
-		
-	elseif (event == "GP_SPELL_CAST_CHANNEL_START") then	
+
+	elseif (event == "GP_SPELL_CAST_CHANNEL_START") then
 		local name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID = LibCast:UnitChannelInfo(unit)
 		if (name) then
 			local max = endTime - startTime
@@ -522,34 +524,34 @@ Update = function(self, event, unit, ...)
 			if (element.Name) then element.Name:SetText(utf8sub(name, element.maxNameChars or 32, true)) end
 			if (element.Icon) then element.Icon:SetTexture(texture) end
 			if (element.Value) then element.Value:SetText("") end
-			if (element.Shield) then 
+			if (element.Shield) then
 				if (element.notInterruptible) and (not UnitIsUnit(unit ,"player")) then
 					element.Shield:Show()
 				else
 					element.Shield:Hide()
 				end
 			end
-			if (element.SpellQueue) and (not element.disableSpellQueue) then 
+			if (element.SpellQueue) and (not element.disableSpellQueue) then
 				updateSpellQueueOrientation(element)
 				updateSpellQueueDisplay(element)
-			end 
+			end
 			element:Show()
 			element:SetScript("OnUpdate", OnUpdate)
-			
+
 		else
 			element:Hide()
 			element:SetValue(0, true)
 			element:SetScript("OnUpdate", nil)
 			local msg = element.Failed or element.Value or element.Name
-			if (msg) then 
-				msg:SetText("") 
-			end 
+			if (msg) then
+				msg:SetText("")
+			end
 		end
-		
+
 	elseif (event == "GP_SPELL_CAST_CHANNEL_UPDATE") then
 		local name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID = LibCast:UnitChannelInfo(unit)
-		if (not name) or (not element.duration) then 
-			return 
+		if (not name) or (not element.duration) then
+			return
 		end
 
 		local duration = endTime - GetTime()
@@ -557,13 +559,13 @@ Update = function(self, event, unit, ...)
 		element.duration = duration
 		element.max = endTime - startTime
 
-		if (element.SpellQueue) and (not element.disableSpellQueue) then 
+		if (element.SpellQueue) and (not element.disableSpellQueue) then
 			updateSpellQueueDisplay(element)
-		end 
-	
+		end
+
 		element:SetMinMaxValues(0, element.max)
 		element:SetValue(duration)
-	
+
 	elseif (event == "Forced") or (event == "PLAYER_TARGET_CHANGED") then
 
 		if (LibCast:UnitCastingInfo(unit)) then
@@ -572,7 +574,7 @@ Update = function(self, event, unit, ...)
 			return Update(self, "GP_SPELL_CAST_CHANNEL_START", unitGUID)
 		end
 
-		if (event == "PLAYER_TARGET_CHANGED") or not(element.casting or element.channeling or element.tradeskill or element.failedMessageTimer) then 
+		if (event == "PLAYER_TARGET_CHANGED") or not(element.casting or element.channeling or element.tradeskill or element.failedMessageTimer) then
 			clear(element)
 			element:Hide()
 			element:SetScript("OnUpdate", nil)
@@ -580,19 +582,19 @@ Update = function(self, event, unit, ...)
 			element.delay = 0
 			element.failedMessageTimer = nil
 			local msg = element.Failed or element.Value or element.Name
-			if (msg) then 
-				msg:SetText("") 
-			end 
-		end 
+			if (msg) then
+				msg:SetText("")
+			end
+		end
 	end
-	if (element.PostUpdate) then 
+	if (element.PostUpdate) then
 		return element:PostUpdate(unit)
-	end 
-end 
+	end
+end
 
 local Proxy = function(self, ...)
 	return (self.Cast.Override or Update)(self, ...)
-end 
+end
 
 local ForceUpdate = function(element)
 	return Proxy(element._owner, "Forced", element._owner.unit)
@@ -636,7 +638,7 @@ local Enable = function(self)
 
 		return true
 	end
-end 
+end
 
 local Disable = function(self)
 	local element = self.Cast
@@ -660,9 +662,9 @@ local Disable = function(self)
 		element.max = 0
 		element.delay = 0
 	end
-end 
+end
 
 -- Register it with compatible libraries
-for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do 
-	Lib:RegisterElement("Cast", Enable, Disable, Proxy, 54)
-end 
+for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do
+	Lib:RegisterElement("Cast", Enable, Disable, Proxy, 56)
+end
diff --git a/SimpleClassPower/back-end/plugins/unit_classpower.lua b/SimpleClassPower/back-end/plugins/unit_classpower.lua
index e67bb2d..3dec414 100644
--- a/SimpleClassPower/back-end/plugins/unit_classpower.lua
+++ b/SimpleClassPower/back-end/plugins/unit_classpower.lua
@@ -13,6 +13,7 @@ local table_sort = table.sort
 local Enum = Enum
 local GetComboPoints = GetComboPoints
 local GetRuneCooldown = GetRuneCooldown
+local GetRuneType = GetRuneType
 local GetSpecialization = GetSpecialization
 local HasOverrideActionBar = HasOverrideActionBar
 local HasTempShapeshiftActionBar = HasTempShapeshiftActionBar
@@ -35,8 +36,10 @@ local UnitPowerType = UnitPowerType
 local UnitStagger = UnitStagger
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 -- WoW Constants
@@ -100,7 +103,7 @@ local SOUL_FRAGMENTS_IDs = {
 -- Class specific info
 local _, PLAYERCLASS = UnitClass("player")
 
--- Declare core function names so we don't 
+-- Declare core function names so we don't
 -- have to worry about the order we put them in.
 local Proxy, ForceUpdate, Update, UpdatePowerType
 
@@ -109,18 +112,18 @@ local Generic = setmetatable({
 	EnablePower = function(self)
 		local element = self.ClassPower
 
-		for i = 1, #element do 
+		for i = 1, #element do
 			element[i]:SetMinMaxValues(0,1)
 			element[i]:SetValue(0)
 			element[i]:Hide()
-		end 
+		end
 
-		if (element.alphaNoCombat) or (element.alphaNoCombatRunes) then 
+		if (element.alphaNoCombat) or (element.alphaNoCombatRunes) then
 			self:RegisterEvent("PLAYER_REGEN_DISABLED", Proxy, true)
 			self:RegisterEvent("PLAYER_REGEN_ENABLED", Proxy, true)
-		end 
+		end
 		--self:RegisterEvent("PLAYER_TARGET_CHANGED", Proxy, true)
-		
+
 	end,
 	DisablePower = function(self)
 		local element = self.ClassPower
@@ -130,26 +133,26 @@ local Generic = setmetatable({
 		element.maxDisplayed = nil
 		element:Hide()
 
-		for i = 1, #element do 
+		for i = 1, #element do
 			element[i]:Hide()
 			element[i]:SetMinMaxValues(0,1)
 			element[i]:SetValue(0)
 			element[i]:SetScript("OnUpdate", nil)
-		end 
+		end
 
 		self:UnregisterEvent("PLAYER_REGEN_DISABLED", Proxy)
 		self:UnregisterEvent("PLAYER_REGEN_ENABLED", Proxy)
 		--self:UnregisterEvent("PLAYER_TARGET_CHANGED", Proxy)
-	end, 
+	end,
 	UpdatePower = function(self, event, unit, ...)
 		local element = self.ClassPower
-		if (not element.isEnabled) then 
+		if (not element.isEnabled) then
 			element:Hide()
-			return 
-		end 
+			return
+		end
 
 		local powerType = element.powerType
-		local powerID = element.powerID 
+		local powerID = element.powerID
 
 		local min = UnitPower("player", powerID) or 0
 		local max = UnitPowerMax("player", powerID) or 0
@@ -157,28 +160,28 @@ local Generic = setmetatable({
 		local maxDisplayed = element.maxDisplayed or element.max or max
 
 
-		for i = 1, maxDisplayed do 
+		for i = 1, maxDisplayed do
 			local point = element[i]
 			if (point) then
-				if (not point:IsShown()) then 
+				if (not point:IsShown()) then
 					point:Show()
-				end 
+				end
 				point:SetValue(min >= i and 1 or 0)
 			end
-		end 
+		end
 
-		for i = maxDisplayed+1, #element do 
+		for i = maxDisplayed+1, #element do
 			element[i]:SetValue(0)
-			if element[i]:IsShown() then 
+			if element[i]:IsShown() then
 				element[i]:Hide()
-			end 
-		end 
+			end
+		end
 
 		return min, max, powerType
-	end, 
+	end,
 	UpdateColor = function(element, unit, min, max, powerType)
 		local self = element._owner
-		local color = self.colors.power[powerType] 
+		local color = self.colors.power[powerType]
 		local colorMultiple = element.useAlternateColoring and self.colors.power[powerType.."_MULTIPLE"]
 		local r, g, b = color[1], color[2], color[3]
 		local maxDisplayed = element.maxDisplayed or element.max or max
@@ -188,18 +191,18 @@ local Generic = setmetatable({
 		if (element.colorClass and UnitIsPlayer(unit)) then
 			color = unitClass and self.colors.class[unitClass]
 			r, g, b = color[1], color[2], color[3]
-		end 
+		end
 
 		-- Decide on visibility
 		-- Has the module chosen to hide all when empty?
 		local hidden = element.hideWhenEmpty and (min == 0)
 		if (not hidden) then
 			-- Is the current power type one to keep visible?
-			local keepShown = (powerType == "SOUL_FRAGMENTS") or ((powerType == "HOLY_POWER") and (GetSpecialization() == SPEC_PALADIN_HOLY)) 
+			local keepShown = (powerType == "SOUL_FRAGMENTS") or ((powerType == "HOLY_POWER") and (GetSpecialization() == SPEC_PALADIN_HOLY))
 			if (not keepShown) then
 				hidden = (
 					-- Has the module chosen to only show this with an active target?
-					(element.hideWhenNoTarget and (not UnitExists("target"))) or 
+					(element.hideWhenNoTarget and (not UnitExists("target"))) or
 
 					-- Has the module chosen to only show this with a hostile target?
 					(element.hideWhenUnattackable and (not UnitCanAttack("player", "target")))
@@ -213,26 +216,26 @@ local Generic = setmetatable({
 				local point = element[i]
 				if (point) then
 					point:SetAlpha(0)
-				end 
-			end 
+				end
+			end
 		end
 
-		if (not hidden) then 
-			-- In case there are more points active 
-			-- then the currently allowed maximum. 
-			-- Meant to give an easy system to handle 
-			-- the Rogue Anticipation talent without 
-			-- the need for the module to write extra code. 
+		if (not hidden) then
+			-- In case there are more points active
+			-- then the currently allowed maximum.
+			-- Meant to give an easy system to handle
+			-- the Rogue Anticipation talent without
+			-- the need for the module to write extra code.
 			local overflow
-			if min > maxDisplayed then 
+			if min > maxDisplayed then
 				overflow = min % maxDisplayed
-			end 
+			end
 			for i = 1, maxDisplayed do
 				local point = element[i]
 				if (point) then
 
 					-- upvalue to preserve the original colors for the next point
-					local r, g, b = r, g, b 
+					local r, g, b = r, g, b
 					local multi = colorMultiple and colorMultiple[i]
 					if (multi) then
 						r, g, b = multi[1], multi[2], multi[3]
@@ -242,42 +245,42 @@ local Generic = setmetatable({
 					if (overflow) then
 						if (i > overflow) then
 							-- tone down "old" points
-							r, g, b = r*1/3, g*1/3, b*1/3 
-						else 
+							r, g, b = r*1/3, g*1/3, b*1/3
+						else
 							-- brighten the overflow points
 							r = (1-r)*1/3 + r
 							g = (1-g)*1/4 + g -- always brighten the green slightly less
 							b = (1-b)*1/3 + b
-						end 
-					end 
+						end
+					end
 
-					if (element.alphaNoCombat) then 
+					if (element.alphaNoCombat) then
 						point:SetStatusBarColor(r, g, b)
-						if (point.bg) then 
+						if (point.bg) then
 							local mult = element.backdropMultiplier or 1/3
 							point.bg:SetVertexColor(r*mult, g*mult, b*mult)
-						end 
+						end
 						local alpha = UnitAffectingCombat("player") and 1 or element.alphaNoCombat
 						if (i > min) and (element.alphaEmpty) then
 							point:SetAlpha(element.alphaEmpty * alpha)
-						else 
+						else
 							point:SetAlpha(alpha)
-						end 
-					else 
+						end
+					else
 						point:SetStatusBarColor(r, g, b, 1)
-						if (point.bg) then 
+						if (point.bg) then
 							local mult = element.backdropMultiplier or 1/3
 							point.bg:SetVertexColor(r*mult, g*mult, b*mult)
-						end 
-						if (element.alphaEmpty) then 
+						end
+						if (element.alphaEmpty) then
 							point:SetAlpha(min > i and element.alphaEmpty or 1)
-						else 
+						else
 							point:SetAlpha(1)
-						end 
-					end 
+						end
+					end
 				end
 			end
-		end 
+		end
 	end
 }, { __index = LibFrame:CreateFrame("Frame") })
 local Generic_MT = { __index = Generic }
@@ -295,23 +298,23 @@ ClassPower.None = setmetatable({
 			end
 			element:Hide()
 		end
-	end, 
+	end,
 	DisablePower = function() end,
 	UpdatePower = function() end,
 	UpdateColor = function() end,
 }, { __index = LibFrame:CreateFrame("Frame") })
 
-ClassPower.ComboPoints = setmetatable({ 
+ClassPower.ComboPoints = setmetatable({
 	ShouldEnable = function(self)
 		local element = self.ClassPower
-		if (PLAYERCLASS == "DRUID") then 
+		if (PLAYERCLASS == "DRUID") then
 			local powerType = UnitPowerType("player")
-			if (powerType == SPELL_POWER_ENERGY) then 
+			if (powerType == SPELL_POWER_ENERGY) then
 				return true
-			end 
-		else 
+			end
+		else
 			return true
-		end 
+		end
 	end,
 	EnablePower = function(self)
 		local element = self.ClassPower
@@ -319,16 +322,16 @@ ClassPower.ComboPoints = setmetatable({
 		element.powerType = "COMBO_POINTS"
 		element.maxDisplayed = element.maxComboPoints or MAX_COMBO_POINTS or 5
 
-		if (PLAYERCLASS == "DRUID") then 
+		if (PLAYERCLASS == "DRUID") then
 			element.isEnabled = element.ShouldEnable(self)
 			self:RegisterEvent("SPELLS_CHANGED", Proxy, true)
-		else 
+		else
 			element.isEnabled = true
-		end 
+		end
 
 		self:RegisterEvent("UNIT_POWER_FREQUENT", Proxy)
 		self:RegisterEvent("UNIT_MAXPOWER", Proxy)
-	
+
 		Generic.EnablePower(self)
 	end,
 	DisablePower = function(self)
@@ -337,51 +340,228 @@ ClassPower.ComboPoints = setmetatable({
 		self:UnregisterEvent("UNIT_MAXPOWER", Proxy)
 
 		Generic.DisablePower(self)
-	end, 
+	end,
 	UpdatePower = function(self, event, unit, ...)
 		local element = self.ClassPower
 		local min, max
 
 		if (PLAYERCLASS == "DRUID") then
-			if (event == "SPELLS_CHANGED") or (event == "UNIT_DISPLAYPOWER") then 
+			if (event == "SPELLS_CHANGED") or (event == "UNIT_DISPLAYPOWER") then
 				element.isEnabled = element.ShouldEnable(self)
-			end 
+			end
 		end
 		min = UnitPower("player", element.powerID) or 0
 		max = UnitPowerMax("player", element.powerID) or 0
-		if (not element.isEnabled) then 
+		if (not element.isEnabled) then
 			element:Hide()
-			return 
-		end 
+			return
+		end
 
 		local maxDisplayed = element.maxDisplayed or element.max or max
 
-		for i = 1, maxDisplayed do 
+		for i = 1, maxDisplayed do
 			local point = element[i]
 			if (point) then
-				if (not point:IsShown()) then 
+				if (not point:IsShown()) then
 					point:Show()
-				end 
+				end
 				local value = min >= i and 1 or 0
 				point:SetValue(value)
 			end
-		end 
+		end
 
-		for i = maxDisplayed+1, #element do 
+		for i = maxDisplayed+1, #element do
 			element[i]:SetValue(0)
-			if (element[i]:IsShown()) then 
+			if (element[i]:IsShown()) then
 				element[i]:Hide()
-			end 
-		end 
+			end
+		end
 
 		return min, max, element.powerType
 	end
 }, Generic_MT)
 
+-- Class resources only available in wrath
+if (IsWrath) then
+	ClassPower.Runes = setmetatable({
+
+		EnablePower = function(self)
+			local element = self.ClassPower
+			element.powerID = SPELL_POWER_RUNES
+			element.powerType = "RUNES"
+			element.max = 6 -- no global value exists for this
+			element.maxDisplayed = nil -- don't limit this by default
+			element.runeOrder = { 1, 2, 5, 6, 3, 4 }
+			element.isEnabled = true
+
+			self:RegisterEvent("RUNE_POWER_UPDATE", Proxy, true)
+
+			Generic.EnablePower(self)
+		end,
+		DisablePower = function(self)
+			local element = self.ClassPower
+			element.runeOrder = nil
+			for i = 1, #element do
+				element[i]:SetScript("OnUpdate", nil)
+			end
+			Generic.DisablePower(self)
+		end,
+		OnUpdateRune = function(rune, elapsed)
+			rune.duration = rune.duration + elapsed
+			rune:SetValue(rune.duration, true)
+		end,
+		UpdateRuneType = function(rune, runeID, alt)
+			rune.runeType = GetRuneType(runeID) or alt
+			return rune
+		end,
+		ColorRune = function(self, rune, runeType)
+			local color = runeType and self.colors.runes[runeType] or self.colors.power.RUNES
+			local r, g, b = color[1], color[2], color[3]
+			rune:SetStatusBarColor(r, g, b)
+
+			local bg = rune.bg
+			if bg then
+				local mu = bg.multiplier or 1
+				bg:SetVertexColor(r * mu, g * mu, b * mu)
+			end
+
+			return color, r, g, b
+		end,
+		UpdatePower = function(self, event, unit, ...)
+			local element = self.ClassPower
+			if (not element.isEnabled) then
+				element:Hide()
+				return
+			end
+
+			if (event == "RUNE_TYPE_UPDATE") then
+				local rune
+				local runeID, alt = ...
+				if (runeID) then
+					rune = element.UpdateRuneType(element[element.runeOrder[runeID]], runeID, alt)
+					if (rune) then
+						local color, r, g, b = element.ColorRune(self, rune, rune.runeType)
+
+					end
+				end
+			end
+
+			--local min = 0 -- available runes
+			--local max = UnitPowerMax("player", element.powerID) or 0 -- maximum available runes
+			--local maxDisplayed = element.max or max -- maximum displayed runes
+
+			-- Update runes
+			local numReady = 0
+			local allReady = true
+			local currentTime = GetTime()
+			local hasVehicle = UnitHasVehicleUI("player")
+			for index, runeID in ipairs(element.runeOrder) do
+				local rune = element[index]
+				if not rune then break end
+
+				if (hasVehicle) then
+					rune:Hide()
+
+					allReady = false
+				else
+					local start, duration, runeReady = GetRuneCooldown(runeID)
+					if (runeReady) then
+						rune:SetMinMaxValues(0, 1)
+						rune:SetValue(1)
+						rune:SetScript("OnUpdate", nil)
+						rune.ready = true
+						numReady = numReady + 1
+					elseif (start) then
+						rune.duration = currentTime - start
+						rune:SetMinMaxValues(0, duration)
+						rune:SetValue(rune.duration)
+						rune:SetScript("OnUpdate", element.OnUpdateRune)
+						rune.ready = false
+					end
+
+					if (not runeReady) then
+						allReady = false
+					end
+
+					rune:Show()
+				end
+			end
+
+			return numReady, #element.runeOrder, element.powerType
+		end,
+		UpdateColor = function(element, unit, min, max, powerType, alt)
+			local self = element._owner
+
+			-- Ready ones fully opaque, charging ones toned down, everything even more without a hostile target
+			if (UnitAffectingCombat("player") or UnitAffectingCombat("pet")) then
+				local chargingAlpha = element.alpahEmptyRunes or element.alphaEmpty or .5
+				local fullAlpha = 1
+
+				for i = 1,#element.runeOrder do
+					local runeID = element.runeOrder[i]
+					local point = element[i]
+					if (point) then
+						if (not point.runeType) then
+							point.runeType = GetRuneType(element.runeOrder[i])
+						end
+						element.ColorRune(self, point, point.runeType)
+						point:SetAlpha(point.ready and fullAlpha or chargingAlpha)
+						if (point.bg) then
+							local mult = element.backdropMultiplier or 1/3
+							point.bg:SetVertexColor(r*mult, g*mult, b*mult)
+						end
+					end
+				end
+
+			-- All are toned down, charging/empty ones even more
+			elseif (min < max) or (UnitExists("target") and not UnitIsFriend("player", "target")) then
+				local chargingAlpha = (element.alpahEmptyRunes or element.alphaEmpty or .5)*(element.alphaNoCombatRunes or element.alphaNoCombat or .5)
+				local fullAlpha = element.alphaNoCombatRunes or element.alphaNoCombat or .5
+
+				for i = 1,#element.runeOrder do
+					local runeID = element.runeOrder[i]
+					local point = element[i]
+					if (point) then
+						if (not point.runeType) then
+							point.runeType = GetRuneType(element.runeOrder[i])
+						end
+						element.ColorRune(self, point, point.runeType)
+						point:SetAlpha(point.ready and fullAlpha or chargingAlpha)
+						if (point.bg) then
+							local mult = element.backdropMultiplier or 1/3
+							point.bg:SetVertexColor(r*mult, g*mult, b*mult)
+						end
+					end
+				end
+
+			-- Hidden
+			else
+
+				for i = 1,#element.runeOrder do
+					local runeID = element.runeOrder[i]
+					local point = element[i]
+					if (point) then
+						if (not point.runeType) then
+							point.runeType = GetRuneType(element.runeOrder[i])
+						end
+						element.ColorRune(self, point, point.runeType)
+						point:SetAlpha(element.alphaWhenHiddenRunes or 0)
+						if (point.bg) then
+							local mult = element.backdropMultiplier or 1/3
+							point.bg:SetVertexColor(r*mult, g*mult, b*mult)
+						end
+					end
+				end
+
+			end
+		end
+	}, Generic_MT)
+end
+
 -- Class resources only available in retail
 if (IsRetail) then
 
-	ClassPower.ArcaneCharges = setmetatable({ 
+	ClassPower.ArcaneCharges = setmetatable({
 		EnablePower = function(self)
 			local element = self.ClassPower
 			element.powerID = SPELL_POWER_ARCANE_CHARGES
@@ -402,7 +582,7 @@ if (IsRetail) then
 		end
 	}, Generic_MT)
 
-	ClassPower.Chi = setmetatable({ 
+	ClassPower.Chi = setmetatable({
 		EnablePower = function(self)
 			local element = self.ClassPower
 			element.powerID = SPELL_POWER_CHI
@@ -432,7 +612,7 @@ if (IsRetail) then
 		end
 	}, Generic_MT)
 
-	ClassPower.HolyPower = setmetatable({ 
+	ClassPower.HolyPower = setmetatable({
 		EnablePower = function(self)
 			local element = self.ClassPower
 			element.powerID = SPELL_POWER_HOLY_POWER
@@ -453,7 +633,7 @@ if (IsRetail) then
 		end
 	}, Generic_MT)
 
-	ClassPower.Runes = setmetatable({ 
+	ClassPower.Runes = setmetatable({
 
 		EnablePower = function(self)
 			local element = self.ClassPower
@@ -471,11 +651,11 @@ if (IsRetail) then
 		DisablePower = function(self)
 			local element = self.ClassPower
 			element.runeOrder = nil
-			for i = 1, #element do 
+			for i = 1, #element do
 				element[i]:SetScript("OnUpdate", nil)
-			end 
+			end
 			Generic.DisablePower(self)
-		end, 
+		end,
 		SortByTimeAsc = function(runeAID, runeBID)
 			local runeAStart, _, runeARuneReady = GetRuneCooldown(runeAID)
 			local runeBStart, _, runeBRuneReady = GetRuneCooldown(runeBID)
@@ -504,10 +684,10 @@ if (IsRetail) then
 		end,
 		UpdatePower = function(self, event, unit, ...)
 			local element = self.ClassPower
-			if (not element.isEnabled) then 
+			if (not element.isEnabled) then
 				element:Hide()
-				return 
-			end 
+				return
+			end
 
 			if (element.runeSortOrder == "ASC") then
 				table_sort(element.runeOrder, element.SortByTimeAsc)
@@ -532,10 +712,10 @@ if (IsRetail) then
 				runeID = element.runeOrder[id]
 				rune = element[id]
 
-				if (not rune) then 
-					break 
+				if (not rune) then
+					break
 				end
-				
+
 				start, duration, runeReady = GetRuneCooldown(runeID)
 				if (runeReady) then
 					rune:SetScript("OnUpdate", nil)
@@ -555,28 +735,28 @@ if (IsRetail) then
 			end
 
 			-- Make sure the runes are shown
-			for i = 1, maxDisplayed do 
+			for i = 1, maxDisplayed do
 				local rune = element[i]
 				if (rune) then
-					if (not rune:IsShown()) then 
+					if (not rune:IsShown()) then
 						rune:Show()
-					end 
+					end
 				end
-			end 
+			end
 
 			-- Hide additional points in the classpower element, if any
-			for i = maxDisplayed + 1, #element do 
+			for i = maxDisplayed + 1, #element do
 				local rune = element[i]
 				if (rune) then
 					rune:SetValue(0)
-					if (rune:IsShown()) then 
+					if (rune:IsShown()) then
 						rune:Hide()
-					end 
+					end
 				end
-			end 
+			end
 
 			return min, max, element.powerType
-		end, 
+		end,
 		UpdateColor = function(element, unit, min, max, powerType)
 			local self = element._owner
 			local color = self.colors.power[powerType]
@@ -588,10 +768,10 @@ if (IsRetail) then
 				local _, class = UnitClass(unit)
 				color = class and self.colors.class[class]
 				r, g, b = color[1], color[2], color[3]
-			end 
-			
+			end
+
 			-- Ready ones fully opaque, charging ones toned down, everything even more without a hostile target
-			if (UnitAffectingCombat("player") or UnitAffectingCombat("pet")) then 
+			if (UnitAffectingCombat("player") or UnitAffectingCombat("pet")) then
 				local chargingAlpha = element.alphaEmpty or .5
 				local fullAlpha = 1
 				for i = 1, maxDisplayed do
@@ -599,26 +779,26 @@ if (IsRetail) then
 					if (point) then
 						point:SetStatusBarColor(r, g, b)
 						point:SetAlpha(i > min and chargingAlpha or fullAlpha)
-						if (point.bg) then 
+						if (point.bg) then
 							local mult = element.backdropMultiplier or 1/3
 							point.bg:SetVertexColor(r*mult, g*mult, b*mult)
-						end 
+						end
 					end
 				end
 
 			-- All are toned down, charging/empty ones even more
-			elseif (min < maxDisplayed) or (UnitExists("target") and not UnitIsFriend("player", "target")) then 
+			elseif (min < maxDisplayed) or (UnitExists("target") and not UnitIsFriend("player", "target")) then
 				local chargingAlpha = (element.alphaEmpty or .5)*(element.alphaNoCombatRunes or element.alphaNoCombat or .5)
 				local fullAlpha = element.alphaNoCombatRunes or element.alphaNoCombat or .5
 				for i = 1, maxDisplayed do
 					local point = element[i]
-					if (point) then 
+					if (point) then
 						point:SetStatusBarColor(r, g, b)
 						point:SetAlpha(i > min and chargingAlpha or fullAlpha)
-						if (point.bg) then 
+						if (point.bg) then
 							local mult = element.backdropMultiplier or 1/3
 							point.bg:SetVertexColor(r*mult, g*mult, b*mult)
-						end 
+						end
 					end
 				end
 
@@ -629,17 +809,17 @@ if (IsRetail) then
 					if (point) then
 						point:SetStatusBarColor(r, g, b)
 						point:SetAlpha(element.alphaWhenHiddenRunes or 0)
-						if (point.bg) then 
+						if (point.bg) then
 							local mult = element.backdropMultiplier or 1/3
 							point.bg:SetVertexColor(r*mult, g*mult, b*mult)
-						end 
-					end 
-				end 
+						end
+					end
+				end
 			end
 		end
 	}, Generic_MT)
 
-	ClassPower.SoulFragments = setmetatable({ 
+	ClassPower.SoulFragments = setmetatable({
 		EnablePower = function(self)
 			local element = self.ClassPower
 			element.powerType = "SOUL_FRAGMENTS"
@@ -657,10 +837,10 @@ if (IsRetail) then
 		end,
 		UpdatePower = function(self, event, unit, ...)
 			local element = self.ClassPower
-			if (not element.isEnabled) then 
+			if (not element.isEnabled) then
 				element:Hide()
-				return 
-			end 
+				return
+			end
 
 			local powerType = element.powerType
 			local min = 0
@@ -670,8 +850,8 @@ if (IsRetail) then
 			local id = 1
 			while (true) do
 				local name, _, count, _, _, _, _, _, _, spellID = UnitAura("player", id, "HELPFUL")
-				if (not name) then 
-					break 
+				if (not name) then
+					break
 				end
 				if (spellID) and ((spellID == SOUL_FRAGMENTS_ID) or (SOUL_FRAGMENTS_IDs[spellID])) then
 					min = count
@@ -680,28 +860,28 @@ if (IsRetail) then
 			end
 
 			local maxDisplayed = element.maxDisplayed or element.max or max
-			for i = 1, maxDisplayed do 
+			for i = 1, maxDisplayed do
 				local point = element[i]
 				if (point) then
-					if (not point:IsShown()) then 
+					if (not point:IsShown()) then
 						point:Show()
-					end 
+					end
 					point:SetValue(min >= i and 1 or 0)
 				end
-			end 
+			end
 
-			for i = maxDisplayed + 1, #element do 
+			for i = maxDisplayed + 1, #element do
 				element[i]:SetValue(0)
-				if (element[i]:IsShown()) then 
+				if (element[i]:IsShown()) then
 					element[i]:Hide()
-				end 
-			end 
+				end
+			end
 
 			return min, max, powerType
 		end,
 	}, Generic_MT)
 
-	ClassPower.SoulShards = setmetatable({ 
+	ClassPower.SoulShards = setmetatable({
 		EnablePower = function(self)
 			local element = self.ClassPower
 			element.powerID = SPELL_POWER_SOUL_SHARDS
@@ -722,13 +902,13 @@ if (IsRetail) then
 		end,
 		UpdatePower = function(self, event, unit, ...)
 			local element = self.ClassPower
-			if (not element.isEnabled) then 
+			if (not element.isEnabled) then
 				element:Hide()
-				return 
-			end 
+				return
+			end
 
 			local powerType = element.powerType
-			local powerID = element.powerID 
+			local powerID = element.powerID
 
 			local min = UnitPower("player", powerID, true) or 0
 			local max = UnitPowerMax("player", powerID) or 0
@@ -744,30 +924,30 @@ if (IsRetail) then
 
 			local numActive = min + 0.9
 			local maxDisplayed = element.maxDisplayed or element.max or max
-			
-			for i = 1, maxDisplayed do 
+
+			for i = 1, maxDisplayed do
 				local point = element[i]
 				if (point) then
-					if (not point:IsShown()) then 
+					if (not point:IsShown()) then
 						point:Show()
-					end 
+					end
 					local value = (i > numActive) and 0 or (min - i + 1)
 					point:SetValue(value)
 				end
-			end 
+			end
 
-			for i = maxDisplayed+1, #element do 
+			for i = maxDisplayed+1, #element do
 				element[i]:SetValue(0)
-				if (element[i]:IsShown()) then 
+				if (element[i]:IsShown()) then
 					element[i]:Hide()
-				end 
-			end 
+				end
+			end
 
 			return min, max, powerType
 		end
 	}, Generic_MT)
 
-	ClassPower.Stagger = setmetatable({ 
+	ClassPower.Stagger = setmetatable({
 		EnablePower = function(self)
 			local element = self.ClassPower
 			element.powerType = "STAGGER"
@@ -782,16 +962,16 @@ if (IsRetail) then
 			self:UnregisterEvent("UNIT_AURA", Proxy)
 
 			Generic.DisablePower(self)
-		end, 
+		end,
 		UpdatePower = function(self, event, unit, ...)
 			local element = self.ClassPower
-			if (not element.isEnabled) then 
+			if (not element.isEnabled) then
 				element:Hide()
-				return 
-			end 
+				return
+			end
 
 			local powerType = element.powerType
-			local powerID = element.powerID 
+			local powerID = element.powerID
 
 			-- Blizzard code has nil checks for UnitStagger return
 			local min = UnitStagger("player") or 0
@@ -805,28 +985,28 @@ if (IsRetail) then
 				numPoints = 2
 			elseif (perc > 0) then
 				numPoints = 1
-			else 
+			else
 				numPoints = 0
 			end
 
 			local maxDisplayed = element.maxDisplayed or element.max or max
 
-			for i = 1, maxDisplayed do 
+			for i = 1, maxDisplayed do
 				local point = element[i]
 				if (point) then
-					if (not point:IsShown()) then 
+					if (not point:IsShown()) then
 						point:Show()
-					end 
+					end
 					point:SetValue(numPoints >= i and 1 or 0)
 				end
-			end 
+			end
 
-			for i = maxDisplayed + 1, #element do 
+			for i = maxDisplayed + 1, #element do
 				element[i]:SetValue(0)
-				if (element[i]:IsShown()) then 
+				if (element[i]:IsShown()) then
 					element[i]:Hide()
-				end 
-			end 		
+				end
+			end
 
 			return min, max, powerType
 		end,
@@ -851,76 +1031,76 @@ if (IsRetail) then
 				local _, class = UnitClass(unit)
 				color = class and self.colors.class[class]
 				r, g, b = color[1], color[2], color[3]
-			end 
-			
+			end
+
 			-- Has the module chosen to only show this with an active target,
 			-- or has the module chosen to hide all when empty?
 			if (element.hideWhenNoTarget and (not UnitExists("target")))
-			or (element.hideWhenUnattackable and (not UnitCanAttack("player", "target"))) 
-			or (element.hideWhenEmpty and (min == 0)) then 
+			or (element.hideWhenUnattackable and (not UnitCanAttack("player", "target")))
+			or (element.hideWhenEmpty and (min == 0)) then
 				for i = 1, maxDisplayed do
 					local point = element[i]
 					if (point) then
 						point:SetAlpha(0)
-					end 
-				end 
-			else 
-				-- In case there are more points active 
-				-- then the currently allowed maximum. 
-				-- Meant to give an easy system to handle 
-				-- the Rogue Anticipation talent without 
-				-- the need for the module to write extra code. 
+					end
+				end
+			else
+				-- In case there are more points active
+				-- then the currently allowed maximum.
+				-- Meant to give an easy system to handle
+				-- the Rogue Anticipation talent without
+				-- the need for the module to write extra code.
 				local overflow
-				if (min > maxDisplayed) then 
+				if (min > maxDisplayed) then
 					overflow = min % maxDisplayed
-				end 
+				end
 				for i = 1, maxDisplayed do
 					local point = element[i]
 					if (point) then
 
 						-- upvalue to preserve the original colors for the next point
-						local r, g, b = r, g, b 
+						local r, g, b = r, g, b
 
 						-- Handle overflow coloring
 						if (overflow) then
 							if (i > overflow) then
 								-- tone down "old" points
-								r, g, b = r*1/3, g*1/3, b*1/3 
-							else 
+								r, g, b = r*1/3, g*1/3, b*1/3
+							else
 								-- brighten the overflow points
 								r = (1-r)*1/3 + r
 								g = (1-g)*1/4 + g -- always brighten the green slightly less
 								b = (1-b)*1/3 + b
-							end 
-						end 
+							end
+						end
 
-						if (element.alphaNoCombat) then 
+						if (element.alphaNoCombat) then
 							point:SetStatusBarColor(r, g, b)
-							if (point.bg) then 
+							if (point.bg) then
 								local mult = element.backdropMultiplier or 1/3
 								point.bg:SetVertexColor(r*mult, g*mult, b*mult)
-							end 
+							end
 								local alpha = UnitAffectingCombat(unit) and 1 or element.alphaNoCombat
 							if (i > min) and (element.alphaEmpty) then
 								point:SetAlpha(element.alphaEmpty * alpha)
-							else 
+							else
 								point:SetAlpha(alpha)
-							end 
-						else 
+							end
+						else
 							point:SetStatusBarColor(r, g, b, 1)
-							if (point.bg) then 
+							if (point.bg) then
 								local mult = element.backdropMultiplier or 1/3
 								point.bg:SetVertexColor(r*mult, g*mult, b*mult)
-							end 
-							if (element.alphaEmpty) then 
+							end
+							if (element.alphaEmpty) then
 								point:SetAlpha(min > i and element.alphaEmpty or 1)
-							else 
+							else
 								point:SetAlpha(1)
-							end 
-						end 
-					end 
+							end
+						end
+					end
 				end
-			end 
+			end
 		end
 	}, Generic_MT)
 
@@ -931,9 +1111,9 @@ Update = function(self, event, unit, ...)
 	local element = self.ClassPower
 
 	-- Run the general preupdate
-	if element.PreUpdate then 
+	if element.PreUpdate then
 		element:PreUpdate(unit)
-	end 
+	end
 
 	-- Store the old maximum value, if any
 	local oldMax = element.max
@@ -941,65 +1121,65 @@ Update = function(self, event, unit, ...)
 	-- Run the current powerType's Update function
 	local min, max, powerType = element.UpdatePower(self, event, unit, ...)
 
-	-- Stop execution if element was disabled 
+	-- Stop execution if element was disabled
 	-- during its own update cycle.
-	if (not element.isEnabled) then 
-		return 
-	end 
+	if (not element.isEnabled) then
+		return
+	end
 
 	-- Post update element colors, allow modules to override
 	local updateColor = element.OverrideColor or element.UpdateColor
-	if updateColor then 
+	if updateColor then
 		updateColor(element, unit, min, max, powerType)
-	end 
+	end
 
 	if (element.hideFullyWhenEmpty) and (min == 0) then
 		if (element:IsShown()) then
 			element:Hide()
 		end
 	else
-		if (not element:IsShown()) then 
+		if (not element:IsShown()) then
 			element:Show()
-		end 
+		end
 	end
 
 	-- Run the general postupdate
-	if (element.PostUpdate) then 
+	if (element.PostUpdate) then
 		return element:PostUpdate(unit, min, max, oldMax ~= max, powerType)
-	end 
-end 
+	end
+end
 
--- This is where the current powerType is decided, 
+-- This is where the current powerType is decided,
 -- where we check for and unregister conditional events
 -- related to player specialization, talents or level.
 -- This is also where we toggle the current element,
--- disable the old and enable the new. 
+-- disable the old and enable the new.
 if (IsClassic or IsTBC) then
 	UpdatePowerType = function(self, event, unit, ...)
 		local element = self.ClassPower
 
-		-- Should be safe to always check for unit even here, 
+		-- Should be safe to always check for unit even here,
 		-- our unitframe library should provide it if unitless events are registered properly.
-		if (not unit) or (unit ~= self.unit) or (event == "UNIT_POWER_FREQUENT" and (...) ~= element.powerType) then 
-			return 
-		end 
+		if (not unit) or (unit ~= self.unit) or (event == "UNIT_POWER_FREQUENT" and (...) ~= element.powerType) then
+			return
+		end
 
-		local newType 
-		if ((PLAYERCLASS == "DRUID") or (PLAYERCLASS == "ROGUE")) and (not element.ignoreComboPoints) then 
+		local newType
+		if ((PLAYERCLASS == "DRUID") or (PLAYERCLASS == "ROGUE")) and (not element.ignoreComboPoints) then
 			newType = "ComboPoints"
-		else 
+		else
 			newType = "None"
-		end 
+		end
 
 		local currentType = element._currentType
 
 		-- Disable previous type if present and different
-		if (currentType) and (currentType ~= newType) then 
+		if (currentType) and (currentType ~= newType) then
 			element.DisablePower(self)
-		end 
+		end
 
 		-- Set or change the powerType if there is a new or initial one
-		if (not currentType) or (currentType ~= newType) then 
+		if (not currentType) or (currentType ~= newType) then
 
 			-- Update type
 			element._currentType = newType
@@ -1009,21 +1189,62 @@ if (IsClassic or IsTBC) then
 
 			-- Enable using new type
 			element.EnablePower(self)
-		end 
+		end
 
 		-- Continue to the regular update method
 		return Update(self, event, unit, ...)
-	end 
-end
-if (IsRetail) then
+	end
+elseif (IsWrath) then
+	UpdatePowerType = function(self, event, unit, ...)
+		local element = self.ClassPower
+
+		-- Should be safe to always check for unit even here,
+		-- our unitframe library should provide it if unitless events are registered properly.
+		if (not unit) or (unit ~= self.unit) or (event == "UNIT_POWER_FREQUENT" and (...) ~= element.powerType) then
+			return
+		end
+
+		local newType
+		if ((PLAYERCLASS == "DRUID") or (PLAYERCLASS == "ROGUE")) and (not element.ignoreComboPoints) then
+			newType = "ComboPoints"
+		elseif (PLAYERCLASS == "DEATHKNIGHT") and (not element.ignoreRunes) then
+			newType = "Runes"
+		else
+			newType = "None"
+		end
+
+		local currentType = element._currentType
+
+		-- Disable previous type if present and different
+		if (currentType) and (currentType ~= newType) then
+			element.DisablePower(self)
+		end
+
+		-- Set or change the powerType if there is a new or initial one
+		if (not currentType) or (currentType ~= newType) then
+
+			-- Update type
+			element._currentType = newType
+
+			-- Change the meta
+			setmetatable(element, { __index = ClassPower[newType] })
+
+			-- Enable using new type
+			element.EnablePower(self)
+		end
+
+		-- Continue to the regular update method
+		return Update(self, event, unit, ...)
+	end
+elseif (IsRetail) then
 	UpdatePowerType = function(self, event, unit, ...)
 		local element = self.ClassPower
 
-		-- Should be safe to always check for unit even here, 
+		-- Should be safe to always check for unit even here,
 		-- our unitframe library should provide it if unitless events are registered properly.
-		if (not unit) or (unit ~= self.unit) or (event == "UNIT_POWER_FREQUENT" and (...) ~= element.powerType) then 
-			return 
-		end 
+		if (not unit) or (unit ~= self.unit) or (event == "UNIT_POWER_FREQUENT" and (...) ~= element.powerType) then
+			return
+		end
 
 		local spec = GetSpecialization()
 		local level = UnitLevel("player")
@@ -1032,14 +1253,14 @@ if (IsRetail) then
 			level = ...
 			if ((PLAYERCLASS == "PALADIN") and (level >= PALADINPOWERBAR_SHOW_LEVEL)) or (PLAYERCLASS == "WARLOCK") and (level >= SHARDBAR_SHOW_LEVEL) then
 				self:UnregisterEvent("PLAYER_LEVEL_UP", Proxy)
-			end 
-	
+			end
+
 		elseif (event == "UPDATE_POSSESS_BAR") then
 			element.hasPossessBar = IsPossessBarVisible()
-	
-		elseif (event == "UPDATE_OVERRIDE_ACTIONBAR") then 
-			element.hasOverrideBar = HasOverrideActionBar() or HasTempShapeshiftActionBar() 
-	
+
+		elseif (event == "UPDATE_OVERRIDE_ACTIONBAR") then
+			element.hasOverrideBar = HasOverrideActionBar() or HasTempShapeshiftActionBar()
+
 		elseif (event == "UNIT_ENTERING_VEHICLE")
 			or (event == "UNIT_ENTERED_VEHICLE")
 			or (event == "UNIT_EXITING_VEHICLE")
@@ -1047,46 +1268,46 @@ if (IsRetail) then
 		then
 			element.inVehicle = UnitInVehicle("player")
 			element.hasVehicleUI = UnitHasVehiclePlayerFrameUI("player") and PlayerVehicleHasComboPoints()
-		end 
+		end
 
-		local newType 
-		if (element.hasPossessBar or element.hasOverrideBar) or (element.inVehicle and (not element.hasVehicleUI)) then 
+		local newType
+		if (element.hasPossessBar or element.hasOverrideBar) or (element.inVehicle and (not element.hasVehicleUI)) then
 			newType = "None"
-		elseif (element.hasVehicleUI) and (not element.ignoreComboPoints) then 
+		elseif (element.hasVehicleUI) and (not element.ignoreComboPoints) then
 			newType = "ComboPoints"
-		elseif (PLAYERCLASS == "DEATHKNIGHT") and (not element.ignoreRunes) then 
+		elseif (PLAYERCLASS == "DEATHKNIGHT") and (not element.ignoreRunes) then
 			newType = "Runes"
-		elseif (PLAYERCLASS == "DRUID") and (not element.ignoreComboPoints) then 
+		elseif (PLAYERCLASS == "DRUID") and (not element.ignoreComboPoints) then
 			newType = "ComboPoints"
-		elseif (PLAYERCLASS == "MAGE") and (spec == SPEC_MAGE_ARCANE) and (not element.ignoreArcaneCharges) then 
+		elseif (PLAYERCLASS == "MAGE") and (spec == SPEC_MAGE_ARCANE) and (not element.ignoreArcaneCharges) then
 			newType = "ArcaneCharges"
-		elseif (PLAYERCLASS == "MONK") and (spec == SPEC_MONK_WINDWALKER) and (not element.ignoreChi) then 
+		elseif (PLAYERCLASS == "MONK") and (spec == SPEC_MONK_WINDWALKER) and (not element.ignoreChi) then
 			newType = "Chi"
-		elseif (PLAYERCLASS == "MONK") and (spec == SPEC_MONK_BREWMASTER) and (not element.ignoreStagger) then 
+		elseif (PLAYERCLASS == "MONK") and (spec == SPEC_MONK_BREWMASTER) and (not element.ignoreStagger) then
 			newType = "Stagger"
 		elseif ((PLAYERCLASS == "PALADIN") and (level >= PALADINPOWERBAR_SHOW_LEVEL)) and (not element.ignoreHolyPower) then
 			newType = "HolyPower"
-		elseif (PLAYERCLASS == "ROGUE") and (not element.ignoreComboPoints) then 
+		elseif (PLAYERCLASS == "ROGUE") and (not element.ignoreComboPoints) then
 			newType = "ComboPoints"
-		elseif ((PLAYERCLASS == "WARLOCK") and (level >= SHARDBAR_SHOW_LEVEL)) and (not element.ignoreSoulShards) then 
+		elseif ((PLAYERCLASS == "WARLOCK") and (level >= SHARDBAR_SHOW_LEVEL)) and (not element.ignoreSoulShards) then
 			newType = "SoulShards"
-		elseif (PLAYERCLASS == "DEMONHUNTER") and (spec == SPEC_DEMONHUNTER_VENGEANCE) and (not element.ignoreSoulFragments) then 
+		elseif (PLAYERCLASS == "DEMONHUNTER") and (spec == SPEC_DEMONHUNTER_VENGEANCE) and (not element.ignoreSoulFragments) then
 			newType = "SoulFragments"
-		--elseif (not element.ignoreComboPoints) then 
+		--elseif (not element.ignoreComboPoints) then
 		--	newType = "ComboPoints"
-		else 
+		else
 			newType = "None"
-		end 
-	
+		end
+
 		local currentType = element._currentType
 
 		-- Disable previous type if present and different
-		if (currentType) and (currentType ~= newType) then 
+		if (currentType) and (currentType ~= newType) then
 			element.DisablePower(self)
-		end 
+		end
 
 		-- Set or change the powerType if there is a new or initial one
-		if (not currentType) or (currentType ~= newType) then 
+		if (not currentType) or (currentType ~= newType) then
 
 			-- Update type
 			element._currentType = newType
@@ -1096,7 +1317,7 @@ if (IsRetail) then
 
 			-- Enable using new type
 			element.EnablePower(self)
-		end 
+		end
 
 		-- Continue to the regular update method
 		return Update(self, event, unit, ...)
@@ -1105,7 +1326,7 @@ end
 
 Proxy = function(self, ...)
 	return (self.ClassPower.Override or UpdatePowerType)(self, ...)
-end 
+end
 
 ForceUpdate = function(element)
 	return Proxy(element._owner, "Forced", element._owner.unit)
@@ -1117,8 +1338,8 @@ local Enable = function(self)
 		element._owner = self
 		element.ForceUpdate = ForceUpdate
 
-		-- Give points access to their owner element, 
-		-- regardless of whether that element is their direct parent or not. 
+		-- Give points access to their owner element,
+		-- regardless of whether that element is their direct parent or not.
 		for i = 1,#element do
 			element[i]._owner = element
 		end
@@ -1131,42 +1352,47 @@ local Enable = function(self)
 			local level = UnitLevel("player")
 			if ((PLAYERCLASS == "PALADIN") and (level < PALADINPOWERBAR_SHOW_LEVEL)) or (PLAYERCLASS == "WARLOCK") and (level < SHARDBAR_SHOW_LEVEL) then
 				self:RegisterEvent("PLAYER_LEVEL_UP", Proxy, true)
-			end  
+			end
 
-			-- We'll handle spec specific powers from here, 
+			-- We'll handle spec specific powers from here,
 			-- but will leave level checking to the sub-elements.
-			if (PLAYERCLASS == "MONK") or (PLAYERCLASS == "MAGE") or (PLAYERCLASS == "PALADIN") or (PLAYERCLASS == "DEMONHUNTER") then 
-				self:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED", Proxy, true) 
-			end 
+			if (PLAYERCLASS == "MONK") or (PLAYERCLASS == "MAGE") or (PLAYERCLASS == "PALADIN") or (PLAYERCLASS == "DEMONHUNTER") then
+				self:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED", Proxy, true)
+			end
 			if (PLAYERCLASS == "MONK") then
-				self:RegisterEvent("PLAYER_TALENT_UPDATE", Proxy, true) 
+				self:RegisterEvent("PLAYER_TALENT_UPDATE", Proxy, true)
 			end
-
+			self:RegisterEvent("UPDATE_OVERRIDE_ACTIONBAR", Proxy, true)
+			self:RegisterEvent("UPDATE_POSSESS_BAR", Proxy, true)
+		end
+		if (IsRetail or IsWrath) then
 			-- All must check for vehicles
-			-- *Also of importance that none 
+			-- *Also of importance that none
 			-- of the powerTypes remove this event.
 			self:RegisterEvent("UNIT_ENTERED_VEHICLE", Proxy)
 			self:RegisterEvent("UNIT_ENTERING_VEHICLE", Proxy)
 			self:RegisterEvent("UNIT_EXITED_VEHICLE", Proxy)
 			self:RegisterEvent("UNIT_EXITING_VEHICLE", Proxy)
-			self:RegisterEvent("UPDATE_OVERRIDE_ACTIONBAR", Proxy, true)
-			self:RegisterEvent("UPDATE_POSSESS_BAR", Proxy, true)
+
+			if (IsWrath and PLAYERCLASS == "DEATHKNIGHT") then
+				self:RegisterEvent("RUNE_TYPE_UPDATE", Proxy, true)
+			end
 		end
 
 		return true
 	end
-end 
+end
 
 local Disable = function(self)
 	local element = self.ClassPower
 	if element then
 
 		-- Disable the current powerType, if any
-		if element._currentType then 
+		if element._currentType then
 			element.DisablePower(self)
 			element._currentType = nil
 			element.powerType = nil
-		end 
+		end
 
 		-- Remove generic events
 		self:UnregisterEvent("UNIT_DISPLAYPOWER", Proxy)
@@ -1176,17 +1402,23 @@ local Disable = function(self)
 		if (IsRetail) then
 			self:UnregisterEvent("PLAYER_LEVEL_UP", Proxy)
 			self:UnregisterEvent("PLAYER_SPECIALIZATION_CHANGED", Proxy)
+			self:UnregisterEvent("UPDATE_OVERRIDE_ACTIONBAR", Proxy)
+			self:UnregisterEvent("UPDATE_POSSESS_BAR", Proxy)
+		end
+		if (IsRetail or IsWrath) then
 			self:UnregisterEvent("UNIT_ENTERED_VEHICLE", Proxy)
 			self:UnregisterEvent("UNIT_ENTERING_VEHICLE", Proxy)
 			self:UnregisterEvent("UNIT_EXITED_VEHICLE", Proxy)
 			self:UnregisterEvent("UNIT_EXITING_VEHICLE", Proxy)
-			self:UnregisterEvent("UPDATE_OVERRIDE_ACTIONBAR", Proxy)
-			self:UnregisterEvent("UPDATE_POSSESS_BAR", Proxy)
+
+			if (IsWrath and PLAYERCLASS == "DEATHKNIGHT") then
+				self:UnregisterEvent("RUNE_TYPE_UPDATE", Proxy)
+			end
 		end
 	end
-end 
+end
 
 -- Register it with compatible libraries
-for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do 
-	Lib:RegisterElement("ClassPower", Enable, Disable, Proxy, 58)
-end 
+for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do
+	Lib:RegisterElement("ClassPower", Enable, Disable, Proxy, 62)
+end
diff --git a/SimpleClassPower/back-end/plugins/unit_groupdebuff.lua b/SimpleClassPower/back-end/plugins/unit_groupdebuff.lua
index 4e2acb6..5346d13 100644
--- a/SimpleClassPower/back-end/plugins/unit_groupdebuff.lua
+++ b/SimpleClassPower/back-end/plugins/unit_groupdebuff.lua
@@ -18,8 +18,10 @@ local UnitClass = UnitClass
 local UnitIsCharmed = UnitIsCharmed
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 -- Player Constants
@@ -27,15 +29,15 @@ local _,playerClass = UnitClass("player")
 local playerLevel = UnitLevel("player")
 
 -- Base filter for everybody
-local baseFilter = { 
-	HARMFUL = { Boss = true, Custom = true }, 
-	HELPFUL = { Boss = true, Custom = true } 
+local baseFilter = {
+	HARMFUL = { Boss = true, Custom = true },
+	HELPFUL = { Boss = true, Custom = true }
 }
 
 -- Class specific aura filter based on learning level of the dispel.
 -- *The above is todo, all levels changed in Shadowlands. Blergh.
 -- *Also note these are defensive dispels only, not offensive like Steal Magic.
--- 
+--
 -- https://wow.gamepedia.com/Dispel
 local classFilter
 if (IsClassic) then
@@ -46,7 +48,7 @@ if (IsClassic) then
 		PALADIN 	= { HARMFUL = { Magic = 1, Poison = 1, Disease = 1 } },
 		PRIEST 		= { HARMFUL = { Magic = 1, Disease = 1 } },
 		SHAMAN 		= { HARMFUL = { Poison = 1, Disease = 1 } },
-		WARLOCK 	= { HARMFUL = { Magic = 1 } } 
+		WARLOCK 	= { HARMFUL = { Magic = 1 } }
 	})[playerClass]
 elseif (IsTBC) then
 	classFilter = ({
@@ -56,7 +58,16 @@ elseif (IsTBC) then
 		PALADIN 	= { HARMFUL = { Magic = 1, Poison = 1, Disease = 1 } },
 		PRIEST 		= { HARMFUL = { Magic = 1, Disease = 1 } },
 		SHAMAN 		= { HARMFUL = { Poison = 1, Disease = 1 } },
-		WARLOCK 	= { HARMFUL = { Magic = 1 } } 
+		WARLOCK 	= { HARMFUL = { Magic = 1 } }
+	})[playerClass]
+elseif (IsWrath) then -- copy of retail? is retail still right?
+	classFilter = ({
+		-- CLASS 	= { FILTER_TYPE = { School = Level } }
+		DRUID 		= { HARMFUL = { Curse = 1, Poison = 1 } },
+		MAGE 		= { HARMFUL = { Curse = 1 } },
+		PALADIN 	= { HARMFUL = { Poison = 1, Disease = 1 } },
+		PRIEST 		= { HARMFUL = { Magic = 1, Disease = 1 } },
+		SHAMAN 		= { HARMFUL = { Curse = 1 } }
 	})[playerClass]
 else
 	classFilter = ({
@@ -70,7 +81,7 @@ else
 	})[playerClass]
 end
 
--- Only list dispels that require a specific spec. 
+-- Only list dispels that require a specific spec.
 -- *Basically this is all healer classes except priest.
 -- *Note that this ONLY applies to Retail, not Classic!
 local specFilter = (IsRetail) and ({
@@ -104,14 +115,14 @@ local UpdateClassFilter = function(level)
 end
 UpdateClassFilter(playerLevel)
 
--- SpellIDs that will have their type overridden, 
--- to allow for specific auras to be tracked through our system. 
+-- SpellIDs that will have their type overridden,
+-- to allow for specific auras to be tracked through our system.
 local spellTypeOverride = {
 	-- Tests (Require Custom to be enabled for Druids to try out)
 	--[  8936] = "Custom"  -- Regrowth
 }
 
--- Priority of aura types. 
+-- Priority of aura types.
 -- Higher means higher.
 local PRIORITY_NONE = -9999 -- Start at something outlandishly low.
 local priorities = {
@@ -136,78 +147,78 @@ local formatTime = function(time)
 		return "%.0f%s", math_ceil(time / HOUR), "h"
 	elseif (time > MINUTE) then -- more than a minute
 		return "%.0f%s", math_ceil(time / MINUTE), "m"
-	elseif (time > 5) then 
+	elseif (time > 5) then
 		return "%.0f", math_ceil(time)
-	elseif (time > .9) then 
+	elseif (time > .9) then
 		return "|cffff8800%.0f|r", math_ceil(time)
 	elseif (time > .05) then
 		return "|cffff0000%.0f|r", time*10 - time*10%1
 	else
 		return ""
-	end	
+	end
 end
 
 -- Borrow the unitframe tooltip
 local GetTooltip = function(element)
 	return element.GetTooltip and element:GetTooltip() or element._owner.GetTooltip and element._owner:GetTooltip()
-end 
+end
 
 local Aura_UpdateTooltip = function(element)
 	local tooltip = GetTooltip(element)
 	tooltip:Hide()
 	tooltip:SetMinimumWidth(160)
 
-	if element.tooltipDefaultPosition then 
+	if element.tooltipDefaultPosition then
 		tooltip:SetDefaultAnchor(element)
 
-	elseif element.tooltipPoint then 
+	elseif element.tooltipPoint then
 		tooltip:SetOwner(element)
 		tooltip:Place(element.tooltipPoint, element.tooltipAnchor or element, element.tooltipRelPoint or element.tooltipPoint, element.tooltipOffsetX or 0, element.tooltipOffsetY or 0)
-	else 
+	else
 		tooltip:SetSmartAnchor(element, element.tooltipOffsetX or 10, element.tooltipOffsetY or 10)
-	end 
+	end
 
-	if (element.filter == "HELPFUL") then 
+	if (element.filter == "HELPFUL") then
 		tooltip:SetUnitBuff(element.unit, element.index, element.filter)
-	else 
+	else
 		tooltip:SetUnitDebuff(element.unit, element.index, element.filter)
-	end 
+	end
 end
 
 local Aura_OnEnter = function(element)
-	if element.OnEnter then 
+	if element.OnEnter then
 		return element:OnEnter()
-	end 
+	end
 
 	element.isMouseOver = true
 	element.UpdateTooltip = Aura_UpdateTooltip
 	element:UpdateTooltip()
 
-	if element.PostEnter then 
+	if element.PostEnter then
 		return element:PostEnter()
-	end 
+	end
 end
 
 local Aura_OnLeave = function(element)
-	if element.OnLeave then 
+	if element.OnLeave then
 		return element:OnLeave()
-	end 
+	end
 
 	element.UpdateTooltip = nil
 
 	local tooltip = GetTooltip(element)
 	tooltip:Hide()
 
-	if element.PostLeave then 
+	if element.PostLeave then
 		return element:PostLeave()
-	end 
+	end
 end
 
 local Aura_SetCooldownTimer = function(element, start, duration)
 	local cooldown = element.Cooldown
 	if (not cooldown) then
 		return
-	end 
+	end
 	if (element.showCooldownSpiral) then
 		cooldown:SetSwipeColor(0, 0, 0, .75)
 		cooldown:SetDrawEdge(false)
@@ -220,10 +231,10 @@ local Aura_SetCooldownTimer = function(element, start, duration)
 		else
 			element:Hide()
 		end
-	else 
+	else
 		cooldown:Hide()
-	end 
-end 
+	end
+end
 
 local HZ = 1/20
 local Aura_UpdateTimer = function(element, elapsed)
@@ -233,11 +244,11 @@ local Aura_UpdateTimer = function(element, elapsed)
 			element.timeLeft = element.expirationTime - GetTime()
 			if (element.timeLeft > 0) then
 				if (element.Time) then
-					if (element.timeLeft < LONG_THRESHOLD) or (element.showLongCooldownValues) then 
+					if (element.timeLeft < LONG_THRESHOLD) or (element.showLongCooldownValues) then
 						element.Time:SetFormattedText(formatTime(element.timeLeft))
 					else
 						element.Time:SetText("")
-					end 
+					end
 				end
 				if element.PostUpdateTimer then
 					element:PostUpdateTimer()
@@ -252,7 +263,7 @@ local Aura_UpdateTimer = function(element, elapsed)
 				if (element:IsShown() and element.PostUpdateTimer) then
 					element:PostUpdateTimer()
 				end
-			end	
+			end
 			element.elapsed = 0
 		end
 	end
@@ -290,7 +301,7 @@ end
 
 local Update = function(self, event, unit, ...)
 	local forceUpdateFilter
-	if (event == "PLAYER_LEVEL_UP") then 
+	if (event == "PLAYER_LEVEL_UP") then
 		local level = ...
 		if (level and (level ~= playerLevel)) then
 			playerLevel = level
@@ -299,15 +310,15 @@ local Update = function(self, event, unit, ...)
 			end
 			UpdateClassFilter(playerLevel)
 		end
-	elseif (event == "PLAYER_SPECIALIZATION_CHANGED") or (event == "PLAYER_TALENT_UPDATE") or (event == "CHARACTER_POINTS_CHANGED") then 
+	elseif (event == "PLAYER_SPECIALIZATION_CHANGED") or (event == "PLAYER_TALENT_UPDATE") or (event == "CHARACTER_POINTS_CHANGED") then
 		UpdateClassFilter(playerLevel)
 	end
-	if (not unit) or (unit ~= self.unit) then 
-		return 
-	end 
-	
+	if (not unit) or (unit ~= self.unit) then
+		return
+	end
+
 	-- Different GUID means a different player or NPC,
-	-- so we want updates to be instant, not smoothed. 
+	-- so we want updates to be instant, not smoothed.
 	local guid = UnitGUID(unit)
 	local forced = event == "Forced"
 
@@ -319,33 +330,33 @@ local Update = function(self, event, unit, ...)
 	-- Store some basic values on the element
 	local forced = forced or guid ~= element.guid
 	element.guid = guid
-	
+
 	local canAttack = UnitCanAttack("player", unit)
 	local isCharmed = UnitIsCharmed(unit)
 
 	local newID, newPriority, newType, newDebuffType, newFilter, newSpellID
 	local newIcon, newCount, newDuration, newExpirationTime
 
-	-- Use a local priority comparison, 
-	-- avoid changing anything on the element while it's iterating. 
+	-- Use a local priority comparison,
+	-- avoid changing anything on the element while it's iterating.
 	local currentPrio = PRIORITY_NONE
 
-	-- Once for each filter type, as UnitAura can't list HELPFUL and HARMFUL at the same time. 
+	-- Once for each filter type, as UnitAura can't list HELPFUL and HARMFUL at the same time.
 	for filterType,schoolList in pairs(baseFilter) do
 
-		-- Iterate auras until no more exists, 
-		-- don't rely on values that will be different in Classic and Live. 
+		-- Iterate auras until no more exists,
+		-- don't rely on values that will be different in Classic and Live.
 		local auraID = 0
 		while true do
 			auraID = auraID + 1
 
 			local name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, nameplateShowPersonal, spellID, canApplyAura, isBossDebuff, isCastByPlayer, nameplateShowAll, timeMod, value1, value2, value3 = LibAura:GetUnitAura(unit, auraID, filterType)
 
-			if (not name) then 
-				break 
-			end 
+			if (not name) then
+				break
+			end
 
-			-- Clunky, but still shortest current way to bake the overrides into the system 
+			-- Clunky, but still shortest current way to bake the overrides into the system
 			local auraType = isBossDebuff and "Boss" or spellTypeOverride[spellID] or debuffType
 
 			-- Don't show if the unit is mindcontrolled or attackable for some reason.
@@ -361,8 +372,8 @@ local Update = function(self, event, unit, ...)
 					newFilter = filterType
 					newSpellID = spellID
 					newIcon = icon
-					newCount = count 
-					newDuration = duration 
+					newCount = count
+					newDuration = duration
 					newExpirationTime = expirationTime
 
 					-- Update our local prio tracker
@@ -373,14 +384,14 @@ local Update = function(self, event, unit, ...)
 	end
 
 	-- Update the element
-	if (newID) then 
+	if (newID) then
 
 		-- Too much?
 		--element:Hide()
 		--print(newSpellID, newID)
 
 		-- Values have to be set before it's shown,
-		-- to avoid the update timer bugging out. 
+		-- to avoid the update timer bugging out.
 		element.priority = newPriority
 		element.index = newID
 		element.filter = newFilter
@@ -410,7 +421,7 @@ local Update = function(self, event, unit, ...)
 		-- Hide the element and halt update timer
 		element:Hide()
 
-		-- Clear the icon 
+		-- Clear the icon
 		if (element.Icon) then
 			element.Icon:SetTexture("")
 		end
@@ -423,8 +434,8 @@ local Update = function(self, event, unit, ...)
 		-- Clear the timer
 		Aura_SetTimer(element)
 
-		-- Clear out the values only after it's been hidden, 
-		-- to avoid bugging out our update timer. 
+		-- Clear out the values only after it's been hidden,
+		-- to avoid bugging out our update timer.
 		element.priority = nil
 		element.index = nil
 		element.filter = nil
@@ -434,16 +445,16 @@ local Update = function(self, event, unit, ...)
 		element.duration = nil
 		element.expirationTime = nil
 	end
-	
+
 	-- Run module post updates.
 	if (element.PostUpdate) then
 		return element:PostUpdate(unit)
-	end	
-end 
+	end
+end
 
 local Proxy = function(self, ...)
 	return (self.GroupAura.Override or Update)(self, ...)
-end 
+end
 
 local ForceUpdate = function(element)
 	return Proxy(element._owner, "Forced", element._owner.unit)
@@ -461,9 +472,9 @@ local Enable = function(self)
 		-- Let's make sure this is cleared
 		element:SetScript("OnUpdate", nil)
 
-		-- Let the modules decide whether or not 
-		-- we will use tooltips and mouse capture. 
-		if (element.disableMouse) then 
+		-- Let the modules decide whether or not
+		-- we will use tooltips and mouse capture.
+		if (element.disableMouse) then
 			element:EnableMouse(false)
 			element:SetScript("OnEnter", nil)
 			element:SetScript("OnLeave", nil)
@@ -483,7 +494,7 @@ local Enable = function(self)
 
 		return true
 	end
-end 
+end
 
 local Disable = function(self)
 	local element = self.GroupAura
@@ -499,9 +510,9 @@ local Disable = function(self)
 		element:Hide()
 		element:SetScript("OnUpdate", nil)
 	end
-end 
+end
 
 -- Register it with compatible libraries
-for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do 
-	Lib:RegisterElement("GroupAura", Enable, Disable, Proxy, 32)
-end 
+for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do
+	Lib:RegisterElement("GroupAura", Enable, Disable, Proxy, 33)
+end
diff --git a/SimpleClassPower/back-end/plugins/unit_grouprole.lua b/SimpleClassPower/back-end/plugins/unit_grouprole.lua
index 056ac57..66f4186 100644
--- a/SimpleClassPower/back-end/plugins/unit_grouprole.lua
+++ b/SimpleClassPower/back-end/plugins/unit_grouprole.lua
@@ -5,12 +5,14 @@ assert(LibClientBuild, "UnitGroupRole requires LibClientBuild to be loaded.")
 local UnitGroupRolesAssigned = UnitGroupRolesAssigned
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 -- WoW Dummy API for now.
--- We will find a way to figure this out better later on. Maybe. 
+-- We will find a way to figure this out better later on. Maybe.
 if (IsClassic or IsTBC) then
 	UnitGroupRolesAssigned = function(unit)
 		return "DAMAGER"
@@ -20,9 +22,9 @@ end
 local roleToObject = { TANK = "Tank", HEALER = "Healer", DAMAGER = "Damager" }
 
 local Update = function(self, event, unit)
-	if (not unit) or (unit ~= self.unit) then 
-		return 
-	end 
+	if (not unit) or (unit ~= self.unit) then
+		return
+	end
 
 	local element = self.GroupRole
 	if (element.PreUpdate) then
@@ -32,38 +34,38 @@ local Update = function(self, event, unit)
 	local groupRole = UnitGroupRolesAssigned(self.unit)
 	if (groupRole == "TANK" or groupRole == "HEALER" or groupRole == "DAMAGER") then
 		local hasRoleTexture
-		for role, objectName in pairs(roleToObject) do 
+		for role, objectName in pairs(roleToObject) do
 			local object = element[objectName]
-			if (object) then 
+			if (object) then
 				object:SetShown(role == groupRole)
 				hasRoleTexture = true
-			end 
-		end 
-		if (element.Show and hasRoleTexture) then 
+			end
+		end
+		if (element.Show and hasRoleTexture) then
 			element:Show()
-		elseif (element.Hide) then  
+		elseif (element.Hide) then
 			element:Hide()
-		end 
+		end
 	else
-		for role, objectName in pairs(roleToObject) do 
+		for role, objectName in pairs(roleToObject) do
 			local object = element[objectName]
-			if (object) then 
+			if (object) then
 				object:Hide()
-			end 
-		end 
-		if (element.Hide) then 
+			end
+		end
+		if (element.Hide) then
 			element:Hide()
-		end 
+		end
 	end
 
-	if (element.PostUpdate) then 
+	if (element.PostUpdate) then
 		return element:PostUpdate(unit, groupRole)
 	end
-end 
+end
 
 local Proxy = function(self, ...)
 	return (self.GroupRole.Override or Update)(self, ...)
-end 
+end
 
 local ForceUpdate = function(element)
 	return Proxy(element._owner, "Forced", element._owner.unit)
@@ -75,39 +77,39 @@ local Enable = function(self)
 		element._owner = self
 		element.ForceUpdate = ForceUpdate
 
-		for role, objectName in pairs(roleToObject) do 
+		for role, objectName in pairs(roleToObject) do
 			local object = element[objectName]
-			if object then 
+			if object then
 				object:Hide()
-			end 
-		end 
-		if element.Hide then 
+			end
+		end
+		if element.Hide then
 			element:Hide()
-		end 
+		end
 
 		self:RegisterEvent("GROUP_ROSTER_UPDATE", Proxy, true)
 
-		return true 
+		return true
 	end
-end 
+end
 
 local Disable = function(self)
 	local element = self.GroupRole
 	if element then
-		for role, objectName in pairs(roleToObject) do 
+		for role, objectName in pairs(roleToObject) do
 			local object = element[objectName]
-			if object then 
+			if object then
 				object:Hide()
-			end 
-		end 
-		if element.Hide then 
+			end
+		end
+		if element.Hide then
 			element:Hide()
-		end 
+		end
 		self:UnregisterEvent("GROUP_ROSTER_UPDATE", Proxy)
 	end
-end 
+end
 
 -- Register it with compatible libraries
-for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do 
-	Lib:RegisterElement("GroupRole", Enable, Disable, Proxy, 18)
-end 
+for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do
+	Lib:RegisterElement("GroupRole", Enable, Disable, Proxy, 19)
+end
diff --git a/SimpleClassPower/back-end/plugins/unit_health.lua b/SimpleClassPower/back-end/plugins/unit_health.lua
index b27f7c3..d7867d3 100644
--- a/SimpleClassPower/back-end/plugins/unit_health.lua
+++ b/SimpleClassPower/back-end/plugins/unit_health.lua
@@ -33,7 +33,7 @@ local UnitIsDeadOrGhost = UnitIsDeadOrGhost
 local UnitIsFriend = UnitIsFriend
 local UnitIsPlayer = UnitIsPlayer
 local UnitIsUnit = UnitIsUnit
-local UnitIsTapDenied = UnitIsTapDenied 
+local UnitIsTapDenied = UnitIsTapDenied
 local UnitPlayerControlled = UnitPlayerControlled
 local UnitReaction = UnitReaction
 local UnitThreatSituation = UnitThreatSituation
@@ -49,6 +49,7 @@ local S_PLAYER_OFFLINE = PLAYER_OFFLINE
 
 -- Constants for client version
 local IsRetail = LibClientBuild:IsRetail()
+local IsWrath = LibClientBuild:IsWrath()
 
 -- Constants
 local _,CLASS = UnitClass("player")
@@ -56,7 +57,7 @@ local minAbsorbDisplaySize = .1
 local maxAbsorbDisplaySize = .6
 
 -- Utility Functions
----------------------------------------------------------------------	
+---------------------------------------------------------------------
 -- Calculate a RGB gradient from a minimum of 2 sets of RGB values
 local colorsAndPercent = function(currentValue, maxValue, ...)
 	if (currentValue <= 0 or maxValue == 0) then
@@ -82,22 +83,22 @@ end
 
 local UpdateValues = function(health, unit, min, max, minPerc, maxPerc)
 	local healthValue = health.Value
-	if (healthValue) then 
-		if (healthValue.Override) then 
+	if (healthValue) then
+		if (healthValue.Override) then
 			healthValue:Override(unit, min, max)
 		else
-			if (health.disconnected) then 
+			if (health.disconnected) then
 				healthValue:SetText(S_PLAYER_OFFLINE)
 			-- In classic, min can be 0 for players, but minPerc/maxPerc available.
 			elseif (health.dead) or (min == 0 and ((not minPerc) or (minPerc == 0))) then
 				healthValue:SetText(S_DEAD)
 			elseif (health.afk and healthValue.ShowAFK) then
 				healthValue:SetText(S_AFK)
-			else 
+			else
 				if (min == 0 or max == 0) and (not healthValue.showAtZero) then
 					healthValue:SetText("")
 				else
-					if (healthValue.useSmartValue) then 
+					if (healthValue.useSmartValue) then
 						if (min == max) then
 							healthValue:SetFormattedText("%s", large(min))
 						else
@@ -120,56 +121,56 @@ local UpdateValues = function(health, unit, min, max, minPerc, maxPerc)
 					end
 				end
 			end
-			if (healthValue.PostUpdate) then 
+			if (healthValue.PostUpdate) then
 				healthValue:PostUpdate(unit, min, max)
-			end 
-		end 
+			end
+		end
 	end
 	local healthPercent = health.ValuePercent
-	if (healthPercent) then 
+	if (healthPercent) then
 		local min, max = minPerc or min, maxPerc or max
 		if (min and max) and (max > 0) then
-			if (healthPercent.Override) then 
+			if (healthPercent.Override) then
 				healthPercent:Override(unit, min, max)
 			else
-				if (health.disconnected or health.dead) then 
+				if (health.disconnected or health.dead) then
 					healthPercent:SetText("")
-				else 
+				else
 					if (healthPercent.setPrecision) then
 						healthPercent:SetFormattedText("%."..healthPercent.setPrecision.."f%%", min/max*100)
 					else
 						healthPercent:SetFormattedText("%.0f%%", min/max*100 - (min/max*100)%1)
 					end
-				end 
-				if (healthPercent.PostUpdate) then 
+				end
+				if (healthPercent.PostUpdate) then
 					healthPercent:PostUpdate(unit, min, max)
-				end 
-			end 
+				end
+			end
 		else
 			healthPercent:SetText("")
-		end 
+		end
 	end
 	local absorbValue = health.ValueAbsorb
-	if (absorbValue) then 
+	if (absorbValue) then
 		local curAbsorb = health.curAbsorb
-		if (curAbsorb) and (curAbsorb > 0) then 
-			if (absorbValue.Override) then 
+		if (curAbsorb) and (curAbsorb > 0) then
+			if (absorbValue.Override) then
 				absorbValue:Override(unit, curAbsorb)
 			else
-				if (health.disconnected or health.dead) then 
+				if (health.disconnected or health.dead) then
 					absorbValue:SetText("")
-				else 
+				else
 					absorbValue:SetFormattedText("%s", short(curAbsorb))
-				end 
-				if (absorbValue.PostUpdate) then 
+				end
+				if (absorbValue.PostUpdate) then
 					absorbValue:PostUpdate(unit, curAbsorb)
-				end 
-			end 
-		else 
+				end
+			end
+		else
 			absorbValue:SetText("")
-		end 
+		end
 	end
-end 
+end
 
 local UpdateColors = function(health, unit, min, max)
 	if health.OverrideColor then
@@ -178,7 +179,7 @@ local UpdateColors = function(health, unit, min, max)
 
 	local self = health._owner
 	local color, r, g, b
-	if (health.colorPlayer and UnitIsUnit(unit, "player")) then 
+	if (health.colorPlayer and UnitIsUnit(unit, "player")) then
 		color = self.colors.class[CLASS]
 	elseif (health.colorTapped and health.tapped) then
 		color = self.colors.tapped
@@ -186,47 +187,45 @@ local UpdateColors = function(health, unit, min, max)
 		color = self.colors.disconnected
 	elseif (health.colorDead and health.dead) then
 		color = self.colors.dead
-	elseif (health.colorCivilian and UnitIsPlayer(unit) and UnitIsFriend("player", unit)) then 
+	elseif (health.colorCivilian and UnitIsPlayer(unit) and UnitIsFriend("player", unit)) then
 		color = self.colors.reaction.civilian
 	elseif (health.colorClass and UnitIsPlayer(unit)) then
 		local _, class = UnitClass(unit)
 		color = class and self.colors.class[class]
-	elseif (health.colorPetAsPlayer and UnitIsUnit(unit, "pet")) then 
+	elseif (health.colorPetAsPlayer and UnitIsUnit(unit, "pet")) then
 		local _, class = UnitClass("player")
 		color = class and self.colors.class[class]
 	else
 		if (health.colorThreat) then
 			-- BUG: Non-existent '*target' or '*pet' units cause UnitThreatSituation() errors (thank you oUF!)
 			local threat
-			if (IsRetail) then
-				if ((not health.hideThreatSolo) or (IsInGroup() or IsInInstance())) then
-					local feedbackUnit = health.threatFeedbackUnit
-					if (not UnitIsFriend("player", unit)) and (feedbackUnit and (feedbackUnit ~= unit) and UnitExists(feedbackUnit)) then
-						threat = UnitThreatSituation(feedbackUnit, unit)
-					else
-						threat = UnitThreatSituation(unit)
-					end
+			if ((not health.hideThreatSolo) or (IsInGroup() or IsInInstance())) then
+				local feedbackUnit = health.threatFeedbackUnit
+				if (not UnitIsFriend("player", unit)) and (feedbackUnit and (feedbackUnit ~= unit) and UnitExists(feedbackUnit)) then
+					threat = UnitThreatSituation(feedbackUnit, unit)
+				else
+					threat = UnitThreatSituation(unit)
 				end
 			end
-			if (threat) and (self.colors.threat[threat]) then 
+			if (threat) and (self.colors.threat[threat]) then
 				color = self.colors.threat[threat]
 			end
 		end
 		if (not color) then
 			if (health.colorReaction and UnitReaction(unit, "player")) then
 				color = self.colors.reaction[UnitReaction(unit, "player")]
-			elseif (health.colorHealth) then 
+			elseif (health.colorHealth) then
 				color = self.colors.health
 			end
 		end
 	end
 
-	if (color) then 
-		if (health.colorSmooth) then 
+	if (color) then
+		if (health.colorSmooth) then
 			r, g, b = gradient(min, max, 1,0,0, color[1], color[2], color[3], color[1], color[2], color[3])
-		else 
+		else
 			r, g, b = color[1], color[2], color[3]
-		end 
+		end
 		health:SetStatusBarColor(r, g, b)
 		health.Preview:SetStatusBarColor(r, g, b)
 
@@ -238,11 +237,11 @@ local UpdateColors = function(health, unit, min, max)
 			local aB = b + (1 - b)*4/5 -- 1/2
 			absorb:SetStatusBarColor(aR, aG, aB)
 		end
-	end 
-	
-	if (health.PostUpdateColor) then 
+	end
+
+	if (health.PostUpdateColor) then
 		health:PostUpdateColor(unit, min, max, r, g, b)
-	end 
+	end
 end
 
 local UpdateOrientations = function(health)
@@ -250,8 +249,8 @@ local UpdateOrientations = function(health)
 	local orientationFlippedH = health:IsFlippedHorizontally()
 	local orientationFlippedV = health:IsFlippedVertically()
 
-	local mirrorOrientation =  orientation == "LEFT" and "RIGHT" 
-	or orientation == "RIGHT" and "LEFT" 
+	local mirrorOrientation =  orientation == "LEFT" and "RIGHT"
+	or orientation == "RIGHT" and "LEFT"
 	or orientation == "UP" and "DOWN"
 	or orientation == "DOWN" and "UP"
 
@@ -259,24 +258,24 @@ local UpdateOrientations = function(health)
 	local mirrorFlippedV = (mirrorOrientation == "DOWN") and true or false
 
 	local preview = health.Preview
-	preview:SetOrientation(orientation) 
+	preview:SetOrientation(orientation)
 	preview:SetFlippedHorizontally(orientationFlippedH)
 	preview:SetFlippedVertically(orientationFlippedV)
 
 	local absorb = health.Absorb
 	if (absorb) then
-		absorb:SetOrientation(mirrorOrientation) 
+		absorb:SetOrientation(mirrorOrientation)
 		absorb:SetFlippedHorizontally(mirrorFlippedH)
 		absorb:SetFlippedVertically(mirrorFlippedV)
 	end
-end 
+end
 
 local UpdateSizes = function(health)
 	local width, height = health:GetSize()
 	width = math_floor(width + .5)
 	height = math_floor(height + .5)
 	health.Preview:SetSize(width, height)
-	if (health.Absorb) then 
+	if (health.Absorb) then
 		health.Absorb:SetSize(width, height)
 	end
 	if (health.Predict) then
@@ -303,9 +302,9 @@ local UpdateTexCoords = function(health)
 	end
 	if (health.Predict) then
 		-- Forcing an update to adjust the prediction texture.
-		-- This might be at a tiny, tiny performance cost, 
-		-- but this whole function is only ever called when 
-		-- the Health bar's texcoords are manually changed. 
+		-- This might be at a tiny, tiny performance cost,
+		-- but this whole function is only ever called when
+		-- the Health bar's texcoords are manually changed.
 		if (UnitExists(health.unit)) then
 			health:ForceUpdate()
 		end
@@ -313,9 +312,9 @@ local UpdateTexCoords = function(health)
 end
 
 local Update = function(self, event, unit)
-	if (not unit) or (unit ~= self.unit) then 
-		return 
-	end 
+	if (not unit) or (unit ~= self.unit) then
+		return
+	end
 
 	-- Allow modules to run their pre-updates
 	local health = self.Health
@@ -324,7 +323,7 @@ local Update = function(self, event, unit)
 	end
 
 	-- Different GUID means a different player or NPC,
-	-- so we want updates to be instant, not smoothed. 
+	-- so we want updates to be instant, not smoothed.
 	local guid = UnitGUID(unit)
 	local forced = guid ~= health.guid
 
@@ -335,17 +334,17 @@ local Update = function(self, event, unit)
 	health.dead = UnitIsDeadOrGhost(unit)
 	health.tapped = (not UnitPlayerControlled(unit)) and UnitIsTapDenied(unit) and UnitCanAttack("player", unit)
 
-	-- If the unit is dead or offline, we can skip a lot of stuff, 
-	-- so we're making an exception for this early on. 
-	if (health.disconnected or health.dead) then 
-		-- Forcing all values to zero for dead or disconnected units. 
-		-- Never thought it made sense to "know" the health of something dead, 
-		-- since health is life, and you don't have it while dead. Doh. 
+	-- If the unit is dead or offline, we can skip a lot of stuff,
+	-- so we're making an exception for this early on.
+	if (health.disconnected or health.dead) then
+		-- Forcing all values to zero for dead or disconnected units.
+		-- Never thought it made sense to "know" the health of something dead,
+		-- since health is life, and you don't have it while dead. Doh.
 		health:SetMinMaxValues(0, 0, true)
 		health:SetValue(0, true)
 		health:UpdateValues(unit, 0, 0)
 
-		-- Hide all extra elements, they have no meaning when dead or disconnected. 
+		-- Hide all extra elements, they have no meaning when dead or disconnected.
 		health.Preview:Hide()
 		if (health.Predict) then
 			health.Predict:Hide()
@@ -355,15 +354,15 @@ local Update = function(self, event, unit)
 		end
 
 		-- Allow modules to run their post-updates
-		if (health.PostUpdate) then 
+		if (health.PostUpdate) then
 			health:PostUpdate(unit, 0, 0)
-		end 
-		return 
-	end 
+		end
+		return
+	end
 
 	-- Retrieve element pointers
-	local absorb = health.Absorb 
-	local predict = health.Predict 
+	local absorb = health.Absorb
+	local predict = health.Predict
 	local preview = health.Preview
 
 	-- Retrieve values for our bars
@@ -384,12 +383,12 @@ local Update = function(self, event, unit)
 	health:SetValue(curHealth, forced)
 	health:UpdateColors(unit, curHealth, maxHealth)
 
-	-- Always force this to be instant regardless of bar settings. 
+	-- Always force this to be instant regardless of bar settings.
 	preview:SetMinMaxValues(0, maxHealth, true)
 	preview:SetValue(curHealth, true)
 
 	local minPerc, maxPerc
-	if (maxHealth == 100) then 
+	if (maxHealth == 100) then
 		minPerc = curHealth
 		maxPerc = maxHealth
 		curHealth = 0
@@ -402,147 +401,147 @@ local Update = function(self, event, unit)
 		local maxAbsorb = health.maxAbsorb or maxAbsorbDisplaySize
 		local hasOverAbsorb = (allAbsorbs > 0) and (curHealth + allIncomingHeal + allAbsorbs >= maxHealth)
 		local absorbDisplay = (allAbsorbs > maxHealth*maxAbsorb) and maxHealth*maxAbsorb or allAbsorbs
-		if (absorbDisplay < maxHealth * (health.absorbThreshold or .05)) then 
+		if (absorbDisplay < maxHealth * (health.absorbThreshold or .05)) then
 			absorbDisplay = 0
 		end
 
-		absorb:SetMinMaxValues(0, maxHealth) 
+		absorb:SetMinMaxValues(0, maxHealth)
 		absorb:SetValue(absorbDisplay, forced)
 	end
 
 	if (predict) then
 		local showPrediction, change
-		if ((allIncomingHeal > 0) or (allNegativeHeals > 0)) and (maxHealth > 0) then 
+		if ((allIncomingHeal > 0) or (allNegativeHeals > 0)) and (maxHealth > 0) then
 			local startPoint = curHealth/maxHealth
 
 			-- Dev switch to test absorbs with normal healing
 			--allIncomingHeal, allNegativeHeals = allNegativeHeals, allIncomingHeal
 
-			-- Hide predictions if the change is very small, or if the unit is at max health. 
+			-- Hide predictions if the change is very small, or if the unit is at max health.
 			change = (allIncomingHeal - allNegativeHeals)/maxHealth
-			if ((curHealth < maxHealth) and (change > (health.predictThreshold or .05))) then 
+			if ((curHealth < maxHealth) and (change > (health.predictThreshold or .05))) then
 				local endPoint = startPoint + change
 
 				-- Crop heal prediction overflows
-				if (endPoint > 1) then 
+				if (endPoint > 1) then
 					endPoint = 1
 					change = endPoint - startPoint
 				end
 
 				-- Crop heal absorb overflows
-				if (endPoint < 0) then 
+				if (endPoint < 0) then
 					endPoint = 0
 					change = -startPoint
 				end
 
-				-- This shouldn't happen, but let's do it anyway. 
-				if (startPoint ~= endPoint) then 
+				-- This shouldn't happen, but let's do it anyway.
+				if (startPoint ~= endPoint) then
 					showPrediction = true
 				end
-			end 
+			end
 		end
 
-		if (showPrediction) then 
+		if (showPrediction) then
 			local orientation = preview:GetOrientation()
 			local min,max = preview:GetMinMaxValues()
 			local value = preview:GetValue() / max
 			local previewTexture = preview:GetStatusBarTexture()
 			local previewWidth, previewHeight = preview:GetSize()
 			local left, right, top, bottom = preview:GetTexCoord()
-		
-			if (orientation == "RIGHT") then 
+
+			if (orientation == "RIGHT") then
 				local texValue, texChange = value, change
-		
+
 				local rangeH, rangeV
 				rangeH = right - left
 				rangeV = bottom - top
 				texChange = change*value
 				texValue = left + value*rangeH
-		
-				if (change > 0) then 
+
+				if (change > 0) then
 					predict:ClearAllPoints()
 					predict:SetPoint("BOTTOMLEFT", previewTexture, "BOTTOMRIGHT", 0, 0)
 					predict:SetSize(change*previewWidth, previewHeight)
 					predict:SetTexCoord(texValue, texValue + texChange, top, bottom)
 					predict:SetVertexColor(0, .7, 0, .25)
-					if (not predict:IsShown()) then 
+					if (not predict:IsShown()) then
 						predict:Show()
-					end 
-				elseif (change < 0) then 
+					end
+				elseif (change < 0) then
 					predict:ClearAllPoints()
 					predict:SetPoint("BOTTOMRIGHT", previewTexture, "BOTTOMRIGHT", 0, 0)
 					predict:SetSize((-change)*previewWidth, previewHeight)
 					predict:SetTexCoord(texValue + texChange, texValue, top, bottom)
 					predict:SetVertexColor(.5, 0, 0, .75)
-					if (not predict:IsShown()) then 
+					if (not predict:IsShown()) then
 						predict:Show()
-					end 
-				else 
-					if (predict:IsShown()) then 
+					end
+				else
+					if (predict:IsShown()) then
 						predict:Hide()
-					end 
-				end 
-		
-			elseif (orientation == "LEFT") then 
+					end
+				end
+
+			elseif (orientation == "LEFT") then
 				local texValue, texChange = value, change
 				local rangeH, rangeV
 				rangeH = right - left
 				rangeV = bottom - top
 				texChange = change*value
 				texValue = left + value*rangeH
-		
-				if (change > 0) then 
+
+				if (change > 0) then
 					predict:ClearAllPoints()
 					predict:SetPoint("BOTTOMRIGHT", previewTexture, "BOTTOMLEFT", 0, 0)
 					predict:SetSize(change*previewWidth, previewHeight)
 					predict:SetTexCoord(texValue + texChange, texValue, top, bottom)
 					predict:SetVertexColor(0, .7, 0, .25)
-					if (not predict:IsShown()) then 
+					if (not predict:IsShown()) then
 						predict:Show()
-					end 
+					end
 				elseif (change < 0) then
 					predict:ClearAllPoints()
 					predict:SetPoint("BOTTOMLEFT", previewTexture, "BOTTOMLEFT", 0, 0)
 					predict:SetSize((-change)*previewWidth, previewHeight)
 					predict:SetTexCoord(texValue, texValue + texChange, top, bottom)
 					predict:SetVertexColor(.5, 0, 0, .75)
-					if (not predict:IsShown()) then 
+					if (not predict:IsShown()) then
 						predict:Show()
-					end 
-				else 
-					if (predict:IsShown()) then 
+					end
+				else
+					if (predict:IsShown()) then
 						predict:Hide()
-					end 
-				end 
-			end 
+					end
+				end
+			end
 
 		else
-			if (predict:IsShown()) then 
+			if (predict:IsShown()) then
 				predict:Hide()
-			end 
+			end
 		end
 	end
 
-	if (not health:IsShown()) then 
+	if (not health:IsShown()) then
 		health:Show()
 	end
 
-	if (not preview:IsShown()) then 
+	if (not preview:IsShown()) then
 		preview:Show()
-	end 
+	end
 
-	if (absorb) and (not absorb:IsShown()) then 
+	if (absorb) and (not absorb:IsShown()) then
 		absorb:Show()
-	end 
+	end
 
 	if (health.PostUpdate) then
 		return health:PostUpdate(unit, curHealth, maxHealth, minPerc, maxPerc)
-	end	
+	end
 end
 
 local Proxy = function(self, ...)
 	return (self.Health.Override or Update)(self, ...)
-end 
+end
 
 local ForceUpdate = function(health)
 	return Proxy(health._owner, "Forced", health._owner.unit)
@@ -559,7 +558,7 @@ local Enable = function(self)
 		health.ForceUpdate = ForceUpdate
 		health.UpdateColors = UpdateColors
 		health.UpdateValues = UpdateValues
-	
+
 		-- Post updates to make sure the sub-elements follow the health
 		health.PostUpdateSize = UpdateSizes
 		health.PostUpdateWidth = UpdateSizes
@@ -582,7 +581,7 @@ local Enable = function(self)
 
 		-- Color events
 		self:RegisterEvent("UNIT_CONNECTION", Proxy)
-		self:RegisterEvent("UNIT_FACTION", Proxy) 
+		self:RegisterEvent("UNIT_FACTION", Proxy)
 
 		-- Threat coloring events
 		self:RegisterEvent("UNIT_THREAT_SITUATION_UPDATE", Proxy)
@@ -598,7 +597,7 @@ local Enable = function(self)
 			self:RegisterEvent("UNIT_HEAL_ABSORB_AMOUNT_CHANGED", Proxy)
 		end
 
-		if (not health.Preview) then 
+		if (not health.Preview) then
 			local preview = health:CreateStatusBar()
 			preview._owner = self
 			preview:SetAllPoints(health)
@@ -607,17 +606,17 @@ local Enable = function(self)
 			preview:SetSparkTexture("")
 			preview:SetAlpha(.5)
 			health.Preview = preview
-		end 
+		end
 
 		if (IsRetail) then
-			if (not health.Predict) then 
+			if (not health.Predict) then
 				local predict = health:CreateTexture()
 				predict._owner = health
 				predict:SetDrawLayer("ARTWORK", 0)
 				health.Predict = predict
-			end 
-	
-			if (not health.Absorb) then 
+			end
+
+			if (not health.Absorb) then
 				local absorbAlpha = (string_find(unit, "raid") or string_find(unit, "party")) and .5 or ((unit == "player") or (unit == "target")) and .35 or .25
 				local absorb = health:CreateStatusBar()
 				absorb._owner = health
@@ -627,7 +626,7 @@ local Enable = function(self)
 				absorb:SetStatusBarColor(1, 1, 1)
 				absorb:SetAlpha(health.absorbOverrideAlpha or absorbAlpha)
 				health.Absorb = absorb
-			end 
+			end
 		end
 
 		health:PostUpdateSize()
@@ -641,12 +640,12 @@ end
 
 local Disable = function(self)
 	local health = self.Health
-	if (health) then 
+	if (health) then
 		self:UnregisterEvent("UNIT_HEALTH_FREQUENT", Proxy)
 		self:UnregisterEvent("UNIT_HEALTH", Proxy)
 		self:UnregisterEvent("UNIT_MAXHEALTH", Proxy)
 		self:UnregisterEvent("UNIT_CONNECTION", Proxy)
-		self:UnregisterEvent("UNIT_FACTION", Proxy) 
+		self:UnregisterEvent("UNIT_FACTION", Proxy)
 		self:UnregisterEvent("UNIT_THREAT_SITUATION_UPDATE", Proxy)
 		self:UnregisterEvent("UNIT_THREAT_LIST_UPDATE", Proxy)
 		self:UnregisterEvent("PLAYER_FLAGS_CHANGED", Proxy)
@@ -661,30 +660,30 @@ local Disable = function(self)
 		health.guid = nil
 
 		-- Hide the sub elements
-		if (health.Absorb) then 
+		if (health.Absorb) then
 			health.Absorb:Hide()
 		end
-		if (health.Predict) then 
+		if (health.Predict) then
 			health.Predict:Hide()
 		end
-		if (health.Preview) then 
+		if (health.Preview) then
 			health.Preview:Hide()
 		end
 
 		-- Clear out the texts
-		if (health.Value) then 
+		if (health.Value) then
 			health.Value:SetText("")
 		end
-		if (health.ValuePercent) then 
+		if (health.ValuePercent) then
 			health.ValuePercent:SetText("")
 		end
-		if (health.ValueAbsorb) then 
+		if (health.ValueAbsorb) then
 			health.ValueAbsorb:SetText("")
 		end
 	end
 end
 
 -- Register it with compatible libraries
-for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do 
-	Lib:RegisterElement("Health", Enable, Disable, Proxy, 72)
-end 
+for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do
+	Lib:RegisterElement("Health", Enable, Disable, Proxy, 74)
+end
diff --git a/SimpleClassPower/back-end/plugins/unit_level.lua b/SimpleClassPower/back-end/plugins/unit_level.lua
index f167d68..2823c80 100644
--- a/SimpleClassPower/back-end/plugins/unit_level.lua
+++ b/SimpleClassPower/back-end/plugins/unit_level.lua
@@ -6,34 +6,40 @@ local _G = _G
 local UnitCanAttack = UnitCanAttack
 local UnitLevel = UnitEffectiveLevel or UnitLevel
 
+-- WoW Client versions
+local currentClientPatch, currentClientBuild = GetBuildInfo()
+currentClientBuild = tonumber(currentClientBuild)
+
+local MAJOR,MINOR,PATCH = string.split(".", currentClientPatch)
+MAJOR = tonumber(MAJOR)
+
 -- Constants
-local Client = tonumber((string.split(".", (GetBuildInfo()))))
-local MAX_LEVEL = (Client == 2) and 70 or 60
+local MAX_LEVEL = (MAJOR == 2) and 70 or 60
 
 local Update = function(self, event, unit)
-	if (not unit) or (unit ~= self.unit) then 
-		return 
-	end 
+	if (not unit) or (unit ~= self.unit) then
+		return
+	end
 
 	local element = self.Level
 
 	-- Badge, dead skull and high level skull textures
-	-- We will toggle them if they exist or ignore them otherwise. 
+	-- We will toggle them if they exist or ignore them otherwise.
 	local badge = element.Badge
 	local dead = element.Dead
 	local skull = element.Skull
 
 	local unitLevel = UnitLevel(unit)
 
-	if element.visibilityFilter then 
-		if (not element:visibilityFilter(unit)) then 
-			if badge then 
+	if element.visibilityFilter then
+		if (not element:visibilityFilter(unit)) then
+			if badge then
 				badge:Hide()
 			end
-			if dead then 
+			if dead then
 				dead:Hide()
 			end
-			if skull then 
+			if skull then
 				skull:Hide()
 			end
 			return element:Hide()
@@ -46,107 +52,107 @@ local Update = function(self, event, unit)
 
 
 	-- Showing a skull badge for dead units
-	if UnitIsDeadOrGhost(unit) then 
+	if UnitIsDeadOrGhost(unit) then
 		element:SetText("")
 
-		-- use the dead skull first, 
+		-- use the dead skull first,
 		-- fallback to high level skull if dead skull doesn't exist
-		if dead then 
+		if dead then
 			dead:Show()
-			if skull then 
+			if skull then
 				skull:Hide()
 			end
-		elseif skull then 
+		elseif skull then
 			skull:Show()
-		end 
-		if badge then 
+		end
+		if badge then
 			badge:Show()
-		end 
+		end
 
 	-- Hide capped and above, if so chosen ny the module
-	elseif (element.hideCapped) and (unitLevel >= MAX_LEVEL) then 
+	elseif (element.hideCapped) and (unitLevel >= MAX_LEVEL) then
 		element:SetText("")
-		if badge then 
+		if badge then
 			badge:Hide()
-		end 
-		if skull then 
+		end
+		if skull then
 			skull:Hide()
-		end 
-		if dead then 
+		end
+		if dead then
 			dead:Hide()
 		end
 
 	-- Hide floored units (level 1 mobs and criters)
-	elseif (element.hideFloored) and (unitLevel == 1) then 
+	elseif (element.hideFloored) and (unitLevel == 1) then
 		element:SetText("")
-		if badge then 
+		if badge then
 			badge:Hide()
-		end 
-		if skull then 
+		end
+		if skull then
 			skull:Hide()
-		end 
-		if dead then 
+		end
+		if dead then
 			dead:Hide()
 		end
 
 	-- Normal creatures in a level range we can read
-	elseif (unitLevel > 0) then 
+	elseif (unitLevel > 0) then
 		element:SetText(unitLevel)
-		if UnitCanAttack("player", unit) then 
+		if UnitCanAttack("player", unit) then
 			local color = GetCreatureDifficultyColor(unitLevel)
 			element:SetVertexColor(color.r, color.g, color.b, element.alpha or 1)
-		else 
-			if (unitLevel ~= unitLevel) then 
+		else
+			if (unitLevel ~= unitLevel) then
 				if element.scaledColor then
 					element:SetTextColor(element.scaledColor[1], element.scaledColor[2], element.scaledColor[3], element.scaledColor[4] or element.alpha or 1)
-				else 
+				else
 					element:SetTextColor(.1, .8, .1, element.alpha or 1)
-				end 
-			else 
-				if element.defaultColor then 
+				end
+			else
+				if element.defaultColor then
 					element:SetTextColor(element.defaultColor[1], element.defaultColor[2], element.defaultColor[3], element.defaultColor[4] or element.alpha or 1)
-				else 
+				else
 					element:SetTextColor(.94, .94, .94, element.alpha or 1)
-				end 
-			end 
-		end 
-		if badge then 
+				end
+			end
+		end
+		if badge then
 			badge:Show()
-		end 
-		if skull then 
+		end
+		if skull then
 			skull:Hide()
-		end 
-		if dead then 
+		end
+		if dead then
 			dead:Hide()
 		end
 
 	-- Remaining creatures are boss level or too high to read (??)
 	-- So we're giving these a skull.
-	else 
-		if skull then 
+	else
+		if skull then
 			skull:Show()
-		end 
-		if badge then 
+		end
+		if badge then
 			badge:Show()
-		end 
-		if dead then 
+		end
+		if dead then
 			dead:Hide()
 		end
 		element:SetText("")
-	end 
+	end
 
-	if (not element:IsShown()) then 
+	if (not element:IsShown()) then
 		element:Show()
 	end
 
-	if element.PostUpdate then 
+	if element.PostUpdate then
 		return element:PostUpdate(unit, unitLevel)
 	end
-end 
+end
 
 local Proxy = function(self, ...)
 	return (self.Level.Override or Update)(self, ...)
-end 
+end
 
 local ForceUpdate = function(element)
 	return Proxy(element._owner, "Forced", element._owner.unit)
@@ -158,14 +164,14 @@ local Enable = function(self)
 		element._owner = self
 		element.ForceUpdate = ForceUpdate
 
-		if (self.unit == "player" or self.unit == "pet") then 
+		if (self.unit == "player" or self.unit == "pet") then
 			self:RegisterEvent("PLAYER_LEVEL_UP", Proxy, true)
-		end 
+		end
 		self:RegisterEvent("UNIT_LEVEL", Proxy)
 
-		return true 
+		return true
 	end
-end 
+end
 
 local Disable = function(self)
 	local element = self.Level
@@ -173,9 +179,9 @@ local Disable = function(self)
 		self:UnregisterEvent("UNIT_LEVEL", Proxy)
 		self:UnregisterEvent("PLAYER_LEVEL_UP", Proxy)
 	end
-end 
+end
 
 -- Register it with compatible libraries
-for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do 
+for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do
 	Lib:RegisterElement("Level", Enable, Disable, Proxy, 11)
-end 
+end
diff --git a/SimpleClassPower/back-end/plugins/unit_name.lua b/SimpleClassPower/back-end/plugins/unit_name.lua
index 7357942..bef25e1 100644
--- a/SimpleClassPower/back-end/plugins/unit_name.lua
+++ b/SimpleClassPower/back-end/plugins/unit_name.lua
@@ -16,8 +16,10 @@ local UnitQuestTrivialLevelRange = UnitQuestTrivialLevelRange or GetQuestGreenRa
 local UnitQuestTrivialLevelRangeScaling = UnitQuestTrivialLevelRangeScaling or GetScalingQuestGreenRange
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
 local IsRetail = LibClientBuild:IsRetail()
 
 local utf8sub = function(str, i, dots)
@@ -53,7 +55,7 @@ end
 -- Using this as a tooltip method to access our custom colors.
 -- *Sourced from /back-end/tooltip.lua
 local GetDifficultyColorByLevel
-if (IsClassic or IsTBC) then
+if (IsClassic or IsTBC or IsWrath) then
 	GetDifficultyColorByLevel = function(self, level, isScaling)
 		local colors = self.colors.quest
 		local levelDiff = level - UnitLevel("player")
@@ -117,9 +119,9 @@ elseif (IsRetail) then
 end
 
 local Update = function(self, event, unit)
-	if (not unit) or (unit ~= self.unit) then 
-		return 
-	end 
+	if (not unit) or (unit ~= self.unit) then
+		return
+	end
 
 	local element = self.Name
 	if (element.PreUpdate) then
@@ -128,7 +130,7 @@ local Update = function(self, event, unit)
 
 	-- Retrieve data
 	local name = UnitName(unit)
-	if (not name) then 
+	if (not name) then
 		element:SetText("")
 		return
 	end
@@ -138,16 +140,16 @@ local Update = function(self, event, unit)
 
 	if (element.showLevel) then
 		local level = UnitEffectiveLevel(unit)
-		if (level and level > 0) then 
+		if (level and level > 0) then
 			local r, g, b, colorCode = GetDifficultyColorByLevel(self, level)
 			levelText = colorCode .. level .. "|r"
 			levelTextLength = level >= 100 and 5 or level >= 10 and 4 or 3
 			showLevel = true
-		end 
+		end
 	end
 
 	local fullLength = (showLevel) and (nameLength + levelTextLength) or (nameLength)
-	if (element.maxChars) and (fullLength > element.maxChars) then 
+	if (element.maxChars) and (fullLength > element.maxChars) then
 		local maxChars = (showLevel) and (element.maxChars - levelTextLength) or (element.maxChars)
 		if (element.useSmartName) then
 			local nameTable = { string_split(" ", name) }
@@ -161,26 +163,26 @@ local Update = function(self, event, unit)
 		else
 			name = utf8sub(name, maxChars, element.useDots)
 		end
-	end 
+	end
 
 	if (showLevel) then
-		if (element.showLevelLast) then 
+		if (element.showLevelLast) then
 			name = name .. " |cff888888:|r" .. levelText
-		else 
+		else
 			name = levelText .. "|cff888888:|r " .. name
 		end
 	end
 
 	element:SetText(name)
 
-	if (element.PostUpdate) then 
+	if (element.PostUpdate) then
 		return element:PostUpdate(unit)
-	end 
-end 
+	end
+end
 
 local Proxy = function(self, ...)
 	return (self.Name.Override or Update)(self, ...)
-end 
+end
 
 local ForceUpdate = function(element)
 	return Proxy(element._owner, "Forced", element._owner.unit)
@@ -192,9 +194,9 @@ local Enable = function(self)
 		element._owner = self
 		element.ForceUpdate = ForceUpdate
 
-		if (self.unit == "player") or (self.unit == "pet") then 
+		if (self.unit == "player") or (self.unit == "pet") then
 			self:RegisterEvent("PLAYER_LEVEL_UP", Proxy, true)
-		end 
+		end
 
 		self:RegisterEvent("UNIT_NAME_UPDATE", Proxy)
 		self:RegisterEvent("UNIT_CLASSIFICATION_CHANGED", Proxy)
@@ -204,7 +206,7 @@ local Enable = function(self)
 
 		return true
 	end
-end 
+end
 
 local Disable = function(self)
 	local element = self.Name
@@ -218,9 +220,9 @@ local Disable = function(self)
 		self:UnregisterEvent("UNIT_LEVEL", Proxy)
 		self:UnregisterEvent("ZONE_CHANGED_NEW_AREA", Proxy)
 	end
-end 
+end
 
 -- Register it with compatible libraries
-for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do 
-	Lib:RegisterElement("Name", Enable, Disable, Proxy, 14)
-end 
+for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do
+	Lib:RegisterElement("Name", Enable, Disable, Proxy, 17)
+end
diff --git a/SimpleClassPower/back-end/plugins/unit_pethappiness.lua b/SimpleClassPower/back-end/plugins/unit_pethappiness.lua
index 10ac68f..3adeecc 100644
--- a/SimpleClassPower/back-end/plugins/unit_pethappiness.lua
+++ b/SimpleClassPower/back-end/plugins/unit_pethappiness.lua
@@ -2,8 +2,11 @@ local LibClientBuild = Wheel("LibClientBuild")
 assert(LibClientBuild, "UnitPetHappiness requires LibClientBuild to be loaded.")
 
 -- Constants for client version
+local IsAnyClassic = LibClientBuild:IsAnyClassic()
 local IsClassic = LibClientBuild:IsClassic()
 local IsTBC = LibClientBuild:IsTBC()
+local IsWrath = LibClientBuild:IsWrath()
+local IsRetail = LibClientBuild:IsRetail()
 
 -- WoW API
 local GetPetHappiness = GetPetHappiness
@@ -49,9 +52,9 @@ local happyMessage = {
 }
 
 local Update = function(self, event, unit, ...)
-	if (not unit) or (unit ~= self.unit) then 
-		return 
-	end 
+	if (not unit) or (unit ~= self.unit) then
+		return
+	end
 	if (event == "UNIT_PET") then
 		local owner = ...
 		if (owner ~= "player") then
@@ -71,12 +74,17 @@ local Update = function(self, event, unit, ...)
 	end
 
 	if (element:IsObjectType("FontString")) then
-		if (loyaltyRate < 0) then
-			element:SetFormattedText(happyMessage.losing[happiness], damagePercentage, loyaltyRate)
-		elseif (loyaltyRate > 0) then
-			element:SetFormattedText(happyMessage.gaining[happiness], damagePercentage, loyaltyRate)
-		else
+		if (IsWrath) then
+			-- Loyalty was removed in wrath, only damage is now affected!
 			element:SetFormattedText(happyMessage.passive[happiness], damagePercentage)
+		else
+			if (loyaltyRate and loyaltyRate < 0) then
+				element:SetFormattedText(happyMessage.losing[happiness], damagePercentage, loyaltyRate)
+			elseif (loyaltyRate and loyaltyRate > 0) then
+				element:SetFormattedText(happyMessage.gaining[happiness], damagePercentage, loyaltyRate)
+			else
+				element:SetFormattedText(happyMessage.passive[happiness], damagePercentage)
+			end
 		end
 	elseif (element:IsObjectType("Texture")) then
 		element:SetTexCoord(unpack(happyTexCoord[happiness]))
@@ -84,14 +92,14 @@ local Update = function(self, event, unit, ...)
 
 	element:Show()
 
-	if (element.PostUpdate) then 
-		return element:PostUpdate(unit, happiness, damagePercentage, loyaltyRate, hunterPet)
-	end 
-end 
+	if (element.PostUpdate) then
+		return element:PostUpdate(unit, happiness, damagePercentage, loyaltyRate or 0, hunterPet)
+	end
+end
 
 local Proxy = function(self, ...)
 	return (self.PetHappiness.Override or Update)(self, ...)
-end 
+end
 
 local ForceUpdate = function(element)
 	return Proxy(element._owner, "Forced", element._owner.unit)
@@ -103,8 +111,9 @@ local Enable = function(self)
 		element._owner = self
 		element.ForceUpdate = ForceUpdate
 
-		-- Forcefully hide this when not in Classic
-		if not(IsClassic or IsTBC) then
+		-- Forcefully hide this when not in Classics
+		-- *pet happiness was removed in 4.1 in Cata
+		if not(IsAnyClassic) then
 			element:Hide()
 			return
 		end
@@ -121,14 +130,14 @@ local Enable = function(self)
 
 		return true
 	end
-end 
+end
 
 local Disable = function(self)
 	local element = self.PetHappiness
 	if element then
 		element:Hide()
 
-		if not(IsClassic) then
+		if not(IsAnyClassic) then
 			return
 		end
 
@@ -136,9 +145,9 @@ local Disable = function(self)
 		self:UnregisterEvent("UNIT_PET", Proxy)
 		self:UnregisterEvent("UNIT_HAPPINESS", Proxy)
 	end
-end 
+end
 
 -- Register it with compatible libraries
-for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do 
-	Lib:RegisterElement("PetHappiness", Enable, Disable, Proxy, 4)
-end 
+for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do
+	Lib:RegisterElement("PetHappiness", Enable, Disable, Proxy, 6)
+end
diff --git a/SimpleClassPower/back-end/plugins/unit_threat.lua b/SimpleClassPower/back-end/plugins/unit_threat.lua
index 3ebc1c2..3b19986 100644
--- a/SimpleClassPower/back-end/plugins/unit_threat.lua
+++ b/SimpleClassPower/back-end/plugins/unit_threat.lua
@@ -17,12 +17,12 @@ local UpdateColor = function(element, unit, status, r, g, b)
 	end
 	if (element.PostUpdateColor) then
 		element:PostUpdateColor(unit, status, r, g, b)
-	end 
+	end
 end
 
 local Update = function(self, event, unit, ...)
 	if (not unit) or (unit ~= self.unit) then
-		return 
+		return
 	end
 	local element = self.Threat
 
@@ -43,14 +43,14 @@ local Update = function(self, event, unit, ...)
 	local status
 
 	-- BUG: Non-existent '*target' or '*pet' units cause UnitThreatSituation() errors (thank you oUF!)
-	if UnitExists(unit) and ((not element.hideSolo) or (IsInGroup() or IsInInstance())) then
+	if UnitExists(unit) and ((not element.hideSolo) or IsInGroup() or IsInInstance()) then
 		local feedbackUnit = element.feedbackUnit
 		if (feedbackUnit and (feedbackUnit ~= unit) and UnitExists(feedbackUnit)) then
 			status = UnitThreatSituation(feedbackUnit, unit)
 		else
 			status = UnitThreatSituation(unit)
 		end
-	end 
+	end
 
 	element.status = status
 
@@ -62,7 +62,7 @@ local Update = function(self, event, unit, ...)
 	else
 		element:Hide()
 	end
-	
+
 	if (element.PostUpdate) then
 		return element:PostUpdate(unit, status, r, g, b)
 	end
@@ -88,7 +88,7 @@ local Enable = function(self)
 
 		return true
 	end
-end 
+end
 
 local Disable = function(self)
 	local element = self.Threat
@@ -99,9 +99,9 @@ local Disable = function(self)
 
 		element:Hide()
 	end
-end 
+end
 
 -- Register it with compatible libraries
-for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do 
-	Lib:RegisterElement("Threat", Enable, Disable, Proxy, 20)
-end 
+for _,Lib in ipairs({ (Wheel("LibUnitFrame", true)), (Wheel("LibNamePlate", true)) }) do
+	Lib:RegisterElement("Threat", Enable, Disable, Proxy, 23)
+end
diff --git a/SimpleClassPower/back-end/tools/binds.lua b/SimpleClassPower/back-end/tools/binds.lua
index b29295b..cdcfaa9 100644
--- a/SimpleClassPower/back-end/tools/binds.lua
+++ b/SimpleClassPower/back-end/tools/binds.lua
@@ -1,4 +1,4 @@
-local LibBindTool = Wheel:Set("LibBindTool", 4)
+local LibBindTool = Wheel:Set("LibBindTool", 5)
 if (not LibBindTool) then
 	return
 end
@@ -67,7 +67,7 @@ local IsAltKeyDown = IsAltKeyDown
 local IsControlKeyDown = IsControlKeyDown
 local IsShiftKeyDown = IsShiftKeyDown
 local LoadBindings = LoadBindings
-local AttemptToSaveBindings = AttemptToSaveBindings or SaveBindings 
+local AttemptToSaveBindings = AttemptToSaveBindings or SaveBindings
 local SetBinding = SetBinding
 
 -- Private API
@@ -75,6 +75,7 @@ local Colors = LibColorTool:GetColorTable()
 
 -- Constants for client version
 local IsRetail = LibClientBuild:IsRetail()
+local IsDragonflight = LibClientBuild:IsDragonflight()
 
 -- Library registries
 LibBindTool.embeds = LibBindTool.embeds or {}
@@ -89,33 +90,33 @@ local CHARACTER_BINDINGS = 2
 
 -- Simplest and hackiest locale system to date.
 local gameLocale = GetLocale()
-local L = (function(tbl) 
+local L = (function(tbl)
 	local L = tbl[gameLocale] or tbl.enUS
-	for i in pairs(L) do 
-		if (L[i] == true) then 
+	for i in pairs(L) do
+		if (L[i] == true) then
 			L[i] = i
 		end
-	end 
-	if (gameLocale ~= "enUS") then 
-		for i,msg in pairs(tbl.enUS) do 
-			if (not L[i]) then 
+	end
+	if (gameLocale ~= "enUS") then
+		for i,msg in pairs(tbl.enUS) do
+			if (not L[i]) then
 				L[i] = (msg == true) and i or msg
 			end
 		end
 	end
 	return L
-end)({ 
+end)({
 
 	-- Entries set to the boolean 'true' will use the key as the value!
 	-- When making new locales, do NOT replace the key, only the value.
 	enUS = {
 
-		-- This is shown in the frame, it is word-wrapped. 
-		-- Try to keep the length fairly identical to enUS, 
-		-- to make sure it fits properly inside the window. 
+		-- This is shown in the frame, it is word-wrapped.
+		-- Try to keep the length fairly identical to enUS,
+		-- to make sure it fits properly inside the window.
 		["Hover your mouse over any actionbutton and press a key or a mouse button to bind it. Press the ESC key to clear the current actionbutton's keybinding."] = true,
 
-		-- These are output to the chat frame. 
+		-- These are output to the chat frame.
 		["Keybinds cannot be changed while engaged in combat."] = true,
 		["Keybind changes were discarded because you entered combat."] = true,
 		["Keybind changes were saved."] = true,
@@ -133,23 +134,23 @@ local BindFrame = LibBindTool:CreateFrame("Frame")
 local BindFrame_MT = { __index = BindFrame }
 
 BindFrame.GetActionName = function(self)
-	local actionName 
+	local actionName
 	local bindingAction = self.button.bindingAction
-	if bindingAction then 
+	if bindingAction then
 		actionName = _G["BINDING_NAME_"..bindingAction]
-	end 
+	end
 	return actionName
 end
 
-BindFrame.OnMouseUp = function(self, key) 
-	LibBindTool:ProcessInput(key) 
+BindFrame.OnMouseUp = function(self, key)
+	LibBindTool:ProcessInput(key)
 end
 
-BindFrame.OnMouseWheel = function(self, delta) 
-	LibBindTool:ProcessInput((delta > 0) and "MOUSEWHEELUP" or "MOUSEWHEELDOWN") 
+BindFrame.OnMouseWheel = function(self, delta)
+	LibBindTool:ProcessInput((delta > 0) and "MOUSEWHEELUP" or "MOUSEWHEELDOWN")
 end
 
-BindFrame.OnEnter = function(self) 
+BindFrame.OnEnter = function(self)
 
 	-- Start listening for keybind input
 	local bindingFrame = LibBindTool:GetBindingFrame()
@@ -160,28 +161,28 @@ BindFrame.OnEnter = function(self)
 
 	-- Retrieve the action
 	local bindingAction = self.button.bindingAction
-	local binds = { GetBindingKey(bindingAction) } 
-	
+	local binds = { GetBindingKey(bindingAction) }
+
 	-- Show the tooltip
 	local tooltip = LibBindTool:GetBindingsTooltip()
 	tooltip:SetDefaultAnchor(self)
 	tooltip:AddLine(self:GetActionName(), 1, .82, .1)
 
-	if (#binds == 0) then 
+	if (#binds == 0) then
 		tooltip:AddLine(L["No keybinds set."], 1, 0, 0)
-	else 
+	else
 		tooltip:AddDoubleLine("Binding", "Key", .6, .6, .6, .6, .6, .6)
 		for i = 1,#binds do
 			tooltip:AddDoubleLine(i .. ":", LibBindTool:GetBindingName(binds[i]), 1, .82, 0, 0, 1, 0)
 		end
-	end 
+	end
 	tooltip:Show()
 
 	-- Color the backdrop
 	self.bg:SetVertexColor(.4, .6, .9, 1)
 end
 
-BindFrame.OnLeave = function(self) 
+BindFrame.OnLeave = function(self)
 
 	-- Stop lisetning for keyboard input
 	local bindingFrame = LibBindTool:GetBindingFrame()
@@ -206,9 +207,9 @@ end
 ----------------------------------------------------
 -- Utility function for easy colored output messages
 local Print = function(r, g, b, msg)
-	if (type(r) == "string") then 
+	if (type(r) == "string") then
 		print(r)
-		return 
+		return
 	end
 	print(string_format("|cff%02x%02x%02x%s|r", r*255, g*255, b*255, msg))
 end
@@ -231,8 +232,8 @@ LibBindTool.RegisterButtonForBinding = function(self, button, ...)
 		bindFrame:EnableMouseWheel(true)
 		bindFrame.button = button
 
-		-- Mouse input is connected to the frame the cursor is currently over, 
-		-- so we prefer to register these for every single button. 
+		-- Mouse input is connected to the frame the cursor is currently over,
+		-- so we prefer to register these for every single button.
 		bindFrame:SetScript("OnMouseUp", BindFrame.OnMouseUp)
 		bindFrame:SetScript("OnMouseWheel", BindFrame.OnMouseWheel)
 
@@ -264,17 +265,17 @@ end
 LibBindTool.GetBindingName = function(self, binding)
 	local bindingName = ""
 	if string_find(binding, "ALT%-") then
-		binding = string_gsub(binding, "(ALT%-)", "") 
+		binding = string_gsub(binding, "(ALT%-)", "")
 		bindingName = bindingName .. ALT_KEY_TEXT .. "+"
-	end 
-	if string_find(binding, "CTRL%-") then 
-		binding = string_gsub(binding, "(CTRL%-)", "") 
+	end
+	if string_find(binding, "CTRL%-") then
+		binding = string_gsub(binding, "(CTRL%-)", "")
 		bindingName = bindingName .. CTRL_KEY_TEXT .. "+"
-	end 
-	if string_find(binding, "SHIFT%-") then 
-		binding = string_gsub(binding, "(SHIFT%-)", "") 
+	end
+	if string_find(binding, "SHIFT%-") then
+		binding = string_gsub(binding, "(SHIFT%-)", "")
 		bindingName = bindingName .. SHIFT_KEY_TEXT .. "+"
-	end 
+	end
 	return bindingName .. (_G[binding.."_KEY_TEXT"] or _G["KEY_"..binding] or binding)
 end
 
@@ -288,7 +289,7 @@ LibBindTool.GetBinding = function(self, key)
 	if (key:find("Button%d")) then
 		key = key:upper()
 	end
-	
+
 	local alt = IsAltKeyDown() and "ALT-" or ""
 	local ctrl = IsControlKeyDown() and "CTRL-" or ""
 	local shift = IsShiftKeyDown() and "SHIFT-" or ""
@@ -297,37 +298,37 @@ LibBindTool.GetBinding = function(self, key)
 end
 
 LibBindTool.ProcessInput = function(self, key)
-	-- Pause the processing if we currently 
-	-- have a dialog open awaiting a user choice, 
+	-- Pause the processing if we currently
+	-- have a dialog open awaiting a user choice,
 	local bindingFrame = LibBindTool:GetBindingFrame()
-	if bindingFrame.lockdown then 
-		return 
-	end 
+	if bindingFrame.lockdown then
+		return
+	end
 
 	-- Bail out if the mouse isn't above a registered button.
 	local button = bindingFrame.bindButton
-	if (not button) or (not Binds[button]) then 
-		return 
+	if (not button) or (not Binds[button]) then
+		return
 	end
 
 	-- Retrieve the action
 	local bindFrame = Binds[button]
 	local bindingAction = button.bindingAction
-	local binds = { GetBindingKey(bindingAction) } 
+	local binds = { GetBindingKey(bindingAction) }
 
 	-- Clear the button's bindings
 	if (key == "ESCAPE") and (#binds > 0) then
-		for i = 1, #binds do 
+		for i = 1, #binds do
 			SetBinding(binds[i], nil)
 		end
 
 		Print(1, 0, 0, L["%s is now unbound."]:format(bindFrame:GetActionName()))
 
 		-- Post update tooltips with changes
-		if (LibBindTool:GetBindingsTooltip():IsShown()) then 
+		if (LibBindTool:GetBindingsTooltip():IsShown()) then
 			bindFrame:OnEnter()
 		end
-		return 
+		return
 	end
 
 	-- Ignore modifiers until an actual key or mousebutton is pressed
@@ -336,44 +337,44 @@ LibBindTool.ProcessInput = function(self, key)
 	or (key == "LALT") or (key == "RALT") or (key == "ALT")
 	or (key == "UNKNOWN")
 	then
-		return 
+		return
 	end
 
 	-- Get the binding key and its display name
 	local keybind = LibBindTool:GetBinding(key)
 	local keybindName = LibBindTool:GetBindingName(keybind)
 
-	-- Hidden defaults that some addons and UIs allow the user to change. 
-	-- Leaving it here for my own reference. 
+	-- Hidden defaults that some addons and UIs allow the user to change.
+	-- Leaving it here for my own reference.
 	--SetBinding("BUTTON1", "CAMERAORSELECTORMOVE")
 	--SetBinding("BUTTON2", "TURNORACTION")
 	--AttemptToSaveBindings(GetCurrentBindingSet())
 
-	-- Don't allow people to bind these, let's follow blizz standards here. 
-	if (keybind == "BUTTON1") or (keybind == "BUTTON2") then 
-		return 
-	end 
+	-- Don't allow people to bind these, let's follow blizz standards here.
+	if (keybind == "BUTTON1") or (keybind == "BUTTON2") then
+		return
+	end
+
+	-- If binds exist, we re-order it to be the last one.
+	if (#binds > 0) then
+		for i = 1,#binds do
 
-	-- If binds exist, we re-order it to be the last one. 
-	if (#binds > 0) then 
-		for i = 1,#binds do 
-			
 			-- We've found a match
-			if (keybind == binds[i]) then 
-				
-				-- if the match is the first and only bind, or the last one registered, we change nothing 
+			if (keybind == binds[i]) then
+
+				-- if the match is the first and only bind, or the last one registered, we change nothing
 				if (#binds == 1) or (i == #binds) then
-					return 
-				end  
+					return
+				end
 
 				-- Clear all existing binds to be able to re-order
 				for j = 1,#binds do
 					SetBinding(binds[j], nil)
 				end
-		
-				-- Re-apply all other existing binds, except the one we just pressed. 
+
+				-- Re-apply all other existing binds, except the one we just pressed.
 				for j = 1,#binds do
-					if (keybind ~= binds[j]) then 
+					if (keybind ~= binds[j]) then
 						SetBinding(binds[j], bindingAction)
 					end
 				end
@@ -391,31 +392,31 @@ LibBindTool.ProcessInput = function(self, key)
 	Print(0, 1, 0, L["%s is now bound to %s"]:format(Binds[button]:GetActionName(), keybindName))
 
 	-- Post update tooltips with changes
-	if LibBindTool:GetBindingsTooltip():IsShown() then 
+	if LibBindTool:GetBindingsTooltip():IsShown() then
 		bindFrame:OnEnter()
 	end
 end
 
 LibBindTool.UpdateBindings = function(self)
-	for button, bindFrame in pairs(Binds) do 
+	for button, bindFrame in pairs(Binds) do
 		bindFrame:UpdateBinding()
-	end 
+	end
 end
 
 LibBindTool.UpdateButtons = function(self)
-	for button, bindFrame in pairs(Binds) do 
+	for button, bindFrame in pairs(Binds) do
 		bindFrame:SetShown(button:IsVisible())
-	end 
-end 
+	end
+end
 
 
 -- Mode Toggling
 ----------------------------------------------------
 LibBindTool.EnableBindMode = function(self)
-	if InCombatLockdown() then 
+	if InCombatLockdown() then
 		Print(1, 0, 0, L["Keybinds cannot be changed while engaged in combat."])
-		return 
-	end 
+		return
+	end
 
 	self.bindActive = true
 	self:SetObjectFadeOverride(true)
@@ -424,7 +425,7 @@ LibBindTool.EnableBindMode = function(self)
 	self:GetBindingFrame():Show()
 	self:UpdateButtons()
 	self:SendMessage("GP_BIND_MODE_ENABLED")
-end 
+end
 
 LibBindTool.DisableBindMode = function(self)
 	self.bindActive = false
@@ -438,11 +439,11 @@ end
 
 LibBindTool.ApplyBindings = function(self)
 	AttemptToSaveBindings(GetCurrentBindingSet())
-	if self.bindingsChanged then 
+	if self.bindingsChanged then
 		Print(.1, 1, .1, L["Keybind changes were saved."])
-	else 
+	else
 		Print(1, .82, 0, L["No keybinds were changed."])
-	end 
+	end
 	self:DisableBindMode()
 end
 
@@ -451,34 +452,34 @@ LibBindTool.CancelBindings = function(self)
 	LoadBindings(GetCurrentBindingSet())
 
 	-- Output a message depending on whether or not any changes were cancelled
-	if (self.bindingsChanged) then 
+	if (self.bindingsChanged) then
 		Print(1, 0, 0, L["Keybind changes were discarded."])
-	else 
+	else
 		Print(1, .82, 0, L["No keybinds were changed."])
-	end 
+	end
 
 	-- Close the windows and disable the bind mode
 	self:DisableBindMode()
 
 	-- Update the local bindings cache
 	self:UpdateBindingsCache()
-end 
+end
 
 -- Will be called when switching between general and character specific keybinds
 LibBindTool.ChangeBindingSet = function(self)
 
-	-- Check if current bindings have changed, show a warning dialog if so. 
-	if self.bindingsChanged or (self.lockdown and (not self.acceptDiscard)) then 
+	-- Check if current bindings have changed, show a warning dialog if so.
+	if self.bindingsChanged or (self.lockdown and (not self.acceptDiscard)) then
 
-		-- We don't get farther than this unless the 
+		-- We don't get farther than this unless the
 		-- user clicks 'Accept' in the dialog below.
 		local discardFrame = self:GetDiscardFrame()
-		if (not discardFrame:IsShown()) then 
+		if (not discardFrame:IsShown()) then
 			discardFrame:Show()
 		end
 	else
 		self.acceptDiscard = nil
-		self.bindingsChanged = nil 
+		self.bindingsChanged = nil
 
 		-- Load the appropriate binding set
 		if (self:GetBindingFrame().perCharacter:GetChecked()) then
@@ -491,8 +492,8 @@ LibBindTool.ChangeBindingSet = function(self)
 
 		-- Update the local bindings cache
 		self:UpdateBindingsCache()
-	end 
-end 
+	end
+end
 
 -- Update and reset the local cache of keybinds
 LibBindTool.UpdateBindingsCache = function(self)
@@ -536,7 +537,7 @@ LibBindTool.CreateButton = function(self, parent)
 			self.Msg:SetPoint("CENTER", 0, -2)
 			if (self:IsMouseOver()) then
 				show:SetVertexColor(1, 1, 1)
-			elseif (self.isChecked) then 
+			elseif (self.isChecked) then
 				show:SetVertexColor(.9, .9, .9)
 			else
 				show:SetVertexColor(.75, .75, .75)
@@ -601,17 +602,17 @@ LibBindTool.CreateWindow = function(self)
 	frame.ApplyButton = apply
 
 	return frame
-end 
+end
 
 LibBindTool.GetBindingFrame = function(self)
-	if (not LibBindTool.bindingFrame) then 
+	if (not LibBindTool.bindingFrame) then
 
-		local frame = LibBindTool:CreateWindow() 
+		local frame = LibBindTool:CreateWindow()
 		frame:SetFrameLevel(96)
 		frame:EnableKeyboard(false)
 		frame:EnableMouse(false)
 		frame:EnableMouseWheel(false)
-		frame:SetScript("OnShow", function() 
+		frame:SetScript("OnShow", function()
 			frame.msg:SetText(L["Hover your mouse over any actionbutton and press a key or a mouse button to bind it. Press the ESC key to clear the current actionbutton's keybinding."])
 		end)
 
@@ -619,24 +620,24 @@ LibBindTool.GetBindingFrame = function(self)
 		frame.msg:SetPoint("TOPLEFT", 40, -60)
 		frame.msg:SetSize(440,50)
 
-		local perCharacter = frame:CreateFrame("CheckButton", nil, "OptionsCheckButtonTemplate")
+		local perCharacter = frame:CreateFrame("CheckButton", nil, IsDragonflight and "UICheckButtonTemplate" or "OptionsCheckButtonTemplate")
 		perCharacter:SetSize(32,32)
 		perCharacter:SetPoint("TOPLEFT", 34, -16)
 		perCharacter:SetHitRectInsets(-10, -408, -10, -10)
-		
+
 		-- Update the discard confirm frame's text when the checkbox is toggled.
 		-- The frame will however only be shown if changes were made prior to toggling it.
 		perCharacter:SetScript("OnShow", function() perCharacter:SetChecked(GetCurrentBindingSet() == 2) end)
-		perCharacter:SetScript("OnClick", function() 
+		perCharacter:SetScript("OnClick", function()
 			local discardFrame = LibBindTool:GetDiscardFrame()
-			if (perCharacter:GetChecked()) then 
+			if (perCharacter:GetChecked()) then
 				discardFrame.msg:SetText(CONFIRM_LOSE_BINDING_CHANGES)
-			else 
+			else
 				discardFrame.msg:SetText(CONFIRM_DELETING_CHARACTER_SPECIFIC_BINDINGS)
-			end 
-			LibBindTool:ChangeBindingSet() 
-		end) 
-		
+			end
+			LibBindTool:ChangeBindingSet()
+		end)
+
 		perCharacter:SetScript("OnLeave", function() LibBindTool:GetBindingsTooltip():Hide() end)
 		perCharacter:SetScript("OnEnter", function()
 			local tooltip = LibBindTool:GetBindingsTooltip()
@@ -667,10 +668,10 @@ LibBindTool.GetBindingFrame = function(self)
 		if (IsRetail) then
 			frame:SetScript("OnGamePadButtonUp", function(_, key) LibBindTool:ProcessInput(key) end)
 		end
-		
+
 		LibBindTool.bindingFrame = frame
-	end 
-	return LibBindTool.bindingFrame	
+	end
+	return LibBindTool.bindingFrame
 end
 LibBindTool.GetKeybindFrame = LibBindTool.GetBindingFrame
 
@@ -706,7 +707,7 @@ LibBindTool.GetDiscardFrame = function(self)
 		frame:SetScript("OnShow", function() LibBindTool.lockdown = true end)
 		frame:SetScript("OnHide", function() LibBindTool.lockdown = nil end)
 
-		frame.CancelButton:SetScript("OnClick", function() 
+		frame.CancelButton:SetScript("OnClick", function()
 			LibBindTool.acceptDiscard = nil
 
 			-- Revert the checkbox click on cancel
@@ -714,24 +715,24 @@ LibBindTool.GetDiscardFrame = function(self)
 			bindingFrame.perCharacter:SetChecked(not bindingFrame.perCharacter:GetChecked())
 
 			-- Hide this
-			frame:Hide() 
+			frame:Hide()
 		end)
 
 		frame.ApplyButton.Msg:SetText(ACCEPT)
-		frame.ApplyButton:SetScript("OnClick", function() 
+		frame.ApplyButton:SetScript("OnClick", function()
 			LibBindTool.acceptDiscard = true
 
 			-- Continue changing the binding set
-			LibBindTool:ChangeBindingSet() 
+			LibBindTool:ChangeBindingSet()
 
 			-- Hide this
-			frame:Hide() 
+			frame:Hide()
 		end)
 
 		LibBindTool.discardFrame = frame
-	end 
+	end
 	return LibBindTool.discardFrame
-end 
+end
 LibBindTool.GetKeybindDiscardFrame = LibBindTool.GetDiscardFrame
 
 -- Retrieve the current locale table.
@@ -751,48 +752,48 @@ LibBindTool.IsBindModeEnabled = function(self)
 	return LibBindTool:GetBindingFrame():IsShown()
 end
 
--- Callback needed by the menu system to decide 
--- whether a given mode toggle button is active or not. 
+-- Callback needed by the menu system to decide
+-- whether a given mode toggle button is active or not.
 LibBindTool.IsModeEnabled = function(self, modeName)
-	if (modeName == "bindMode") then 
+	if (modeName == "bindMode") then
 		return LibBindTool:IsBindModeEnabled()
 	end
 end
 
--- Callback needed by the menu system 
--- to switch between modes. 
+-- Callback needed by the menu system
+-- to switch between modes.
 LibBindTool.OnModeToggle = function(self, modeName)
-	if (modeName == "bindMode") then 
-		if (LibBindTool:IsBindModeEnabled()) then 
+	if (modeName == "bindMode") then
+		if (LibBindTool:IsBindModeEnabled()) then
 			LibBindTool:DisableBindMode()
 		else
-			LibBindTool:EnableBindMode() 
+			LibBindTool:EnableBindMode()
 		end
-	end 
+	end
 end
 
 -- LibBindTool Event & Chat Command Handling
 ----------------------------------------------------
 LibBindTool.OnChatCommand = function(self, editBox, ...)
-	if (self:GetBindingFrame():IsShown()) then 
+	if (self:GetBindingFrame():IsShown()) then
 		self:CancelBindings()
-	else 
+	else
 		self:EnableBindMode()
 	end
 end
 
 LibBindTool.OnEvent = function(self, event, ...)
-	if (event == "PLAYER_REGEN_DISABLED") then 
-		if self.bindActive then 
+	if (event == "PLAYER_REGEN_DISABLED") then
+		if self.bindActive then
 			Print(1, 0, 0, L["Keybind changes were discarded because you entered combat."])
 			return self:CancelBindings()
-		end	
-	elseif (event == "UPDATE_BINDINGS") or (event == "PLAYER_ENTERING_WORLD") then 
-		-- Binds aren't fully loaded directly after login, 
+		end
+	elseif (event == "UPDATE_BINDINGS") or (event == "PLAYER_ENTERING_WORLD") then
+		-- Binds aren't fully loaded directly after login,
 		-- so we need to track the event for updated bindings as well.
 		self:UpdateBindings()
 
-	elseif (event == "GP_UPDATE_ACTIONBUTTON_COUNT") then 
+	elseif (event == "GP_UPDATE_ACTIONBUTTON_COUNT") then
 		self:UpdateButtons()
 	end
 end
@@ -807,7 +808,7 @@ LibBindTool.Start = function(self)
 	self:RegisterMessage("GP_UPDATE_ACTIONBUTTON_COUNT", "OnEvent")
 end
 
-LibBindTool:RegisterChatCommand("bind", "OnChatCommand", true) -- force flag set, in case of library upgrade 
+LibBindTool:RegisterChatCommand("bind", "OnChatCommand", true) -- force flag set, in case of library upgrade
 LibBindTool:Start() -- start this!
 
 -- For front-end overrides
diff --git a/SimpleClassPower/back-end/tools/colors.lua b/SimpleClassPower/back-end/tools/colors.lua
index ae97027..c685ae9 100644
--- a/SimpleClassPower/back-end/tools/colors.lua
+++ b/SimpleClassPower/back-end/tools/colors.lua
@@ -39,12 +39,12 @@ local ColorTemplate = {}
 
 -- Utility Functions
 -----------------------------------------------------------------
--- Syntax check 
+-- Syntax check
 local check = function(value, num, ...)
 	assert(type(num) == "number", ("Bad argument #%.0f to '%s': %s expected, got %s"):format(2, "Check", "number", type(num)))
 	for i = 1,select("#", ...) do
-		if type(value) == select(i, ...) then 
-			return 
+		if type(value) == select(i, ...) then
+			return
 		end
 	end
 	local types = string_join(", ", ...)
@@ -67,13 +67,13 @@ copyTable = function(source, copy)
 	return copy
 end
 
--- Convert a Blizzard Color or RGB value set 
--- into our own custom color table format. 
+-- Convert a Blizzard Color or RGB value set
+-- into our own custom color table format.
 local createColor = function(...)
 	local tbl
 	if (select("#", ...) == 1) then
 		local old = ...
-		if (old.r) then 
+		if (old.r) then
 			tbl = {}
 			tbl[1] = old.r or 1
 			tbl[2] = old.g or 1
@@ -85,7 +85,7 @@ local createColor = function(...)
 		tbl = { ... }
 	end
 	-- Do NOT use a metatable, just embed.
-	for name,method in pairs(ColorTemplate) do 
+	for name,method in pairs(ColorTemplate) do
 		tbl[name] = method
 	end
 	if (#tbl == 3) then
@@ -98,11 +98,11 @@ end
 -- Convert a whole Blizzard color table
 local createColorGroup = function(group)
 	local tbl = {}
-	for i,v in pairs(group) do 
+	for i,v in pairs(group) do
 		tbl[i] = createColor(v)
-	end 
+	end
 	return tbl
-end 
+end
 
 -- Assign proxies to the color table, for modules to use
 Colors.CreateColor = function(self, ...) return createColor(...) end
@@ -110,9 +110,9 @@ Colors.CreateColorGroup = function(self, ...) return createColorGroup(...) end
 
 -- Color Template
 -----------------------------------------------------------------
--- Emulate some of the Blizzard methods, 
--- since they too do colors this way now. 
--- Goal is not to be fully interchangeable. 
+-- Emulate some of the Blizzard methods,
+-- since they too do colors this way now.
+-- Goal is not to be fully interchangeable.
 ColorTemplate.GetRGB = function(self)
 	return self[1], self[2], self[3]
 end
@@ -171,14 +171,14 @@ Colors.tapped = createColor(121/255, 101/255, 96/255)
 Colors.dead = createColor(121/255, 101/255, 96/255)
 
 -- xp, rep and artifact coloring
-Colors.xp = createColor(116/255, 23/255, 229/255) -- xp bar 
+Colors.xp = createColor(116/255, 23/255, 229/255) -- xp bar
 Colors.xpValue = createColor(145/255, 77/255, 229/255) -- xp bar text
 Colors.rested = createColor(163/255, 23/255, 229/255) -- xp bar while being rested
 Colors.restedValue = createColor(203/255, 77/255, 229/255) -- xp bar text while being rested
 Colors.restedBonus = createColor(69/255, 17/255, 134/255) -- rested bonus bar
 Colors.artifact = createColor(229/255, 204/255, 127/255) -- artifact or azerite power bar
 
--- quest difficulty coloring 
+-- quest difficulty coloring
 Colors.quest = {}
 Colors.quest.red = createColor(204/255, 26/255, 26/255)
 Colors.quest.orange = createColor(255/255, 106/255, 26/255)
@@ -196,15 +196,15 @@ Colors.class.DEATHKNIGHT = createColor(176/255, 31/255, 79/255)
 Colors.class.DEMONHUNTER = createColor(163/255, 48/255, 201/255)
 Colors.class.DRUID = createColor(225/255, 125/255, 35/255)
 Colors.class.EVOKER = createColor(51/255, 147/255, 127/255)
-Colors.class.HUNTER = createColor(191/255, 232/255, 115/255) 
+Colors.class.HUNTER = createColor(191/255, 232/255, 115/255)
 Colors.class.MAGE = createColor(105/255, 204/255, 240/255)
 Colors.class.MONK = createColor(0/255, 255/255, 150/255)
 Colors.class.PALADIN = createColor(225/255, 160/255, 226/255)
 Colors.class.PRIEST = createColor(176/255, 200/255, 225/255)
-Colors.class.ROGUE = createColor(255/255, 225/255, 95/255) 
-Colors.class.SHAMAN = createColor(32/255, 122/255, 222/255) 
-Colors.class.WARLOCK = createColor(148/255, 130/255, 201/255) 
-Colors.class.WARRIOR = createColor(229/255, 156/255, 110/255) 
+Colors.class.ROGUE = createColor(255/255, 225/255, 95/255)
+Colors.class.SHAMAN = createColor(32/255, 122/255, 222/255)
+Colors.class.WARLOCK = createColor(148/255, 130/255, 201/255)
+Colors.class.WARRIOR = createColor(229/255, 156/255, 110/255)
 Colors.class.UNKNOWN = createColor(195/255, 202/255, 217/255)
 
 -- debuffs
@@ -216,11 +216,11 @@ Colors.debuff.Disease = createColor(153/255, 102/255, 0/255)
 Colors.debuff.Poison = createColor(0/255, 153/255, 0/255)
 Colors.debuff[""] = createColor(0/255, 0/255, 0/255)
 
--- faction 
+-- faction
 Colors.faction = {}
 Colors.faction.Alliance = createColor(74/255, 84/255, 232/255)
 Colors.faction.Horde = createColor(229/255, 13/255, 18/255)
-Colors.faction.Neutral = createColor(249/255, 158/255, 35/255) 
+Colors.faction.Neutral = createColor(249/255, 158/255, 35/255)
 
 -- damage feedback
 Colors.feedback = {}
@@ -244,32 +244,32 @@ Colors.power = {}
 Colors.power.ENERGY = createColor(254/255, 245/255, 145/255) -- Rogues, Druids
 Colors.power.FURY = createColor(255/255, 0/255, 111/255) -- Vengeance Demon Hunter
 Colors.power.FOCUS = createColor(125/255, 168/255, 195/255) -- Hunter Pets
-Colors.power.INSANITY = createColor(102/255, 64/255, 204/255) -- Shadow Priests 
-Colors.power.LUNAR_POWER = createColor(121/255, 152/255, 192/255) -- Balance Druid Astral Power 
+Colors.power.INSANITY = createColor(102/255, 64/255, 204/255) -- Shadow Priests
+Colors.power.LUNAR_POWER = createColor(121/255, 152/255, 192/255) -- Balance Druid Astral Power
 Colors.power.MAELSTROM = createColor(0/255, 188/255, 255/255) -- Elemental Shamans
 Colors.power.MANA = createColor(80/255, 116/255, 255/255) -- Druid, Hunter, Mage, Paladin, Priest, Shaman, Warlock
-Colors.power.PAIN = createColor(142/255, 191/255, 0/255) 
+Colors.power.PAIN = createColor(142/255, 191/255, 0/255)
 Colors.power.RAGE = createColor(215/255, 7/255, 7/255) -- Druids, Warriors
 Colors.power.RUNIC_POWER = createColor(0/255, 236/255, 255/255) -- Death Knights
 
 -- Secondary Resource Colors
 Colors.power.ARCANE_CHARGES = createColor(121/255, 152/255, 192/255) -- Arcane Mage
-Colors.power.CHI = createColor(126/255, 255/255, 163/255) -- Monk 
+Colors.power.CHI = createColor(126/255, 255/255, 163/255) -- Monk
 Colors.power.COMBO_POINTS = createColor(255/255, 0/255, 30/255) -- Rogues, Druids
-Colors.power.HOLY_POWER = createColor(245/255, 254/255, 145/255) -- Retribution Paladins 
-Colors.power.RUNES = createColor(100/255, 155/255, 225/255) -- Death Knight 
+Colors.power.HOLY_POWER = createColor(245/255, 254/255, 145/255) -- Retribution Paladins
+Colors.power.RUNES = createColor(100/255, 155/255, 225/255) -- Death Knight
 Colors.power.SOUL_FRAGMENTS = createColor(148/255, 130/255, 201/255) -- Demon Hunter
-Colors.power.SOUL_SHARDS = createColor(148/255, 130/255, 201/255) -- Warlock 
+Colors.power.SOUL_SHARDS = createColor(148/255, 130/255, 201/255) -- Warlock
 
 -- Coloring when modules use a different color for each point.
 -- Weirdly enough we're only using to to produce an alternate color.
 -- This will be changed later, it was just the fastest way to a goal right now.
 Colors.power.COMBO_POINTS_MULTIPLE = {
-	createColor(225/255, 65/255, 30/255), 
-	createColor(225/255, 65/255, 30/255), 
-	createColor(225/255, 65/255, 30/255), 
-	createColor(225/255, 65/255, 30/255), 
-	createColor(225/255, 65/255, 30/255) 
+	createColor(225/255, 65/255, 30/255),
+	createColor(225/255, 65/255, 30/255),
+	createColor(225/255, 65/255, 30/255),
+	createColor(225/255, 65/255, 30/255),
+	createColor(225/255, 65/255, 30/255)
 }
 
 -- GUI2 style
@@ -288,12 +288,21 @@ Colors.power.ALTERNATE = createColor(70/255, 255/255, 131/255)
 Colors.power.AMMOSLOT = createColor(204/255, 153/255, 0/255)
 Colors.power.FUEL = createColor(0/255, 140/255, 127/255)
 Colors.power.STAGGER = {}
-Colors.power.STAGGER[1] = createColor(132/255, 255/255, 132/255) 
-Colors.power.STAGGER[2] = createColor(255/255, 250/255, 183/255) 
-Colors.power.STAGGER[3] = createColor(255/255, 107/255, 107/255) 
+Colors.power.STAGGER[1] = createColor(132/255, 255/255, 132/255)
+Colors.power.STAGGER[2] = createColor(255/255, 250/255, 183/255)
+Colors.power.STAGGER[3] = createColor(255/255, 107/255, 107/255)
 
 -- Fallback for the rare cases where an unknown type is requested.
-Colors.power.UNUSED = createColor(195/255, 202/255, 217/255) 
+Colors.power.UNUSED = createColor(195/255, 202/255, 217/255)
+
+-- Wrath Death Knight Runes
+-- *note that the order is the display order, not by runeType
+Colors.runes = {
+	[1] = createColor(196/255, 31/255, 60/255), -- blood
+	[2] = createColor(63/255, 103/255, 154/255), -- frost
+	[3] = createColor(73/255, 180/255, 28/255), -- unholy
+	[4] = createColor(173/255, 62/255, 145/255) -- death
+}
 
 -- Allow us to use power type index to get the color
 -- FrameXML/UnitFrame.lua
@@ -317,7 +326,7 @@ Colors.reaction = {}
 Colors.reaction[1] = createColor(205/255, 46/255, 36/255) -- hated
 Colors.reaction[2] = createColor(205/255, 46/255, 36/255) -- hostile
 Colors.reaction[3] = createColor(192/255, 68/255, 0/255) -- unfriendly
-Colors.reaction[4] = createColor(249/255, 188/255, 65/255) -- neutral 
+Colors.reaction[4] = createColor(249/255, 188/255, 65/255) -- neutral
 Colors.reaction[5] = createColor( 64/255, 131/255, 38/255) -- friendly
 Colors.reaction[6] = createColor( 64/255, 131/255, 69/255) -- honored
 Colors.reaction[7] = createColor( 64/255, 131/255, 104/255) -- revered
@@ -325,11 +334,11 @@ Colors.reaction[8] = createColor( 64/255, 131/255, 131/255) -- exalted
 Colors.reaction.civilian = createColor(64/255, 131/255, 38/255) -- used for friendly player nameplates
 
 -- friendship
--- just using this as pointers to the reaction colors, 
+-- just using this as pointers to the reaction colors,
 -- so there won't be a need to ever edit these.
 Colors.friendship = {}
 Colors.friendship[1] = Colors.reaction[3] -- Stranger
-Colors.friendship[2] = Colors.reaction[4] -- Acquaintance 
+Colors.friendship[2] = Colors.reaction[4] -- Acquaintance
 Colors.friendship[3] = Colors.reaction[5] -- Buddy
 Colors.friendship[4] = Colors.reaction[6] -- Friend (honored color)
 Colors.friendship[5] = Colors.reaction[7] -- Good Friend (revered color)
@@ -349,25 +358,25 @@ Colors.timer = {}
 Colors.timer.UNKNOWN = createColor(179/255, 77/255, 0/255) -- fallback for timers and unknowns
 Colors.timer.EXHAUSTION = createColor(179/255, 77/255, 0/255)
 Colors.timer.BREATH = createColor(0/255, 128/255, 255/255)
-Colors.timer.DEATH = createColor(217/255, 90/255, 0/255) 
-Colors.timer.FEIGNDEATH = createColor(217/255, 90/255, 0/255) 
+Colors.timer.DEATH = createColor(217/255, 90/255, 0/255)
+Colors.timer.FEIGNDEATH = createColor(217/255, 90/255, 0/255)
 
 -- threat
 Colors.threat = {}
 Colors.threat[0] = Colors.reaction[4] -- not really on the threat table
-Colors.threat[1] = createColor(249/255, 158/255, 35/255) -- tanks having lost threat, dps overnuking 
+Colors.threat[1] = createColor(249/255, 158/255, 35/255) -- tanks having lost threat, dps overnuking
 Colors.threat[2] = createColor(255/255, 96/255, 12/255) -- tanks about to lose threat, dps getting aggro
-Colors.threat[3] = createColor(255/255, 0/255, 0/255) -- securely tanking, or totally fucked :) 
+Colors.threat[3] = createColor(255/255, 0/255, 0/255) -- securely tanking, or totally fucked :)
 
 -- zone names
 Colors.zone = {}
 Colors.zone.arena = createColor(175/255, 76/255, 56/255)
-Colors.zone.combat = createColor(175/255, 76/255, 56/255) 
+Colors.zone.combat = createColor(175/255, 76/255, 56/255)
 Colors.zone.contested = createColor(229/255, 159/255, 28/255)
-Colors.zone.friendly = createColor(64/255, 175/255, 38/255) 
-Colors.zone.hostile = createColor(175/255, 76/255, 56/255) 
+Colors.zone.friendly = createColor(64/255, 175/255, 38/255)
+Colors.zone.hostile = createColor(175/255, 76/255, 56/255)
 Colors.zone.sanctuary = createColor(104/255, 204/255, 239/255)
-Colors.zone.unknown = createColor(255/255, 234/255, 137/255) -- instances, bgs, contested zones on pve realms 
+Colors.zone.unknown = createColor(255/255, 234/255, 137/255) -- instances, bgs, contested zones on pve realms
 
 -- item rarity coloring
 Colors.blizzquality = createColorGroup(ITEM_QUALITY_COLORS)
diff --git a/SimpleClassPower/front-end/root.lua b/SimpleClassPower/front-end/root.lua
index 03ce7e4..4c55066 100644
--- a/SimpleClassPower/front-end/root.lua
+++ b/SimpleClassPower/front-end/root.lua
@@ -2,9 +2,9 @@ local ADDON, Private = ...
 local L = Wheel("LibLocale"):GetLocale(ADDON)
 local Core = Wheel("LibModule"):NewModule(ADDON, "LibDB", "LibMessage", "LibEvent", "LibSlash", "LibSecureHook", "LibFrame", "LibUnitFrame", "LibStatusBar","LibMover")
 
--- Tell the back-end what addon to look for before 
--- initializing this module and all its submodules. 
-Core:SetAddon(ADDON) 
+-- Tell the back-end what addon to look for before
+-- initializing this module and all its submodules.
+Core:SetAddon(ADDON)
 
 -- Tell the backend where our saved variables are found.
 -- *it's important that we're doing this here, before any module configs are created.
@@ -42,13 +42,13 @@ local Style = function(self, unit, id, layout, ...)
 
 	-- Frame
 	-----------------------------------------------------------
-	self:SetSize(unpack(layout.ClassPowerSize)) 
+	self:SetSize(unpack(layout.ClassPowerSize))
 	self:Place("CENTER", "UICenter", "CENTER", 0, 0)
 
-	-- We Don't want this clickable, 
+	-- We Don't want this clickable,
 	-- it's in the middle of the screen!
-	self:EnableMouse(false) 
-	self.ignoreMouseOver = true 
+	self:EnableMouse(false)
+	self.ignoreMouseOver = true
 
 	-- Scaffolds
 	-----------------------------------------------------------
@@ -56,7 +56,7 @@ local Style = function(self, unit, id, layout, ...)
 	local backdrop = self:CreateFrame("Frame")
 	backdrop:SetAllPoints()
 	backdrop:SetFrameLevel(self:GetFrameLevel())
-	
+
 	-- frame to contain bars, icons, etc
 	local content = self:CreateFrame("Frame")
 	content:SetAllPoints()
@@ -71,25 +71,26 @@ local Style = function(self, unit, id, layout, ...)
 	-----------------------------------------------------------
 	local classPower = backdrop:CreateFrame("Frame")
 	classPower:SetSize(unpack(layout.ClassPowerSize)) -- minimum size, this is really just an anchor
-	classPower:SetPoint(unpack(layout.ClassPowerPlace)) 
+	classPower:SetPoint(unpack(layout.ClassPowerPlace))
 
 	-- User configurable settings
 	classPower.colorClass = db.enableClassColor
-	classPower.hideWhenUnattackable = db.enableSmartVisibility 
-	classPower.hideWhenNoTarget = db.enableSmartVisibility 
+	classPower.hideWhenUnattackable = db.enableSmartVisibility
+	classPower.hideWhenNoTarget = db.enableSmartVisibility
 	classPower.hideWhenEmpty = db.enableSmartVisibility
 
 	-- Addon chosen settings
-	classPower.alphaEmpty = layout.ClassPowerAlphaWhenEmpty 
+	classPower.alphaEmpty = layout.ClassPowerAlphaWhenEmpty
+	classPower.alpahEmptyRunes = layout.ClassPowerAlphaWhenEmptyRunes
 	classPower.alphaNoCombat = layout.ClassPowerAlphaWhenOutOfCombat
 	classPower.alphaNoCombatRunes = layout.ClassPowerAlphaWhenOutOfCombatRunes
-	classPower.flipSide = layout.ClassPowerReverseSides 
+	classPower.flipSide = layout.ClassPowerReverseSides
 	classPower.maxComboPoints = layout.ClassPowerMaxComboPoints
-	classPower.runeSortOrder = layout.ClassPowerRuneSortOrder 
+	classPower.runeSortOrder = layout.ClassPowerRuneSortOrder
 
 	-- Creating 6 frames since runes require it
-	for i = 1,6 do 
-		
+	for i = 1,6 do
+
 		-- Main point object
 		local point = classPower:CreateStatusBar() -- the widget require Wheel statusbars
 		point:SetSmoothingFrequency(.25) -- keep bar transitions fairly fast
@@ -97,8 +98,8 @@ local Style = function(self, unit, id, layout, ...)
 		point:SetValue(1)
 
 		-- Empty slot texture
-		-- Make it slightly larger than the point textures, 
-		-- to give a nice darker edge around the points. 
+		-- Make it slightly larger than the point textures,
+		-- to give a nice darker edge around the points.
 		point.slotTexture = point:CreateTexture()
 		point.slotTexture:SetDrawLayer("BACKGROUND", -1)
 		point.slotTexture:SetAllPoints(point)
@@ -108,9 +109,9 @@ local Style = function(self, unit, id, layout, ...)
 		point.glow:SetDrawLayer("ARTWORK", 1)
 		point.glow:SetAllPoints(point:GetStatusBarTexture())
 
-		if layout.ClassPowerPostCreatePoint then 
+		if layout.ClassPowerPostCreatePoint then
 			layout.ClassPowerPostCreatePoint(classPower, i, point)
-		end 
+		end
 
 		classPower[i] = point
 	end
@@ -129,15 +130,15 @@ end
 ---------------------------------------------------
 Core.IsDefaultPosition = function(self)
 	return self.mover:IsDefaultPosition()
-end 
+end
 
 Core.IsDefaultScale = function(self)
 	return self.mover:IsDefaultScale()
-end 
+end
 
 Core.IsDefaultPositionAndScale = function(self)
 	return self.mover:IsDefaultPosition() and self.mover:IsDefaultScale()
-end 
+end
 
 Core.PostUpdateSettings = function(self)
 	local db = self.db
@@ -147,7 +148,7 @@ Core.PostUpdateSettings = function(self)
 
 	-- Update frame element switches
 	element.hideWhenUnattackable = db.enableSmartVisibility
-	element.hideWhenNoTarget = db.enableSmartVisibility 
+	element.hideWhenNoTarget = db.enableSmartVisibility
 	element.hideWhenEmpty = db.enableSmartVisibility
 	element.colorClass = db.enableClassColor
 
@@ -158,19 +159,19 @@ Core.PostUpdateSettings = function(self)
 end
 
 Core.OnEvent = function(self, event, ...)
-	if (event == "GP_MOVER_UPDATED") then 
+	if (event == "GP_MOVER_UPDATED") then
 		local mover, target, point, offsetX, offsetY = ...
-		if (mover == self.mover) and (target == self.frame) then 
+		if (mover == self.mover) and (target == self.frame) then
 			self.db.savedPosition = { point, "UICenter", point, offsetX, offsetY }
-		end 
-	elseif (event == "GP_MOVER_SCALE_UPDATED") then 
-		local mover, target, scale = ... 
-		if (mover == self.mover) and (target == self.frame) then 
-			if (self:IsDefaultScale()) then 
+		end
+	elseif (event == "GP_MOVER_SCALE_UPDATED") then
+		local mover, target, scale = ...
+		if (mover == self.mover) and (target == self.frame) then
+			if (self:IsDefaultScale()) then
 				self.db.savedScale = nil
-			else 
+			else
 				self.db.savedScale = scale
-			end 
+			end
 		end
 	end
 end
@@ -178,44 +179,44 @@ end
 Core.OnChatCommand = function(self, editBox, ...)
 	local db = self.db
 	local cmd, arg = ...
-	if (cmd == "classcolor") then 
+	if (cmd == "classcolor") then
 		local enableClassColor = db.enableClassColor
-		if (arg == "on") or (arg == "enable") then 
-			db.enableClassColor = true 
+		if (arg == "on") or (arg == "enable") then
+			db.enableClassColor = true
 		elseif (arg == "off") or (arg == "disable") or (not arg) then
 			db.enableClassColor = false
-		end 
-		if (enableClassColor ~= db.enableClassColor) then 
+		end
+		if (enableClassColor ~= db.enableClassColor) then
 			self:PostUpdateSettings()
 		end
 
-	elseif (cmd == "show") then 
+	elseif (cmd == "show") then
 		local enableSmartVisibility = db.enableSmartVisibility
-		db.enableSmartVisibility = (arg == "smart") and true or false 
-		if (enableSmartVisibility ~= db.enableSmartVisibility) then 
+		db.enableSmartVisibility = (arg == "smart") and true or false
+		if (enableSmartVisibility ~= db.enableSmartVisibility) then
 			self:PostUpdateSettings()
 		end
-	elseif (cmd == "lock") then 
+	elseif (cmd == "lock") then
 		self:LockMover(self.frame)
-	elseif (cmd == "unlock") then 
+	elseif (cmd == "unlock") then
 		self:UnlockMover(self.frame)
-	elseif (cmd == "help") then 
+	elseif (cmd == "help") then
 		print(L["/scp - Toggle the overlay for moving/scaling."])
 		print(L["/scp classcolor on - Enable class colors."])
 		print(L["/scp classcolor off - Disable class colors."])
 		print(L["/scp show always - Always show."])
 		print(L["/scp show smart - Hide when no target or unattackable."])
 		print(L["/scp help - Show this."])
-	else 
-		self:ToggleMover(self.frame) 
-	end 
+	else
+		self:ToggleMover(self.frame)
+	end
 end
 
 ---------------------------------------------------
 -- Initialization
 ---------------------------------------------------
 Core.OnInit = function(self)
-	
+
 	self:RemoveConfig("Core")
 
 	self.db = GetConfig(ADDON)
@@ -225,14 +226,14 @@ Core.OnInit = function(self)
 
 	-- Setup our frame and its anchor
 	---------------------------------------------------------------------
-	-- The main frame, this is a secure unitframe, 
-	-- though have no mouse interaction. 
+	-- The main frame, this is a secure unitframe,
+	-- though have no mouse interaction.
 	local frame = self:SpawnUnitFrame("player", "UICenter", "Style")
 	frame:Place(unpack(self.db.savedPosition or self.layout.Place))
 	self.frame = frame
-	
+
 	-- Make it movable!
-	local mover = self:CreateMover(frame) 
+	local mover = self:CreateMover(frame)
 	mover:SetName(ADDON)
 	mover:SetMinMaxScale(.5, 1.5, .05)
 	mover:SetDefaultPosition(unpack(self.layout.Place))
@@ -246,15 +247,15 @@ Core.OnInit = function(self)
 		tooltip:AddLine(L["<Shift Right Click> to reset scale"], Colors.green[1], Colors.green[2], Colors.green[3])
 		tooltip:Show()
 	end
-	self.mover = mover 
+	self.mover = mover
 
 	-- Register a chat command to toggle the config window
 	---------------------------------------------------------------------
 	self:RegisterChatCommand("scp", "OnChatCommand")
 	self:RegisterChatCommand("simpleclasspower", "OnChatCommand")
-end 
+end
 
 Core.OnEnable = function(self)
 	self:RegisterMessage("GP_MOVER_UPDATED", "OnEvent")
 	self:RegisterMessage("GP_MOVER_SCALE_UPDATED", "OnEvent")
-end 
\ No newline at end of file
+end
\ No newline at end of file
diff --git a/SimpleClassPower/front-end/stylesheet.lua b/SimpleClassPower/front-end/stylesheet.lua
index cc9c671..bb0ead5 100644
--- a/SimpleClassPower/front-end/stylesheet.lua
+++ b/SimpleClassPower/front-end/stylesheet.lua
@@ -5,7 +5,7 @@ local LibDB = Wheel("LibDB")
 local GetMedia = Private.GetMedia
 local Colors = Private.Colors
 
--- Define everything here so the order 
+-- Define everything here so the order
 -- in which they call each other doesn't matter.
 local ClassPower_PostUpdate
 local ClassPower_PostCreatePoint
@@ -19,23 +19,23 @@ ClassPower_PostCreatePoint = function(element, id, point)
 
 	-- Setup the point
 	point:SetSize(unpack(layout.ClassPowerPointSize))
-	point:SetSparkTexture(layout.ClassPowerSparkTexture) 
+	point:SetSparkTexture(layout.ClassPowerSparkTexture)
 	point:SetStatusBarTexture(layout.ClassPowerPointTexture)
 	point:SetTexCoord(layout.ClassPowerPointTexCoordFunction(id))
 
-	-- Force disable smoothing, it's too inaccurate for this. 
+	-- Force disable smoothing, it's too inaccurate for this.
 	point:DisableSmoothing(true)
 
 	-- Hardcode the bars to grow from bottom to top.
-	point:SetOrientation("UP") 
+	point:SetOrientation("UP")
 
 	-- Position the point
 	-- We don't offer any growth choices, it's always right to left.
-	if (i == 1) then 
+	if (i == 1) then
 		point:Place("TOPLEFT", element, "TOPLEFT", 0, 0)
-	else 
+	else
 		point:Place("TOPLEFT", element[id-1], "TOPRIGHT", 0, 0)
-	end 
+	end
 
 	-- Backdrop, aligned to the full point
 	point.slotTexture:ClearAllPoints()
@@ -68,67 +68,67 @@ ClassPower_PostUpdate = function(element, unit, min, max, newMax, powerType)
 	-- Figure out the number of pills to divide the bar into.
 	-- Anything not having an exception here will default to 5.
 	local currentPillCount
-	if (powerType == "RUNES") or ((powerType == "CHI") and (UnitPowerMax("player", SPELL_POWER_CHI) == 6)) then 
+	if (powerType == "RUNES") or ((powerType == "CHI") and (UnitPowerMax("player", SPELL_POWER_CHI) == 6)) then
 		currentPillCount = 6
-	elseif (powerType == "STAGGER") then 
+	elseif (powerType == "STAGGER") then
 		currentPillCount = 3
 	else
 		currentPillCount = 5
-	end 
+	end
 
 	-- Retrieve the stylesheet
 	local layout = UnitFramePlayerHUD
 
 	-- Make sure the resources are centered
 	local elementWidth = currentPillCount * layout.ClassPowerPointSize[1]
-	if elementWidth ~= element.width then 
+	if elementWidth ~= element.width then
 		element:SetWidth(elementWidth)
 		element.width = elementWidth
 	end
 
 	-- Update Glow overlays
-	for i = 1, #element do 
+	for i = 1, #element do
 		local point = element[i]
-		if point:IsShown() then 
+		if point:IsShown() then
 			local value = point:GetValue()
 			local min, max = point:GetMinMaxValues()
-		
+
 			-- Base it all on the bar's current color
 			local r, g, b = point:GetStatusBarColor()
 			point.glow:SetVertexColor(r, g, b, .75)
 			point.slotTexture:SetVertexColor(r*.25, g*.25, b*.25, .85)
-		
+
 			-- Adjust texcoords of the overlay glow to match the bars
 			local coords = point.glow.texCoords
 			point.glow:SetTexCoord(coords[1], coords[2], coords[4] - (coords[4]-coords[3]) * ((value-min)/(max-min)), coords[4])
-		end 
-	end 
+		end
+	end
 
 end
 
 UnitFramePlayerHUD = {
 
-	-- Default position of the entire frame, 
-	-- will be overridden if the user changes position manually.  
-	Place = { "BOTTOM", "UICenter", "BOTTOM", 0, 300 }, 
+	-- Default position of the entire frame,
+	-- will be overridden if the user changes position manually.
+	Place = { "BOTTOM", "UICenter", "BOTTOM", 0, 300 },
 
-	-- These are not the size and places of the actual element, 
+	-- These are not the size and places of the actual element,
 	-- do NOT change these as they are needed for it to function!
-	ClassPowerSize = { 5*70, 70 }, 
+	ClassPowerSize = { 5*70, 70 },
 	ClassPowerPlace = { "CENTER", 0, 0 },
 
 	-- Point bars
-	ClassPowerPointSize = { 70,70 }, 
+	ClassPowerPointSize = { 70,70 },
 	ClassPowerPointTexture = GetMedia("diabolic_runes"),
 	ClassPowerPointTexCoordFunction = function(id) return (id-1)*128/1024, id*128/1024, 128/512, 256/512 end,
 
 	-- Slot textures
-	ClassPowerSlotSize = { 70,70 }, 
+	ClassPowerSlotSize = { 70,70 },
 	ClassPowerSlotTexture = GetMedia("diabolic_runes"),
 	ClassPowerSlotTexCoordFunction = function(id) return (id-1)*128/1024, id*128/1024, 0/512, 128/512 end,
 
 	-- Overlay glow
-	ClassPowerGlowSize = { 70,70 }, 
+	ClassPowerGlowSize = { 70,70 },
 	ClassPowerGlowTexture = GetMedia("diabolic_runes"),
 	ClassPowerGlowBlendMode = "ADD",
 	ClassPowerGlowTexCoordFunction = function(id) return (id-1)*128/1024, id*128/1024, 256/512, 384/512 end,
@@ -139,6 +139,7 @@ UnitFramePlayerHUD = {
 	-- Visibility and sorting
 	ClassPowerMaxComboPoints = 5, -- maximum displayed points (does not affect runes)
 	ClassPowerAlphaWhenEmpty = .5, -- alpha of empty points
+	ClassPowerAlphaWhenEmptyRunes = .5, -- wrath only
 	ClassPowerAlphaWhenOutOfCombat = .5, -- alpha multiplier of all points when not in combat
 	ClassPowerAlphaWhenOutOfCombatRunes = .5, -- alpha multiplier of all runes when not in combat
 	ClassPowerReverseSides = false, -- we don't use it here, just left it for semantics
@@ -147,7 +148,7 @@ UnitFramePlayerHUD = {
 	-- Point creation and updates
 	ClassPowerPostCreatePoint = ClassPower_PostCreatePoint,
 	ClassPowerPostUpdate = ClassPower_PostUpdate
-	
+
 }
 
 LibDB:NewDatabase(ADDON..":[UnitFramePlayerHUD]", UnitFramePlayerHUD)