diff --git a/ButtonForge/Button.lua b/ButtonForge/Button.lua
index c20a041..c80dad0 100644
--- a/ButtonForge/Button.lua
+++ b/ButtonForge/Button.lua
@@ -1284,8 +1284,26 @@ end
 function Button:UpdateTexture()
 
 end
+
+--BFA fix: BFA removed the use of UnitBuff with the spell name as a parameter.
+--BFA fix: Added this function to compensate
+function Button:UnitBuffBySpell(unit, spell)
+	for i=1,40 do
+	  local name, icon, _, _, _, etime = UnitBuff(unit,i)
+	  if name then
+		if name == spell then
+			return UnitBuff(unit,i);
+		end    
+	  else 
+		break;
+	  end;
+	end;
+	return nil;
+end;
+
 function Button:UpdateTextureWispSpell()
-	if (UnitBuff("player", self.SpellName)) then			--NOTE: This works in en-US, hopefully it will be fine for other locales as well??
+--BFA fix: UnitBuff can no longer be called with the spell name as a param
+	if (self.UnitBuffBySpell("player", self.SpellName)) then			--NOTE: This en-US, hopefully it will be fine for other locales as well??
 		self.WIcon:SetTexture("Interface/Icons/Spell_Nature_WispSplode");
 	else
 		self.WIcon:SetTexture(self.Texture);
diff --git a/ButtonForge/ButtonForge.toc b/ButtonForge/ButtonForge.toc
index 36a8fac..aad1ed0 100644
--- a/ButtonForge/ButtonForge.toc
+++ b/ButtonForge/ButtonForge.toc
@@ -1,7 +1,7 @@
-## Interface: 70100
+## Interface: 80000
 ## Title: Button Forge
 ## Notes: Add as many or few extra Action Bars and Buttons to your user interface to complement the standard (or other) Action Bars
-## Version: 0.9.47
+## Version: 0.9.50
 ## Author: Massiner of Nathrezim
 ## SavedVariables: ButtonForgeGlobalSettings, ButtonForgeGlobalProfiles, ButtonForgeGlobalBackup
 ## SavedVariablesPerCharacter: ButtonForgeSave, BFSave
diff --git a/ButtonForge/Const.lua b/ButtonForge/Const.lua
index 2d283b4..5d4262a 100644
--- a/ButtonForge/Const.lua
+++ b/ButtonForge/Const.lua
@@ -10,7 +10,7 @@ local Const = BFConst;
 Const.SUMMON_RANDOM_FAVORITE_MOUNT_SPELL = 150544;
 Const.SUMMON_RANDOM_FAVORITE_MOUNT_ID = 268435455;
 Const.Version				= 0.9;
-Const.VersionMinor			= 49;
+Const.VersionMinor			= 50;
 Const.MAX_ACCOUNT_MACROS 	= 120;
 Const.ButtonNaming 			= "ButtonForge"
 Const.ButtonSeq 			= 1;					--This value will increment (so not technically a const...)
diff --git a/ButtonForge/EventManager.lua b/ButtonForge/EventManager.lua
index f68a855..59190c7 100644
--- a/ButtonForge/EventManager.lua
+++ b/ButtonForge/EventManager.lua
@@ -137,7 +137,8 @@ Usable:RegisterEvent("UPDATE_VEHICLE_ACTIONBAR");
 Usable:RegisterEvent("ACTIONBAR_UPDATE_USABLE");	--Use this as a backup...
 Usable:RegisterEvent("VEHICLE_UPDATE");
 Usable:RegisterEvent("ACTIONBAR_PAGE_CHANGED");	
-Usable:RegisterEvent("UPDATE_WORLD_STATES");	
+--BFA fix: UPDATE_WORLD_STATES is deprecated
+-- Usable:RegisterEvent("UPDATE_WORLD_STATES");	
 
 
 --[[------------------------------------------------------------------------
diff --git a/ButtonForge/ReadMe.txt b/ButtonForge/ReadMe.txt
index 69b2d33..6b1b019 100644
--- a/ButtonForge/ReadMe.txt
+++ b/ButtonForge/ReadMe.txt
@@ -2,7 +2,7 @@
 Mod for World of Warcraft
 
 Author: Massiner of Nathrezim
-Version: 0.9.47
+Version: 0.9.50
 
 Description: Graphically create as many Action Bars and Buttons in the game as you choose
 
@@ -20,6 +20,12 @@ Restrictions:
 
 
 History:
+26-July-2018		v0.9.50 - Updated for Wow v8.0 - this update is provided by DT85 (Zaranias - Aman'thul) & DandierSphinx... A big thanks for this!!!
+							- The below issues all prevented Button Forge functioning correctly or in some cases at all
+								- Corrected issue with removed UPDATE_WORLD_STATES event
+								- Corrected audio from Button Forge specific actions (e.g. opening/closing BF BUI)
+								- Corrected handling of Spells
+								- Corrected detection of when the Wisp Spell Icon should display
 28-November-2016	v0.9.47	- Updated for WoW v7.1
 04-October-2016		v0.9.46 - Fixed Icon display for Equipment Sets... Again! (also some corrections for talents etc which were actually added in .45 I believe?!, my book keeping on this one has been a bit iffy :S)
 09-August-2016		v0.9.45 - Fixed Icon display for Equipment Sets on Button Forge
diff --git a/ButtonForge/Util.lua b/ButtonForge/Util.lua
index f2a72d2..3652302 100644
--- a/ButtonForge/Util.lua
+++ b/ButtonForge/Util.lua
@@ -1661,8 +1661,15 @@ end
 	Spell Functions
 -------------------------------------------]]
 function Util.GetFullSpellName(Name, Rank)
+--BFA fix: GetSpellInfo now returns a nil for the rank.  That's passed in here
+--So we check to make sure ranx exists or only pass back the name itself.
+	if (Rank) then
+		Rank = "("..Rank..")";
+	else
+		Rank = "";
+	end
 	if (Name) then
-		return Name.."("..Rank..")";
+		return Name..Rank;
 	end
 end