diff --git a/ShestakUI/Config/Filters_TBC/RaidAuraWatch.lua b/ShestakUI/Config/Filters_TBC/RaidAuraWatch.lua
index c96cfae46..95aba29e9 100644
--- a/ShestakUI/Config/Filters_TBC/RaidAuraWatch.lua
+++ b/ShestakUI/Config/Filters_TBC/RaidAuraWatch.lua
@@ -89,80 +89,234 @@ T.RaidDebuffs = {
 -- Molten Core (40)
 	-- Trash
 	-- Lucifron
+		[SpellName(19703)] = 3,		-- Lucifron's Curse
 	-- Magmadar
+		[SpellName(19408)] = 3,		-- Panic
 	-- Gehennas
+		[SpellName(20277)] = 4,		-- Fist of Ragnaros
+		[SpellName(19716)] = 3,		-- Gehennas' Curse
+		[SpellName(19717)] = 5,		-- Rain of Fire
 	-- Garr
 	-- Shazzrah
+		[SpellName(19713)] = 3,		-- Shazzrah's Curse
 	-- Baron Geddon
+		[SpellName(19659)] = 3,		-- Ignite Mana
+		[SpellName(19695)] = 3,		-- Inferno
+		[SpellName(20475)] = 3,		-- Living Bomb
 	-- Golemagg
+		[SpellName(13880)] = 3,		-- Magma Splash
 	-- Sulfuron
+		[SpellName(19780)] = 3,		-- Hand of Ragnaros
 	-- Majordomo
 	-- Ragnaros
 
--- Onyxia's Lair (40)
-	-- Onyxia
+	-- Onyxia's Lair (40)
+		-- Onyxia
+			[SpellName(18431)] = 3,		-- Bellowing Roar
 
 -- Blackwing Lair (40)
 	-- Trash
+		[SpellName(22274)] = 3,		-- Greater Polymorph
 	-- Razorgore
+		-- [SpellName(23023)] = 3,		-- Conflagration
+		[SpellName(24375)] = 3,		-- War Stomp
 	-- Vaelastrasz
+		[SpellName(18173)] = 4,		-- Burning Adrenaline
+		-- [SpellName(23461)] = 3,		-- Flame Breath
 	-- Broodlord
+		[SpellName(24573)] = 3,		-- Mortal Strike
 	-- Firemaw
+		[SpellName(23341)] = 3,		-- Flame Buffet
+		-- [SpellName(22682)] = 3,		-- Shadow Flame
 	-- Ebonroc
+		-- [SpellName(22682)] = 3,		-- Shadow Flame
+		[SpellName(23340)] = 3,		-- Shadow of Ebonroc
 	-- Flamegor
+		-- [SpellName(22682)] = 3,		-- Shadow Flame
 	-- Chromaggus
+		[SpellName(23154)] = 3,		-- Brood Affliction: Black
+		[SpellName(23153)] = 3,		-- Brood Affliction: Blue
+		[SpellName(23170)] = 5,		-- Brood Affliction: Bronze
+		[SpellName(23169)] = 3,		-- Brood Affliction: Green
+		[SpellName(23155)] = 3,		-- Brood Affliction: Red
+		[SpellName(23313)] = 4,		-- Corrosive Acid
+		-- [SpellName(23189)] = 4,		-- Frost Burn
+		-- [SpellName(23315)] = 4,		-- Ignite Flesh
+		-- [SpellName(23312)] = 4,		-- Time Lapse
 	-- Nefarian
+		[SpellName(22686)] = 3,		-- Bellowing Roar
+		[SpellName(23414)] = 4,		-- Paralyze
+		-- [SpellName(22682)] = 3,		-- Shadow Flame
+		[SpellName(23364)] = 4,		-- Tail Lash
+		[SpellName(22687)] = 5,		-- Veil of Shadow
+		[SpellName(23603)] = 3,		-- Wild Polymorph
 
 -- Zul'Gurub (20)
 	-- Trash
 	-- Jeklik
+		[SpellName(22884)] = 3,		-- Psychic Scream
+		[SpellName(23952)] = 3,		-- Shadow Word: Pain
+		[SpellName(23918)] = 3,		-- Sonic Burst
 	-- Venoxis
+		[SpellName(23860)] = 4,		-- Holy Fire
+		-- [SpellName(23865)] = 3,		-- Parasitic Serpent
+		[SpellName(23861)] = 3,		-- Poison Cloud
 	-- Mar'li
+		[SpellName(24111)] = 4,		-- Corrosive Poison
+		[SpellName(24300)] = 3,		-- Drain Life
 	-- Bloodlord
+		-- Mandokir
+			[SpellName(16856)] = 3,		-- Mortal Strike
+			[SpellName(24314)] = 3,		-- Threatening Gaze
+		-- Ohgan
+			[SpellName(24317)] = 3,		-- Sunder Armor
 	-- Gahz'ranka
 	-- Thekal
+		[SpellName(21060)] = 3,		-- Blind
+		[SpellName(12540)] = 3,		-- Gouge
 	-- Arlokk
+		[SpellName(24210)] = 4,		-- Mark of Arlokk
+		[SpellName(24212)] = 3,		-- Shadow Word: Pain
 	-- Jin'do
+		[SpellName(24261)] = 5,		-- Brain Wash
+		[SpellName(24306)] = 3,		-- Delusions of Jin'do
+		[SpellName(17172)] = 4,		-- Hex
 	-- Hakkar
+		[SpellName(17172)] = 4,		-- Aspect of Arlokk
+		[SpellName(24687)] = 3,		-- Aspect of Jeklik
+		[SpellName(24686)] = 4,		-- Aspect of Mar'li
+		[SpellName(24688)] = 3,		-- Aspect of Venoxis
+		[SpellName(24327)] = 5,		-- Cause Insanity
+		-- [SpellName(24328)] = 3,		-- Corrupted Blood
+	-- Edge of Madness
+		-- Gri'lek
+			[SpellName(6524)] = 3,		-- Ground Tremor
+		-- Hazza'rah
+			[SpellName(24664)] = 3,		-- Sleep
+		-- Renataki
+			[SpellName(24698)] = 3,		-- Gouge
+		-- Wushoolay
 
 -- Ruins of Ahn'Qiraj (20)
 	-- Trash
 	-- Kurinnaxx
+		[SpellName(25646)] = 3,		-- Mortal Wound
+		[SpellName(25656)] = 4,		-- Sand Trap
 	-- Rajaxx
+		[SpellName(25471)] = 4,		-- Attack Order
+		[SpellName(25471)] = 3,		-- Disarm
 	-- Moam
 	-- Buru
+		[SpellName(20512)] = 3,		-- Creeping Plague
+		[SpellName(96)] = 4,		-- Dismember
 	-- Ayamiss
+		[SpellName(25852)] = 3,		-- Lash
+		[SpellName(25725)] = 4,		-- Paralyze
+		-- [SpellName(25748)] = 3,		-- Poison Stinger
 	-- Ossirian
+		[SpellName(25195)] = 3,		-- Curse of Tongues
+		[SpellName(25189)] = 4,		-- Enveloping Winds
 
 -- Temple of Ahn'Qiraj (40)
 	-- Trash
 	-- Skeram
+		[SpellName(785)] = 3,		-- True Fulfillment
 	-- Royalty
+		[SpellName(26580)] = 3,		-- Fear
+		[SpellName(19128)] = 5,		-- Knockdown
+		[SpellName(3242)] = 5,		-- Ravage
+		[SpellName(25989)] = 3,		-- Toxin
+		[SpellName(25786)] = 4,		-- Toxic Vapors
+		[SpellName(25812)] = 3,		-- Toxic Volley
 	-- Sartura
+		[SpellName(25174)] = 3,		-- Sundering Cleave
 	-- Fankriss
+		[SpellName(720)] = 3,		-- Entangle
+		[SpellName(25646)] = 3,		-- Mortal Wound
 	-- Viscidus
+		[SpellName(25991)] = 3,		-- Poison Bolt Volley
 	-- Huhuran
+		-- [SpellName(26050)] = 3,		-- Acid Spit
+		[SpellName(26053)] = 3,		-- Noxious Poison
+		[SpellName(26180)] = 3,		-- Wyvern Sting
 	-- Twin Emperors
+		[SpellName(26607)] = 3,		-- Blizzard
+		[SpellName(26613)] = 3,		-- Unbalancing Strike
 	-- Ouro
+		[SpellName(26102)] = 3,		-- Sand Blast
+		[SpellName(26093)] = 3,		-- Quake
 	-- C'Thun
+		[SpellName(26476)] = 3,		-- Digestive Acid
 
 -- Naxxramas (40)
 	-- Trash
+		[SpellName(29325)] = 3,		-- Acid Volley
+		[SpellName(29849)] = 3,		-- Frost Nova
+		[SpellName(30094)] = 3,		-- Frost Nova
+		[SpellName(29407)] = 3,		-- Mind Flay
+		[SpellName(16856)] = 3,		-- Mortal Strike
+		[SpellName(28467)] = 3,		-- Mortal Wound
+		[SpellName(29848)] = 3,		-- Polymorph
+		[SpellName(27758)] = 3,		-- War Stomp
 	-- Anub'Rekhan
+		[SpellName(28786)] = 3,		-- Locust Swarm
 	-- Faerlina
+		[SpellName(28796)] = 3,		-- Poison Bolt Volley
+		[SpellName(28794)] = 5,		-- Rain of Fire
+		[SpellName(30225)] = 4,		-- Silence
 	-- Maexxna
+		[SpellName(28776)] = 3,		-- Necrotic Poison
+		[SpellName(28622)] = 3,		-- Web Wrap
+		-- [SpellName(29484)] = 3,		-- Web Spray
 	-- Patchwerk
 	-- Grobbulus
+		[SpellName(28169)] = 4,		-- Mutating Injection
+		[SpellName(28137)] = 3,		-- Slime Stream
 	-- Gluth
+		[SpellName(29306)] = 3,		-- Infected Wound
+		[SpellName(25646)] = 4,		-- Mortal Wound
+		[SpellName(29685)] = 3,		-- Terrifying Roar
 	-- Thaddius
+		-- [SpellName(28084)] = 3,		-- Negative Charge
+		-- [SpellName(28059)] = 3,		-- Positive Charge
 	-- Noth
+		[SpellName(29212)] = 3,		-- Cripple
+		[SpellName(29213)] = 4,		-- Curse of the Plaguebringer
+		[SpellName(29214)] = 5,		-- Wrath of the Plaguebringer
 	-- Heigan
+		[SpellName(29998)] = 4,		-- Decrepit Fever
 	-- Loatheb
+		[SpellName(29195)] = 3,		-- Corrupted Mind (Druid)
+		[SpellName(29197)] = 3,		-- Corrupted Mind (Paladin)
+		[SpellName(29184)] = 3,		-- Corrupted Mind (Priest)
+		[SpellName(29199)] = 3,		-- Corrupted Mind (Shaman)
+		[SpellName(29865)] = 3,		-- Deathbloom
+		[SpellName(29204)] = 4,		-- Inevitable Doom
 	-- Razuvious
+		[SpellName(26613)] = 3,		-- Unbalancing Strike
 	-- Gothik
+		[SpellName(27994)] = 4,		-- Drain Life
+		[SpellName(27990)] = 3,		-- Fear
+		-- [SpellName(28679)] = 3,		-- Harvest Soul
+		[SpellName(27825)] = 5,		-- Shadow Mark
 	-- Four Horsemen
+		-- Highlord Mograine
+			-- [SpellName(28834)] = 3,		-- Mark of Rivendare
+			[SpellName(28882)] = 3,		-- Righteous Fire
+		-- Lady Blaumeux
+			-- [SpellName(28833)] = 3,		-- Mark of Blaumeux
+		-- Sir Zeliek
+			-- [SpellName(28835)] = 3,		-- Mark of Zeliek
+		-- Thane Korth'azz
+			-- [SpellName(28832)] = 3,		-- Mark of Korth'azz
 	-- Sapphiron
+		[SpellName(28522)] = 4,		-- Icebolt
+		[SpellName(28542)] = 3,		-- Life Drain
 	-- Kel'Thuzad
+		[SpellName(28410)] = 5,		-- Chains of Kel'Thuzad
+		[SpellName(27819)] = 3,		-- Detonate Mana
+		[SpellName(27808)] = 4,		-- Frost Blast
+		[SpellName(31117)] = 3,		-- Unstable Affliction
 
 -----------------------------------------------------------------
 -- Classic Dungeons
diff --git a/ShestakUI/Config/Filters_Vanilla/Nameplates.lua b/ShestakUI/Config/Filters_Vanilla/Nameplates.lua
index 89ef7d59f..2271da083 100644
--- a/ShestakUI/Config/Filters_Vanilla/Nameplates.lua
+++ b/ShestakUI/Config/Filters_Vanilla/Nameplates.lua
@@ -491,4 +491,9 @@ T.ColorPlate = {
 	-- PvP
 	["5925"] = color,		-- Grounding Totem
 	-- Raid
+		-- Zul'Gurub
+		["15112"] = color,		-- Brain Wash Totem
+		-- Naxxramas
+		["16385"] = color,		-- Lightning Totem
+	-- Dungeons
 }
diff --git a/ShestakUI/Config/Filters_Vanilla/RaidAuraWatch.lua b/ShestakUI/Config/Filters_Vanilla/RaidAuraWatch.lua
index 33dac2def..b992391e0 100644
--- a/ShestakUI/Config/Filters_Vanilla/RaidAuraWatch.lua
+++ b/ShestakUI/Config/Filters_Vanilla/RaidAuraWatch.lua
@@ -77,7 +77,6 @@ T.RaidDebuffs = {
 -----------------------------------------------------------------
 -- Classic Raid
 -----------------------------------------------------------------
--- TODO: Populate this
 -- World Bosses
 	-- Azuregos
 	-- Lord Kazzak
@@ -89,80 +88,234 @@ T.RaidDebuffs = {
 -- Molten Core (40)
 	-- Trash
 	-- Lucifron
+		[SpellName(19703)] = 3,		-- Lucifron's Curse
 	-- Magmadar
+		[SpellName(19408)] = 3,		-- Panic
 	-- Gehennas
+		[SpellName(20277)] = 4,		-- Fist of Ragnaros
+		[SpellName(19716)] = 3,		-- Gehennas' Curse
+		[SpellName(19717)] = 5,		-- Rain of Fire
 	-- Garr
 	-- Shazzrah
+		[SpellName(19713)] = 3,		-- Shazzrah's Curse
 	-- Baron Geddon
+		[SpellName(19659)] = 3,		-- Ignite Mana
+		[SpellName(19695)] = 3,		-- Inferno
+		[SpellName(20475)] = 3,		-- Living Bomb
 	-- Golemagg
+		[SpellName(13880)] = 3,		-- Magma Splash
 	-- Sulfuron
+		[SpellName(19780)] = 3,		-- Hand of Ragnaros
 	-- Majordomo
 	-- Ragnaros
 
 -- Onyxia's Lair (40)
 	-- Onyxia
+		[SpellName(18431)] = 3,		-- Bellowing Roar
 
 -- Blackwing Lair (40)
 	-- Trash
+		[SpellName(22274)] = 3,		-- Greater Polymorph
 	-- Razorgore
+	-- [SpellName(23023)] = 3,		-- Conflagration
+	[SpellName(24375)] = 3,		-- War Stomp
 	-- Vaelastrasz
+		[SpellName(18173)] = 4,		-- Burning Adrenaline
+		-- [SpellName(23461)] = 3,		-- Flame Breath
 	-- Broodlord
+		[SpellName(24573)] = 3,		-- Mortal Strike
 	-- Firemaw
+		[SpellName(23341)] = 3,		-- Flame Buffet
+		-- [SpellName(22682)] = 3,		-- Shadow Flame
 	-- Ebonroc
+		-- [SpellName(22682)] = 3,		-- Shadow Flame
+		[SpellName(23340)] = 3,		-- Shadow of Ebonroc
 	-- Flamegor
+		-- [SpellName(22682)] = 3,		-- Shadow Flame
 	-- Chromaggus
+		[SpellName(23154)] = 3,		-- Brood Affliction: Black
+		[SpellName(23153)] = 3,		-- Brood Affliction: Blue
+		[SpellName(23170)] = 5,		-- Brood Affliction: Bronze
+		[SpellName(23169)] = 3,		-- Brood Affliction: Green
+		[SpellName(23155)] = 3,		-- Brood Affliction: Red
+		[SpellName(23313)] = 4,		-- Corrosive Acid
+		-- [SpellName(23189)] = 4,		-- Frost Burn
+		-- [SpellName(23315)] = 4,		-- Ignite Flesh
+		-- [SpellName(23312)] = 4,		-- Time Lapse
 	-- Nefarian
+		[SpellName(22686)] = 3,		-- Bellowing Roar
+		[SpellName(23414)] = 4,		-- Paralyze
+		-- [SpellName(22682)] = 3,		-- Shadow Flame
+		[SpellName(23364)] = 4,		-- Tail Lash
+		[SpellName(22687)] = 5,		-- Veil of Shadow
+		[SpellName(23603)] = 3,		-- Wild Polymorph
 
 -- Zul'Gurub (20)
 	-- Trash
 	-- Jeklik
+		[SpellName(22884)] = 3,		-- Psychic Scream
+		[SpellName(23952)] = 3,		-- Shadow Word: Pain
+		[SpellName(23918)] = 3,		-- Sonic Burst
 	-- Venoxis
+		[SpellName(23860)] = 4,		-- Holy Fire
+		-- [SpellName(23865)] = 3,		-- Parasitic Serpent
+		[SpellName(23861)] = 3,		-- Poison Cloud
 	-- Mar'li
+		[SpellName(24111)] = 4,		-- Corrosive Poison
+		[SpellName(24300)] = 3,		-- Drain Life
 	-- Bloodlord
+		-- Mandokir
+			[SpellName(16856)] = 3,		-- Mortal Strike
+			[SpellName(24314)] = 3,		-- Threatening Gaze
+		-- Ohgan
+			[SpellName(24317)] = 3,		-- Sunder Armor
 	-- Gahz'ranka
 	-- Thekal
+		[SpellName(21060)] = 3,		-- Blind
+		[SpellName(12540)] = 3,		-- Gouge
 	-- Arlokk
+		[SpellName(24210)] = 4,		-- Mark of Arlokk
+		[SpellName(24212)] = 3,		-- Shadow Word: Pain
 	-- Jin'do
+		[SpellName(24261)] = 5,		-- Brain Wash
+		[SpellName(24306)] = 3,		-- Delusions of Jin'do
+		[SpellName(17172)] = 4,		-- Hex
 	-- Hakkar
+		[SpellName(17172)] = 4,		-- Aspect of Arlokk
+		[SpellName(24687)] = 3,		-- Aspect of Jeklik
+		[SpellName(24686)] = 4,		-- Aspect of Mar'li
+		[SpellName(24688)] = 3,		-- Aspect of Venoxis
+		[SpellName(24327)] = 5,		-- Cause Insanity
+		-- [SpellName(24328)] = 3,		-- Corrupted Blood
+	-- Edge of Madness
+		-- Gri'lek
+			[SpellName(6524)] = 3,		-- Ground Tremor
+		-- Hazza'rah
+			[SpellName(24664)] = 3,		-- Sleep
+		-- Renataki
+			[SpellName(24698)] = 3,		-- Gouge
+		-- Wushoolay
 
 -- Ruins of Ahn'Qiraj (20)
 	-- Trash
 	-- Kurinnaxx
+		[SpellName(25646)] = 3,		-- Mortal Wound
+		[SpellName(25656)] = 4,		-- Sand Trap
 	-- Rajaxx
+		[SpellName(25471)] = 4,		-- Attack Order
+		[SpellName(25471)] = 3,		-- Disarm
 	-- Moam
 	-- Buru
+		[SpellName(20512)] = 3,		-- Creeping Plague
+		[SpellName(96)] = 4,		-- Dismember
 	-- Ayamiss
+		[SpellName(25852)] = 3,		-- Lash
+		[SpellName(25725)] = 4,		-- Paralyze
+		-- [SpellName(25748)] = 3,		-- Poison Stinger
 	-- Ossirian
+		[SpellName(25195)] = 3,		-- Curse of Tongues
+		[SpellName(25189)] = 4,		-- Enveloping Winds
 
 -- Temple of Ahn'Qiraj (40)
 	-- Trash
 	-- Skeram
+		[SpellName(785)] = 3,		-- True Fulfillment
 	-- Royalty
+		[SpellName(26580)] = 3,		-- Fear
+		[SpellName(19128)] = 5,		-- Knockdown
+		[SpellName(3242)] = 5,		-- Ravage
+		[SpellName(25989)] = 3,		-- Toxin
+		[SpellName(25786)] = 4,		-- Toxic Vapors
+		[SpellName(25812)] = 3,		-- Toxic Volley
 	-- Sartura
+		[SpellName(25174)] = 3,		-- Sundering Cleave
 	-- Fankriss
+		[SpellName(720)] = 3,		-- Entangle
+		[SpellName(25646)] = 3,		-- Mortal Wound
 	-- Viscidus
+		[SpellName(25991)] = 3,		-- Poison Bolt Volley
 	-- Huhuran
+		-- [SpellName(26050)] = 3,		-- Acid Spit
+		[SpellName(26053)] = 3,		-- Noxious Poison
+		[SpellName(26180)] = 3,		-- Wyvern Sting
 	-- Twin Emperors
+		[SpellName(26607)] = 3,		-- Blizzard
+		[SpellName(26613)] = 3,		-- Unbalancing Strike
 	-- Ouro
+		[SpellName(26102)] = 3,		-- Sand Blast
+		[SpellName(26093)] = 3,		-- Quake
 	-- C'Thun
+		[SpellName(26476)] = 3,		-- Digestive Acid
 
 -- Naxxramas (40)
 	-- Trash
+		[SpellName(29325)] = 3,		-- Acid Volley
+		[SpellName(29849)] = 3,		-- Frost Nova
+		[SpellName(30094)] = 3,		-- Frost Nova
+		[SpellName(29407)] = 3,		-- Mind Flay
+		[SpellName(16856)] = 3,		-- Mortal Strike
+		[SpellName(28467)] = 3,		-- Mortal Wound
+		[SpellName(29848)] = 3,		-- Polymorph
+		[SpellName(27758)] = 3,		-- War Stomp
 	-- Anub'Rekhan
+		[SpellName(28786)] = 3,		-- Locust Swarm
 	-- Faerlina
+		[SpellName(28796)] = 3,		-- Poison Bolt Volley
+		[SpellName(28794)] = 5,		-- Rain of Fire
+		[SpellName(30225)] = 4,		-- Silence
 	-- Maexxna
+		[SpellName(28776)] = 3,		-- Necrotic Poison
+		[SpellName(28622)] = 3,		-- Web Wrap
+	-- [SpellName(29484)] = 3,		-- Web Spray
 	-- Patchwerk
 	-- Grobbulus
+		[SpellName(28169)] = 4,		-- Mutating Injection
+		[SpellName(28137)] = 3,		-- Slime Stream
 	-- Gluth
+		[SpellName(29306)] = 3,		-- Infected Wound
+		[SpellName(25646)] = 4,		-- Mortal Wound
+		[SpellName(29685)] = 3,		-- Terrifying Roar
 	-- Thaddius
+		-- [SpellName(28084)] = 3,		-- Negative Charge
+		-- [SpellName(28059)] = 3,		-- Positive Charge
 	-- Noth
+		[SpellName(29212)] = 3,		-- Cripple
+		[SpellName(29213)] = 4,		-- Curse of the Plaguebringer
+		[SpellName(29214)] = 5,		-- Wrath of the Plaguebringer
 	-- Heigan
+		[SpellName(29998)] = 4,		-- Decrepit Fever
 	-- Loatheb
+		[SpellName(29195)] = 3,		-- Corrupted Mind (Druid)
+		[SpellName(29197)] = 3,		-- Corrupted Mind (Paladin)
+		[SpellName(29184)] = 3,		-- Corrupted Mind (Priest)
+		[SpellName(29199)] = 3,		-- Corrupted Mind (Shaman)
+		[SpellName(29865)] = 3,		-- Deathbloom
+		[SpellName(29204)] = 4,		-- Inevitable Doom
 	-- Razuvious
+		[SpellName(26613)] = 3,		-- Unbalancing Strike
 	-- Gothik
+		[SpellName(27994)] = 4,		-- Drain Life
+		[SpellName(27990)] = 3,		-- Fear
+	-- [SpellName(28679)] = 3,		-- Harvest Soul
+		[SpellName(27825)] = 5,		-- Shadow Mark
 	-- Four Horsemen
+		-- Highlord Mograine
+			-- [SpellName(28834)] = 3,		-- Mark of Rivendare
+			[SpellName(28882)] = 3,		-- Righteous Fire
+		-- Lady Blaumeux
+			-- [SpellName(28833)] = 3,		-- Mark of Blaumeux
+		-- Sir Zeliek
+			-- [SpellName(28835)] = 3,		-- Mark of Zeliek
+		-- Thane Korth'azz
+			-- [SpellName(28832)] = 3,		-- Mark of Korth'azz
 	-- Sapphiron
+		[SpellName(28522)] = 4,		-- Icebolt
+		[SpellName(28542)] = 3,		-- Life Drain
 	-- Kel'Thuzad
+		[SpellName(28410)] = 5,		-- Chains of Kel'Thuzad
+		[SpellName(27819)] = 3,		-- Detonate Mana
+		[SpellName(27808)] = 4,		-- Frost Blast
+		[SpellName(31117)] = 3,		-- Unstable Affliction
 
 -----------------------------------------------------------------
 -- Classic Dungeons
diff --git a/ShestakUI/Config/Filters_Wrath/Nameplates.lua b/ShestakUI/Config/Filters_Wrath/Nameplates.lua
index 349aac2ae..96ebd090b 100644
--- a/ShestakUI/Config/Filters_Wrath/Nameplates.lua
+++ b/ShestakUI/Config/Filters_Wrath/Nameplates.lua
@@ -690,6 +690,15 @@ T.ColorPlate = {
 		["25370"] = color,		-- Sunblade Dusk Priest
 		-- Naxxramas
 		["16385"] = color,		-- Lightning Totem
+		-- Ulduar
+		["33836"] = color,		-- Bomb Bot
+		-- TOC / TOGC
+		["5925"] = color,		-- Grounding Totem
+		["34686"] = color,		-- Healing Stream Totem
+		["34687"] = color,		-- Searing Totem
+		["31129"] = color,		-- Strength of Earth Totem VIII
+		["5913"] = color,		-- Tremor Totem
+		["6112"] = color,		-- Windfury Totem
 	-- Dungeons
 		-- Hellfire Ramparts
 		["17478"] = color,		-- Bleeding Hollow Scryer
@@ -738,13 +747,4 @@ T.ColorPlate = {
 		["19509"] = color,		-- Sunseeker Harvester
 		["19633"] = color,		-- Bloodwarder Mender
 		-- Magisters' Terrace
-		-- Ulduar
-		["33836"] = color,		-- Bomb Bot
-		-- TOC / TOGC
-		["5925"] = color,		-- Grounding Totem
-		["34686"] = color,		-- Healing Stream Totem
-		["34687"] = color,		-- Searing Totem
-		["31129"] = color,		-- Strength of Earth Totem VIII
-		["5913"] = color,		-- Tremor Totem
-		["6112"] = color,		-- Windfury Totem
 }
diff --git a/ShestakUI/Config/Filters_Wrath/RaidAuraWatch.lua b/ShestakUI/Config/Filters_Wrath/RaidAuraWatch.lua
index 558cd69fa..ab0a0a422 100644
--- a/ShestakUI/Config/Filters_Wrath/RaidAuraWatch.lua
+++ b/ShestakUI/Config/Filters_Wrath/RaidAuraWatch.lua
@@ -104,80 +104,164 @@ T.RaidDebuffs = {
 -- Molten Core (40)
 	-- Trash
 	-- Lucifron
+		[SpellName(19703)] = 3,		-- Lucifron's Curse
 	-- Magmadar
+		[SpellName(19408)] = 3,		-- Panic
 	-- Gehennas
+		[SpellName(20277)] = 4,		-- Fist of Ragnaros
+		[SpellName(19716)] = 3,		-- Gehennas' Curse
+		[SpellName(19717)] = 5,		-- Rain of Fire
 	-- Garr
 	-- Shazzrah
+		[SpellName(19713)] = 3,		-- Shazzrah's Curse
 	-- Baron Geddon
+		[SpellName(19659)] = 3,		-- Ignite Mana
+		[SpellName(19695)] = 3,		-- Inferno
+		[SpellName(20475)] = 3,		-- Living Bomb
 	-- Golemagg
+		[SpellName(13880)] = 3,		-- Magma Splash
 	-- Sulfuron
+		[SpellName(19780)] = 3,		-- Hand of Ragnaros
 	-- Majordomo
 	-- Ragnaros
 
--- Onyxia's Lair (40)
-	-- Onyxia
+	-- Onyxia's Lair (40)
+		-- Onyxia
+			[SpellName(18431)] = 3,		-- Bellowing Roar
 
 -- Blackwing Lair (40)
 	-- Trash
+		[SpellName(22274)] = 3,		-- Greater Polymorph
 	-- Razorgore
+		-- [SpellName(23023)] = 3,		-- Conflagration
+		[SpellName(24375)] = 3,		-- War Stomp
 	-- Vaelastrasz
+		[SpellName(18173)] = 4,		-- Burning Adrenaline
+		-- [SpellName(23461)] = 3,		-- Flame Breath
 	-- Broodlord
+		[SpellName(24573)] = 3,		-- Mortal Strike
 	-- Firemaw
+		[SpellName(23341)] = 3,		-- Flame Buffet
+		-- [SpellName(22682)] = 3,		-- Shadow Flame
 	-- Ebonroc
+		-- [SpellName(22682)] = 3,		-- Shadow Flame
+		[SpellName(23340)] = 3,		-- Shadow of Ebonroc
 	-- Flamegor
+		-- [SpellName(22682)] = 3,		-- Shadow Flame
 	-- Chromaggus
+		[SpellName(23154)] = 3,		-- Brood Affliction: Black
+		[SpellName(23153)] = 3,		-- Brood Affliction: Blue
+		[SpellName(23170)] = 5,		-- Brood Affliction: Bronze
+		[SpellName(23169)] = 3,		-- Brood Affliction: Green
+		[SpellName(23155)] = 3,		-- Brood Affliction: Red
+		[SpellName(23313)] = 4,		-- Corrosive Acid
+		-- [SpellName(23189)] = 4,		-- Frost Burn
+		-- [SpellName(23315)] = 4,		-- Ignite Flesh
+		-- [SpellName(23312)] = 4,		-- Time Lapse
 	-- Nefarian
+		[SpellName(22686)] = 3,		-- Bellowing Roar
+		[SpellName(23414)] = 4,		-- Paralyze
+		-- [SpellName(22682)] = 3,		-- Shadow Flame
+		[SpellName(23364)] = 4,		-- Tail Lash
+		[SpellName(22687)] = 5,		-- Veil of Shadow
+		[SpellName(23603)] = 3,		-- Wild Polymorph
 
 -- Zul'Gurub (20)
 	-- Trash
 	-- Jeklik
+		[SpellName(22884)] = 3,		-- Psychic Scream
+		[SpellName(23952)] = 3,		-- Shadow Word: Pain
+		[SpellName(23918)] = 3,		-- Sonic Burst
 	-- Venoxis
+		[SpellName(23860)] = 4,		-- Holy Fire
+		-- [SpellName(23865)] = 3,		-- Parasitic Serpent
+		[SpellName(23861)] = 3,		-- Poison Cloud
 	-- Mar'li
+		[SpellName(24111)] = 4,		-- Corrosive Poison
+		[SpellName(24300)] = 3,		-- Drain Life
 	-- Bloodlord
+		-- Mandokir
+			[SpellName(16856)] = 3,		-- Mortal Strike
+			[SpellName(24314)] = 3,		-- Threatening Gaze
+		-- Ohgan
+			[SpellName(24317)] = 3,		-- Sunder Armor
 	-- Gahz'ranka
 	-- Thekal
+		[SpellName(21060)] = 3,		-- Blind
+		[SpellName(12540)] = 3,		-- Gouge
 	-- Arlokk
+		[SpellName(24210)] = 4,		-- Mark of Arlokk
+		[SpellName(24212)] = 3,		-- Shadow Word: Pain
 	-- Jin'do
+		[SpellName(24261)] = 5,		-- Brain Wash
+		[SpellName(24306)] = 3,		-- Delusions of Jin'do
+		[SpellName(17172)] = 4,		-- Hex
 	-- Hakkar
+		[SpellName(17172)] = 4,		-- Aspect of Arlokk
+		[SpellName(24687)] = 3,		-- Aspect of Jeklik
+		[SpellName(24686)] = 4,		-- Aspect of Mar'li
+		[SpellName(24688)] = 3,		-- Aspect of Venoxis
+		[SpellName(24327)] = 5,		-- Cause Insanity
+		-- [SpellName(24328)] = 3,		-- Corrupted Blood
+	-- Edge of Madness
+		-- Gri'lek
+			[SpellName(6524)] = 3,		-- Ground Tremor
+		-- Hazza'rah
+			[SpellName(24664)] = 3,		-- Sleep
+		-- Renataki
+			[SpellName(24698)] = 3,		-- Gouge
+		-- Wushoolay
 
 -- Ruins of Ahn'Qiraj (20)
 	-- Trash
 	-- Kurinnaxx
+		[SpellName(25646)] = 3,		-- Mortal Wound
+		[SpellName(25656)] = 4,		-- Sand Trap
 	-- Rajaxx
+		[SpellName(25471)] = 4,		-- Attack Order
+		[SpellName(25471)] = 3,		-- Disarm
 	-- Moam
 	-- Buru
+		[SpellName(20512)] = 3,		-- Creeping Plague
+		[SpellName(96)] = 4,		-- Dismember
 	-- Ayamiss
+		[SpellName(25852)] = 3,		-- Lash
+		[SpellName(25725)] = 4,		-- Paralyze
+		-- [SpellName(25748)] = 3,		-- Poison Stinger
 	-- Ossirian
+		[SpellName(25195)] = 3,		-- Curse of Tongues
+		[SpellName(25189)] = 4,		-- Enveloping Winds
 
 -- Temple of Ahn'Qiraj (40)
 	-- Trash
 	-- Skeram
+		[SpellName(785)] = 3,		-- True Fulfillment
 	-- Royalty
+		[SpellName(26580)] = 3,		-- Fear
+		[SpellName(19128)] = 5,		-- Knockdown
+		[SpellName(3242)] = 5,		-- Ravage
+		[SpellName(25989)] = 3,		-- Toxin
+		[SpellName(25786)] = 4,		-- Toxic Vapors
+		[SpellName(25812)] = 3,		-- Toxic Volley
 	-- Sartura
+		[SpellName(25174)] = 3,		-- Sundering Cleave
 	-- Fankriss
+		[SpellName(720)] = 3,		-- Entangle
+		[SpellName(25646)] = 3,		-- Mortal Wound
 	-- Viscidus
+		[SpellName(25991)] = 3,		-- Poison Bolt Volley
 	-- Huhuran
+		-- [SpellName(26050)] = 3,		-- Acid Spit
+		[SpellName(26053)] = 3,		-- Noxious Poison
+		[SpellName(26180)] = 3,		-- Wyvern Sting
 	-- Twin Emperors
+		[SpellName(26607)] = 3,		-- Blizzard
+		[SpellName(26613)] = 3,		-- Unbalancing Strike
 	-- Ouro
+		[SpellName(26102)] = 3,		-- Sand Blast
+		[SpellName(26093)] = 3,		-- Quake
 	-- C'Thun
-
--- Naxxramas (40)
-	-- Trash
-	-- Anub'Rekhan
-	-- Faerlina
-	-- Maexxna
-	-- Patchwerk
-	-- Grobbulus
-	-- Gluth
-	-- Thaddius
-	-- Noth
-	-- Heigan
-	-- Loatheb
-	-- Razuvious
-	-- Gothik
-	-- Four Horsemen
-	-- Sapphiron
-	-- Kel'Thuzad
+		[SpellName(26476)] = 3,		-- Digestive Acid
 
 -----------------------------------------------------------------
 -- Classic Dungeons
@@ -702,7 +786,7 @@ T.RaidDebuffs = {
 		[SpellName(54022)] = 3,		-- Locust Swarm
 	-- Faerlina
 		[SpellName(28796)] = 3,		-- Poison Bolt Volley
-		[SpellName(39024)] = 5,		-- Rain of Fire
+		[SpellName(28794)] = 5,		-- Rain of Fire
 		[SpellName(54093)] = 4,		-- Silence
 	-- Maexxna
 		[SpellName(28776)] = 3,		-- Necrotic Poison
@@ -752,7 +836,7 @@ T.RaidDebuffs = {
 		[SpellName(28522)] = 4,		-- Icebolt
 		[SpellName(28542)] = 3,		-- Life Drain
 	-- Kel'Thuzad
-		[SpellName(28410)] = 3,		-- Chains of Kel'Thuzad
+		[SpellName(28410)] = 5,		-- Chains of Kel'Thuzad
 		[SpellName(27819)] = 3,		-- Detonate Mana
 		[SpellName(27808)] = 4,		-- Frost Blast