diff --git a/BastionLoot.toc b/BastionLoot.toc
index 706101e..c06d9e6 100644
--- a/BastionLoot.toc
+++ b/BastionLoot.toc
@@ -2,7 +2,7 @@
 ## Author: Roadblock
 ## Title: BastionLoot
 ## Notes: In-game EPGP loot helper, supports standby, main/alt shared pool, minEP, offpecGP. Pluggable price list. Alternative +wincount mode.
-## Version: 4.3.3
+## Version: 4.3.4
 ## X-Alpha:
 ## X-Website: https://github.com/Road-block/BastionLoot/releases/latest
 ## OptionalDeps: Ace3, MizusRaidTracker
diff --git a/BastionLoot_Cata.toc b/BastionLoot_Cata.toc
index 706101e..c06d9e6 100644
--- a/BastionLoot_Cata.toc
+++ b/BastionLoot_Cata.toc
@@ -2,7 +2,7 @@
 ## Author: Roadblock
 ## Title: BastionLoot
 ## Notes: In-game EPGP loot helper, supports standby, main/alt shared pool, minEP, offpecGP. Pluggable price list. Alternative +wincount mode.
-## Version: 4.3.3
+## Version: 4.3.4
 ## X-Alpha:
 ## X-Website: https://github.com/Road-block/BastionLoot/releases/latest
 ## OptionalDeps: Ace3, MizusRaidTracker
diff --git a/BastionLoot_Vanilla.toc b/BastionLoot_Vanilla.toc
index 11d1465..d0ee67d 100644
--- a/BastionLoot_Vanilla.toc
+++ b/BastionLoot_Vanilla.toc
@@ -2,7 +2,7 @@
 ## Author: Roadblock
 ## Title: BastionLoot
 ## Notes: In-game EPGP loot helper, supports standby, main/alt shared pool, minEP, offpecGP. Pluggable price list. Alternative +wincount mode.
-## Version: 2.9.2
+## Version: 2.9.3
 ## X-Alpha:
 ## X-Website: https://github.com/Road-block/BastionLoot/releases/latest
 ## OptionalDeps: Ace3, MizusRaidTracker
diff --git a/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua b/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
index 89f387a..7900937 100644
--- a/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
+++ b/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
@@ -2,7 +2,7 @@
 TreeGroup Container
 Container that uses a tree control to switch between groups.
 -------------------------------------------------------------------------------]]
-local Type, Version = "TreeGroup", 47
+local Type, Version = "TreeGroup", 48
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -387,10 +387,6 @@ local methods = {
 	["RefreshTree"] = function(self,scrollToSelection,fromOnUpdate)
 		local buttons = self.buttons
 		local lines = self.lines
-
-		for i, v in ipairs(buttons) do
-			v:Hide()
-		end
 		while lines[1] do
 			local t = tremove(lines)
 			for k in pairs(t) do
@@ -499,6 +495,10 @@ local methods = {
 			buttonnum = buttonnum + 1
 		end
 
+		-- We hide the remaining buttons after updating others to avoid a blizzard bug that keeps them interactable even if hidden when hidden before updating the buttons.
+		for i = buttonnum, #buttons do
+			buttons[i]:Hide()
+		end
 	end,
 
 	["SetSelected"] = function(self, value)
diff --git a/Modules/bids.lua b/Modules/bids.lua
index cadabb0..67555bd 100644
--- a/Modules/bids.lua
+++ b/Modules/bids.lua
@@ -154,6 +154,7 @@ function bepgp_bids:OnEnable()
   self.qtip:SetClampRectInsets(-100,100,50,-50)
   self.qtip:SetPoint("TOP",UIParent,"TOP",0,-50)
   LD:Register(addonName.."DialogMemberBid", bepgp:templateCache("DialogMemberBid"))
+  RAID_CLASS_COLORS = (_G.CUSTOM_CLASS_COLORS or _G.RAID_CLASS_COLORS)
 end
 
 function bepgp_bids:announceWinner(data)
diff --git a/Modules/roster.lua b/Modules/roster.lua
index db11c49..2badcdb 100644
--- a/Modules/roster.lua
+++ b/Modules/roster.lua
@@ -50,6 +50,7 @@ function bepgp_roster:OnEnable()
   end)
   container:AddChild(export)
   bepgp:make_escable(container,"add")
+  RAID_CLASS_COLORS = (_G.CUSTOM_CLASS_COLORS or _G.RAID_CLASS_COLORS)
 end
 
 function bepgp_roster:Toggle()
diff --git a/Modules/standby.lua b/Modules/standby.lua
index c4a3f25..4738888 100644
--- a/Modules/standby.lua
+++ b/Modules/standby.lua
@@ -32,6 +32,7 @@ function bepgp_standby:OnEnable()
     LD:Register(addonName.."DialogStandbyCheck", bepgp:templateCache("DialogStandbyCheck"))
     self._channelTimer = self:ScheduleTimer("injectOptions",10)
   end
+  RAID_CLASS_COLORS = (_G.CUSTOM_CLASS_COLORS or _G.RAID_CLASS_COLORS)
 end
 
 function bepgp_standby:injectOptions()
diff --git a/Modules/standings.lua b/Modules/standings.lua
index 0c8ec7a..65c783c 100644
--- a/Modules/standings.lua
+++ b/Modules/standings.lua
@@ -194,6 +194,7 @@ function bepgp_standings:OnEnable()
 
   bepgp:make_escable(container,"add")
   self:RegisterMessage(addonName.."_EPGPCACHE","CacheUpdate")
+  RAID_CLASS_COLORS = (_G.CUSTOM_CLASS_COLORS or _G.RAID_CLASS_COLORS)
 end
 
 function bepgp_standings:Toggle()
diff --git a/core.lua b/core.lua
index 2da22f8..59da4d3 100644
--- a/core.lua
+++ b/core.lua
@@ -3242,6 +3242,7 @@ function bepgp:OnEnable(reset) -- 2. PLAYER_LOGIN
     bepgp.VARS.minlevel = GetMaxPlayerLevel()
   end
   if reset then self._initdone = nil end
+  RAID_CLASS_COLORS = (_G.CUSTOM_CLASS_COLORS or _G.RAID_CLASS_COLORS)
   if IsInGuild() then
     local guildname = GetGuildInfo("player")
     if not guildname then