diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f81834..73ba3a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,10 @@ All notable changes to this project will be documented in this file. Be aware th
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased] 2024-04-03
+## [2.0.57-Release] 2024-04-19
 ### Changed
 - Messages containing links from Questie are now parsed. Will monitor the situation.
+- Adjusted class coloring to match the latest alpha builds of AzeriteUI.
 
 ### Fixed
 - Fixed some false positives on quest completion leading to weirdly formated messages.
diff --git a/ChatCleaner/Components/Money.lua b/ChatCleaner/Components/Money.lua
index 22a9c3c..4812b10 100644
--- a/ChatCleaner/Components/Money.lua
+++ b/ChatCleaner/Components/Money.lua
@@ -395,7 +395,11 @@ Module.OnEnable = function(self)
 	self:RegisterEvent("PLAYER_MONEY", "OnEvent")
 
 	self:RegisterBlacklistFilter(onAddMessageProxy)
-	self:RegisterMessageReplacement(onReplacementSetProxy)
+
+	if (ns.IsWoW10) then
+		self:RegisterMessageReplacement(onReplacementSetProxy)
+	end
+
 	self:RegisterMessageEventFilter("CHAT_MSG_MONEY", onChatEventProxy)
 end
 
@@ -415,6 +419,10 @@ Module.OnDisable = function(self)
 	self:UnregisterEvent("PLAYER_MONEY", "OnEvent")
 
 	self:UnregisterBlacklistFilter(onAddMessageProxy)
-	self:UnregisterMessageReplacement(onReplacementSetProxy)
+
+	if (ns.IsWoW10) then
+		self:UnregisterMessageReplacement(onReplacementSetProxy)
+	end
+
 	self:UnregisterMessageEventFilter("CHAT_MSG_MONEY", onChatEventProxy)
 end
diff --git a/ChatCleaner/Components/Quests.lua b/ChatCleaner/Components/Quests.lua
index fc12ee6..899204d 100644
--- a/ChatCleaner/Components/Quests.lua
+++ b/ChatCleaner/Components/Quests.lua
@@ -68,26 +68,10 @@ local P = setmetatable({}, { __index = function(t,k)
 end })
 
 Module.OnChatEvent = function(self, chatFrame, event, message, author, ...)
-
-	if (string_find(message, "|Hquestie")) then return end
+	if (ns:IsProtectedMessage(message)) then return end
 
 	local name
 
-	-- Questie links. Only remove brackets.
-	-- *Totally failed.
-	--if (event == "CHAT_MSG_CHANNEL") then
-	--
-	--	name = string_match(message, "|Hquestie")
-	--	if (name) then
-	--		-- This replacement breaks Questie's links.
-	-- 		-- I need to look into how their links are designed.
-	--		name = string_gsub(name, "[%[/%]]", "")
-	--		return false, name, author, ...
-	--	end
-	--
-	--	return
-	--end
-
 	-- Adding completed transmog sets here,
 	-- to make sure they don't fire as completed quests.
 	name = string_match(message, P[G.SET_COMPLETE])
@@ -125,6 +109,7 @@ end
 Module.OnEnable = function(self)
 	self:RegisterMessageEventFilter("CHAT_MSG_SYSTEM", onChatEventProxy)
 	self:RegisterMessageEventFilter("CHAT_MSG_CHANNEL", onChatEventProxy)
+	self:RegisterMessageEventFilter("CHAT_MSG_WHISPER", onChatEventProxy)
 end
 
 Module.OnDisable = function(self)
diff --git a/ChatCleaner/Core/Common/Colors.lua b/ChatCleaner/Core/Common/Colors.lua
index 5e7b99d..0846511 100644
--- a/ChatCleaner/Core/Common/Colors.lua
+++ b/ChatCleaner/Core/Common/Colors.lua
@@ -183,16 +183,19 @@ Colors.blizzclass = createColorGroup(RAID_CLASS_COLORS)
 Colors.class = {}
 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.DRUID = createColor(225/255, 125/255, 35/255)
+Colors.class.DRUID = createColor(245/255, 145/255, 55/255)
 Colors.class.EVOKER = createColor(51/255, 147/255, 127/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.PALADIN = createColor(225/255, 160/255, 226/255)
+Colors.class.PALADIN = createColor(245/255, 185/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.WARLOCK = createColor(148/255, 130/255, 201/255)
+Colors.class.WARLOCK = createColor(128/255, 110/255, 181/255)
 Colors.class.WARRIOR = createColor(229/255, 156/255, 110/255)
 Colors.class.UNKNOWN = createColor(195/255, 202/255, 217/255)
 
diff --git a/ChatCleaner/Core/Common/Constants.lua b/ChatCleaner/Core/Common/Constants.lua
index c8304b4..6d1d485 100644
--- a/ChatCleaner/Core/Common/Constants.lua
+++ b/ChatCleaner/Core/Common/Constants.lua
@@ -67,6 +67,8 @@ ns.Private.IsRetail = (WOW_PROJECT_ID == WOW_PROJECT_MAINLINE)
 ns.Private.IsClassic = (WOW_PROJECT_ID == WOW_PROJECT_CLASSIC)
 ns.Private.IsTBC = (WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC)
 ns.Private.IsWrath = (WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC)
+--ns.Private.IsCata = WOW_PROJECT_ID == (WOW_PROJECT_CATA_CLASSIC or 99) -- NYI in first build
+ns.Private.IsCata = (version >= 40400) and (version < 50000)
 ns.Private.WoW10 = version >= 100000
 
 -- Prefix for frame names
diff --git a/ChatCleaner/Core/Core.lua b/ChatCleaner/Core/Core.lua
index 2bf4841..dfd9c09 100644
--- a/ChatCleaner/Core/Core.lua
+++ b/ChatCleaner/Core/Core.lua
@@ -274,15 +274,17 @@ ChatCleaner_DB = CopyTable(defaults)
 
 ns.IsProtectedMessage = function(self, msg)
 	if (not msg or msg == "") then return end
-	-- This used to cause a bug, but might not be the case anymore.
-	--if (string_find(msg, "|Hquestie")) then
-	--	return true
-	--end
+	if (string_find(msg, "|Hquestie")) then
+		return true
+	end
 end
 
 ns.AddMessageFiltered = function(self, chatFrame, msg, r, g, b, chatID, ...)
 	if (not msg or msg == "") then return end
 
+	-- TODO:
+	-- *Encode Questie links, parse encoded string, decode Questie link.
+	--  This will ensure their links is uncorrupted but the line parsed in full.
 	if (not ns:IsProtectedMessage(msg)) then
 
 		-- Parse replacements that ignore the blacklists.