From a94bbb64e91a8fc3f15ff0779840c112eb4eec9d Mon Sep 17 00:00:00 2001
From: Hendo72 <39675478+Hendo72@users.noreply.github.com>
Date: Fri, 26 Apr 2024 00:08:17 -0400
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 462703a923b4c96148503455e4f1805611d863b2
Author: Paweł Jastrzębski <pawelj@iosphe.re>
Date:   Wed Apr 24 23:14:01 2024 +0200

    Updated Crest DataText

commit fe2970a36d1fe3c4edc5ba13799d320fc1dc9cf0
Author: Simpy <kodi03466@hotmail.com>
Date:   Mon Apr 22 16:24:39 2024 -0400

    can't use this on classic anymore

commit 0da6a293ecaa10ad7395b3be1775555706feeb26
Author: Eltreum <30246110+eltreum0@users.noreply.github.com>
Date:   Sun Apr 21 15:17:41 2024 -0300

    update ptBR locale (#1199)

commit df355e019c4651a298e52bc39a25884ee167e50d
Author: namreeb <github@namreeb.org>
Date:   Sun Apr 21 08:17:23 2024 -1000

    Added workaround for direct heals not reported by client when HealComm is present (#1198)

commit 57835e6b8fc98caaac300aff8522dd0c236a57f2
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 20 18:19:15 2024 -0400

    https://github.com/oUF-wow/oUF/pull/677

commit 6a9e51488491b367fc33e1f759c3de2b87befcee
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 20 18:14:34 2024 -0400

    https://github.com/oUF-wow/oUF/pull/675

commit c202dbef49bf5ed4aa062cd34596191e0acf4310
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 20 18:13:29 2024 -0400

    https://github.com/oUF-wow/oUF/pull/674

commit f309445caa995d8bd8acc4d01edb110d77e214fb
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 20 17:54:49 2024 -0400

    fix interrupt msg for a8326178e9

commit 8bc196ff839ca48e7fa705c8fbf470e18098faaf
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 20 17:20:49 2024 -0400

    dont need to translate

commit a8326178e9fa4801888dcf784bbed75f805f0a75
Author: anon1231823 <67269448+anon1231823@users.noreply.github.com>
Date:   Sat Apr 20 17:19:57 2024 -0400

    Update esMX.lua (#1197)

commit 775f502599c4c6becf6454afee9f5e2f470a5cc3
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 20 16:40:01 2024 -0400

    prefer C functions first

commit 1b4bab71097d84866ac96ce3facb79e485da74d9
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 20 16:33:27 2024 -0400

    deprecated stuff

commit 205a5d2a1d6ed402e28cdfdb7cc1d437baa34957
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 20 15:53:55 2024 -0400

    move this

commit 8ea6f2ff185055a09f28174abd9784927e0c25ba
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 20 15:49:16 2024 -0400

    testing func

commit e6e09d422df07f12cca78affffeab9db21504a0d
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 20 15:42:07 2024 -0400

    update blizz addon list

commit e6d9c2377082fcfe1bb42f888e60638bf72c6169
Author: Simpy <kodi03466@hotmail.com>
Date:   Tue Apr 16 21:12:08 2024 -0400

    add sunken temple difficulty id

commit d798dad5a9f58a208d9fef03912f698e891a8d98
Author: Simpy <kodi03466@hotmail.com>
Date:   Tue Apr 16 20:54:01 2024 -0400

    handle this another way

commit 857670cb4b711fa82ef952c8ac49f9f3d284d4a2
Author: Luckyone <Luckyone.Development@pm.me>
Date:   Sun Apr 14 16:01:22 2024 +0200

    RaidBuffs: Sunken Temple 20man

commit c6f5ee28d6fe72dfc7590a5733a2c24091d13c8a
Author: Luckyone <Luckyone.Development@pm.me>
Date:   Sun Apr 14 16:01:13 2024 +0200

    RaidDebuffs: Sunken Temple 20man

commit 5d0ddcb97ce1595f816a494ad4456deb213815a5
Author: Darth Predator <darthpred@gmail.com>
Date:   Sun Apr 14 02:55:18 2024 +0300

    Locales and stuff

commit 4f115b0a03566325484e4fa074c7c071a7cb2053
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 13 18:34:31 2024 -0400

    meow

commit 227aedaf5397d09058fdd1c226903429d94d4456
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 13 18:09:45 2024 -0400

    think this is only broke on retail, others might double click otherwise

commit ea73e68322bbeadaebb01ac54277459eb0c6acf0
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 13 17:59:02 2024 -0400

    more accurate function name

commit b37261cb4d6435dc06dbac0d8240db0bc2ce4f31
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 13 17:55:38 2024 -0400

    huh

commit 409d6dd555cd1a08f43f2259aa91a73568fb0277
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 13 17:54:05 2024 -0400

    still false

commit c20d4df698e38fb68951ec367beaf092c17bae8c
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 13 17:47:02 2024 -0400

    update raid utility to work regardless of having leader/assist

commit f38ee28500c2be86f1ecce1d8524bdde8ef29952
Author: Repooc <tjcooper1982@gmail.com>
Date:   Sat Apr 13 16:06:50 2024 -0400

    update repooc's text

commit 95152509399e686a2a75a1e4220e3451b4185412
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Apr 13 14:12:19 2024 -0400

    pull char skin update from cata branch

commit 19d5eeac5aa5d090ca6bba0a3da60bee0d52d399
Author: Simpy <kodi03466@hotmail.com>
Date:   Tue Apr 9 20:35:53 2024 -0400

    locales

commit e13ba2e7992f793f502a1171faebebd05b16e1e7
Author: Simpy <kodi03466@hotmail.com>
Date:   Tue Apr 9 20:20:55 2024 -0400

    option to show high threat but not as primary target

commit 769260d7ce8029437ee42d09132e4f915635728d
Author: Simpy <kodi03466@hotmail.com>
Date:   Tue Apr 9 19:40:45 2024 -0400

    option to handle #1187

commit 0a5c87f07d47baf4991e3047bd67e08fad657461
Author: Simpy <kodi03466@hotmail.com>
Date:   Tue Apr 9 19:36:27 2024 -0400

    new tag [threat:lead]

commit c0bb3f08f0e20b157acc3336806cf4404aee3704
Author: Simpy <kodi03466@hotmail.com>
Date:   Tue Apr 9 15:00:29 2024 -0400

    locales for the new option

commit 9bb41fec2781926bc58e7fdb50692285f4f5e03a
Author: Simpy <kodi03466@hotmail.com>
Date:   Tue Apr 9 14:53:47 2024 -0400

    retail changes from cata branch

commit 927ab2b2367d3fd867d8d9ba3fc27399189ac614
Author: Simpy <kodi03466@hotmail.com>
Date:   Tue Apr 9 14:51:47 2024 -0400

    aura indicator override for pets (can uncheck Pet Specific to use profile or global)

commit e68e20db736c6fb6c864d60c49117bc6cbe1d334
Author: Simpy <kodi03466@hotmail.com>
Date:   Sun Apr 7 19:15:03 2024 -0400

    bump minor version

commit b5c4ede532c8451c2172556ed505d0483b3a8f28
Author: Simpy <kodi03466@hotmail.com>
Date:   Sun Apr 7 19:14:17 2024 -0400

    clean up some DT format

commit 8653c5582abfb0771aa904340611f24a0e72bced
Author: Simpy <kodi03466@hotmail.com>
Date:   Sun Apr 7 18:36:02 2024 -0400

    note for c6c5db50d3

commit c6c5db50d3ca6fd3d551c3093993a1e8818b2fcf
Author: Simpy <kodi03466@hotmail.com>
Date:   Sun Apr 7 18:34:06 2024 -0400

    fix Range Check by using names again unless it's special

commit 87ba1519117a81c9d66490808385b61bf9abacd9
Author: Simpy <kodi03466@hotmail.com>
Date:   Sun Apr 7 16:08:10 2024 -0400

    Revert "fix range check not working when you load in with spell ranks off (this uses the same method we use in  LibDispel)"

    This reverts commit 6a9205d96ea0f8ae54ed74c25ef5461777658e91.

commit 8522f97761ca137dd92a4fa29e8481c42f936918
Author: Simpy <kodi03466@hotmail.com>
Date:   Sun Apr 7 15:04:00 2024 -0400

    it's SoD specific, whoops

commit 4d3d11ee05b6f9d0cb639b43c12013053ca7aeb5
Author: Simpy <kodi03466@hotmail.com>
Date:   Sun Apr 7 14:48:53 2024 -0400

    update dualspec lua

commit d4a36bd01db4ee10d39af02ae34f9ea9b83b27d9
Author: Simpy <kodi03466@hotmail.com>
Date:   Sun Apr 7 14:46:06 2024 -0400

    move DualSpec DT to Core since it's no longer for Wrath only

commit 6a9205d96ea0f8ae54ed74c25ef5461777658e91
Author: Simpy <kodi03466@hotmail.com>
Date:   Sun Apr 7 14:42:44 2024 -0400

    fix range check not working when you load in with spell ranks off (this uses the same method we use in  LibDispel)

commit 467f0323de9c50b020b0b2b77af48701fbe71a58
Merge: 5248e24d9 1ea216589
Author: Repooc <tjcooper1982@gmail.com>
Date:   Thu Apr 4 12:47:54 2024 -0400

    Merge branch 'main' of https://github.com/tukui-org/ElvUI

commit 5248e24d91da35e94ebe27f31f0c3ca58e6909d4
Author: Repooc <tjcooper1982@gmail.com>
Date:   Thu Apr 4 12:47:42 2024 -0400

    min width set to 15 instead of 40 now per request from Jiberish

commit 1ea2165899ace1047aa094f29d4b696ee35992f9
Author: Luckyone <Luckyone.Development@pm.me>
Date:   Thu Apr 4 14:49:21 2024 +0200

    Load DualSpec DT for SoD

commit ffff65f65920722f036c768a584088ffb3ffa6d0
Author: Simpy <kodi03466@hotmail.com>
Date:   Wed Apr 3 15:51:54 2024 -0400

    CHAT_MSG_GUILD_DEATHS was removed

commit a9d61987564473680c6f6dac4a564c49841a6335
Author: Simpy <kodi03466@hotmail.com>
Date:   Wed Apr 3 14:53:33 2024 -0400

    priest paging on classic

commit 7e93f36e91c7b07c7893faa622b8b70592fb76c4
Author: Luckyone <Luckyone.Development@pm.me>
Date:   Wed Apr 3 12:53:06 2024 +0200

    Fix lib not loading

commit 588e2467a0243f188bed0a3756f3acd0c4598907
Author: Luckyone <Luckyone.Development@pm.me>
Date:   Wed Apr 3 12:33:59 2024 +0200

    Lib is updated, testing now

commit df463ad9fbdb18ea1d273ae5488d1a991ae5d816
Author: Simpy <kodi03466@hotmail.com>
Date:   Tue Apr 2 22:05:43 2024 -0400

    hUh

commit 24022eeb3e3622f06ffd2051b219bd9221e2ae3f
Author: Simpy <kodi03466@hotmail.com>
Date:   Tue Apr 2 21:55:08 2024 -0400

    13.61

commit 179e613206456a4892bb36dd7494dc168a3685e9
Author: Simpy <kodi03466@hotmail.com>
Date:   Tue Apr 2 21:28:17 2024 -0400

    cant do this with the lib outdated

commit 0e4878547694b0c29ff472879ba854824480f3f0
Author: Luckyone <Luckyone.Development@pm.me>
Date:   Tue Apr 2 21:48:49 2024 +0200

    Added Mind Sear ChannelTicks

commit 83c4b6a0193df648130e995edb5bad4fad980a0a
Author: Luckyone <Luckyone.Development@pm.me>
Date:   Tue Apr 2 21:48:31 2024 +0200

    Updated STV Event Auras

commit f2ed2ca6f6b4ac8218400b5016f51f5576f2737a
Author: Simpy <kodi03466@hotmail.com>
Date:   Tue Apr 2 11:44:10 2024 -0400

    dual spec for SOD

commit f29d02c7ab8cd7d3c82c61079963206f8da3a2f8
Author: Luckyone <Luckyone.Development@pm.me>
Date:   Tue Apr 2 14:47:14 2024 +0200

    Updated Seasonal Toons

commit c5dbf4c9d2ad37d11e776547c481305955c9f883
Author: Merathilis <neo0608@gmail.com>
Date:   Tue Apr 2 12:23:11 2024 +0200

    Updated some of my toon

commit 17dd243f82e549d92117e61819c17e95603d2f74
Author: Simpy <kodi03466@hotmail.com>
Date:   Mon Apr 1 16:01:16 2024 -0400

    fix afk/dnd on chat

commit fc756918a7f217697997816e7eef1832a460af09
Author: Luckyone <Luckyone.Development@pm.me>
Date:   Mon Apr 1 16:09:51 2024 +0200

    Updated Skins\PerksProgram

commit b39f4af7f23a8267e75670f218d5870f916f39b3
Author: Merathilis <neo0608@gmail.com>
Date:   Mon Apr 1 12:34:10 2024 +0200

    Updated the Monthly Activities on the EncounterJournal Skin

commit 0f9d6b52fa75f85aefbe4171183deb9aa3771669
Author: Paweł Jastrzębski <pawelj@iosphe.re>
Date:   Sun Mar 31 10:21:34 2024 +0200

    Packager cleanup

commit 4d87ca000067d91ae3a10421baa060bee714456d
Author: Simpy <kodi03466@hotmail.com>
Date:   Sun Mar 31 02:40:30 2024 -0400

    revert this part

commit 725f98e1567d54f5e10d789613303f89c197e0df
Author: Simpy <kodi03466@hotmail.com>
Date:   Sun Mar 31 01:47:35 2024 -0400

    no point to strfind this its gonna be the same

commit 18b599c2061ba99371f507a45631b9a573cc1dd9
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Mar 30 20:19:55 2024 -0400

    git one as well

commit 67d39080a05acbfe094b0955a450eb89142d322d
Author: Simpy <kodi03466@hotmail.com>
Date:   Sat Mar 30 19:36:05 2024 -0400

    reimplement version check to dev builds
---
 .pkgmeta                                      |   30 +-
 CHANGELOG.md                                  |   11 +
 ElvUI/Cata/Modules/DataTexts/DualSpec.lua     |   23 +-
 .../Cata/Modules/DataTexts/Load_DataTexts.xml |    2 +-
 ElvUI/Cata/Modules/Skins/AddonManager.lua     |    5 +-
 ElvUI/Cata/Modules/Skins/Alerts.lua           |    5 +-
 ElvUI/Cata/Modules/Skins/AuctionHouse.lua     |    4 +-
 ElvUI/Cata/Modules/Skins/Bags.lua             |   12 +-
 ElvUI/Cata/Modules/Skins/Character.lua        |    4 +-
 ElvUI/Cata/Modules/Skins/Collectables.lua     |    6 +-
 ElvUI/Cata/Modules/Skins/Inspect.lua          |    6 +-
 ElvUI/Cata/Modules/Skins/Loot.lua             |    3 +-
 ElvUI/Cata/Modules/Skins/Mail.lua             |    7 +-
 ElvUI/Cata/Modules/Skins/Merchant.lua         |    6 +-
 ElvUI/Cata/Modules/Skins/Quest.lua            |    6 +-
 ElvUI/Cata/Modules/Skins/TradeSkill.lua       |    4 +-
 ElvUI/Classic/Filters/Filters.lua             |   39 +
 .../Modules/DataTexts/Load_DataTexts.xml      |    1 +
 ElvUI/Classic/Modules/Skins/AddonManager.lua  |    5 +-
 ElvUI/Classic/Modules/Skins/AuctionHouse.lua  |    3 +-
 ElvUI/Classic/Modules/Skins/Bags.lua          |   12 +-
 ElvUI/Classic/Modules/Skins/Character.lua     |   67 +-
 ElvUI/Classic/Modules/Skins/Craft.lua         |    7 +-
 ElvUI/Classic/Modules/Skins/Inspect.lua       |    6 +-
 ElvUI/Classic/Modules/Skins/Loot.lua          |    3 +-
 ElvUI/Classic/Modules/Skins/Mail.lua          |    7 +-
 ElvUI/Classic/Modules/Skins/Merchant.lua      |    7 +-
 ElvUI/Classic/Modules/Skins/Quest.lua         |   10 +-
 ElvUI/Classic/Modules/Skins/TradeSkill.lua    |    7 +-
 ElvUI/Core/Defaults/Profile.lua               |   14 +-
 ElvUI/Core/General/API.lua                    |   10 +-
 ElvUI/Core/General/Commands.lua               |   58 +-
 ElvUI/Core/General/Core.lua                   |   37 +-
 ElvUI/Core/General/Install.lua                |    2 +-
 ElvUI/Core/General/ItemLevel.lua              |    4 +-
 ElvUI/Core/General/Tags.lua                   |   10 +
 ElvUI/Core/Modules/ActionBars/MicroBar.lua    |    1 -
 ElvUI/Core/Modules/Auras/Auras.lua            |    3 +-
 ElvUI/Core/Modules/Bags/Bags.lua              |   42 +-
 ElvUI/Core/Modules/Bags/Sort.lua              |   24 +-
 ElvUI/Core/Modules/Blizzard/GuildBank.lua     |    7 +-
 ElvUI/Core/Modules/Chat/Chat.lua              |  420 +++--
 ElvUI/Core/Modules/DataTexts/Ammo.lua         |    6 +-
 ElvUI/Core/Modules/DataTexts/Avoidance.lua    |    3 +-
 ElvUI/Core/Modules/DataTexts/Bags.lua         |   10 +-
 ElvUI/Core/Modules/DataTexts/Difficulty.lua   |    2 +-
 ElvUI/Core/Modules/DataTexts/DualSpec.lua     |  103 ++
 ElvUI/Core/Modules/DataTexts/Gold.lua         |    4 +-
 ElvUI/Core/Modules/DataTexts/Location.lua     |    2 +-
 ElvUI/Core/Modules/DataTexts/Time.lua         |   35 +-
 ElvUI/Core/Modules/Maps/Minimap.lua           |    2 +-
 ElvUI/Core/Modules/Misc/LootRoll.lua          |    2 +-
 ElvUI/Core/Modules/Misc/Misc.lua              |   38 +-
 ElvUI/Core/Modules/Misc/RaidUtility.lua       |  174 +-
 ElvUI/Core/Modules/Nameplates/StyleFilter.lua |    1 +
 ElvUI/Core/Modules/Tooltip/Tooltip.lua        |    5 +-
 .../UnitFrames/Elements/BuffIndicator.lua     |   19 +-
 .../Modules/UnitFrames/Elements/Threat.lua    |   17 +-
 ElvUI/Core/Modules/UnitFrames/UnitFrames.lua  |    2 +-
 ElvUI/Core/init.lua                           |   40 +-
 ElvUI/ElvUI_Classic.toc                       |    4 +-
 ElvUI/Locales/esMX.lua                        |  164 +-
 ElvUI/Locales/ptBR.lua                        |  292 ++--
 ElvUI/Locales/zhCN.lua                        |    2 +-
 ElvUI/Mainline/Modules/DataTexts/Crests.lua   |   16 +-
 ElvUI/Mainline/Modules/Skins/AddonManager.lua |    6 +-
 ElvUI/Mainline/Modules/Skins/Alerts.lua       |    5 +-
 ElvUI/Mainline/Modules/Skins/Bags.lua         |    6 +-
 ElvUI/Mainline/Modules/Skins/BlackMarket.lua  |    6 +-
 ElvUI/Mainline/Modules/Skins/Character.lua    |  136 +-
 ElvUI/Mainline/Modules/Skins/Collectables.lua |  238 +--
 .../Modules/Skins/EncounterJournal.lua        |   14 +-
 ElvUI/Mainline/Modules/Skins/LFG.lua          |    2 +-
 ElvUI/Mainline/Modules/Skins/PVP.lua          |    6 +-
 ElvUI/Mainline/Modules/Skins/PerksProgram.lua |    5 +
 .../LibRangeCheck-3.0/LibRangeCheck-3.0.lua   |   14 +-
 ElvUI_Libraries/Core/oUF/elements/castbar.lua |   48 +-
 .../Core/oUF/elements/healthprediction.lua    |   15 +
 ElvUI_Libraries/Core/oUF/elements/tags.lua    |    2 +-
 ElvUI_Libraries/ElvUI_Libraries_Classic.toc   |    2 +-
 ElvUI_Options/Core/Bags.lua                   |    4 +-
 ElvUI_Options/Core/Core.lua                   |    5 +-
 ElvUI_Options/Core/StyleFilters.lua           |    6 +-
 ElvUI_Options/Core/UnitFrames.lua             |   64 +-
 ElvUI_Options/ElvUI_Options_Classic.toc       |    2 +-
 ElvUI_Options/Locales/deDE.lua                |    6 +-
 ElvUI_Options/Locales/enUS.lua                |    6 +-
 ElvUI_Options/Locales/esMX.lua                |   16 +-
 ElvUI_Options/Locales/frFR.lua                |    6 +-
 ElvUI_Options/Locales/itIT.lua                |    6 +-
 ElvUI_Options/Locales/koKR.lua                |    6 +-
 ElvUI_Options/Locales/ptBR.lua                | 1484 +++++++++--------
 ElvUI_Options/Locales/ruRU.lua                |   24 +-
 ElvUI_Options/Locales/trTR.lua                |    6 +-
 ElvUI_Options/Locales/zhCN.lua                |    6 +-
 ElvUI_Options/Locales/zhTW.lua                |    6 +-
 96 files changed, 2250 insertions(+), 1791 deletions(-)
 create mode 100644 ElvUI/Core/Modules/DataTexts/DualSpec.lua

diff --git a/.pkgmeta b/.pkgmeta
index 6452f12cf9..75af72de2c 100644
--- a/.pkgmeta
+++ b/.pkgmeta
@@ -31,10 +31,32 @@ manual-changelog:
   markup-type: markdown
 
 ignore:
-  - README.md
-  - CHANGELOG.md
-  - LICENSE.md
-  - ThirdPartyNotices.md
+  - "*.md"
+  - "*.textile"
+  - ElvUI_Libraries/Core/LibStub/tests
+
+plain-copy:
+  - ElvUI/Classic
+  - ElvUI/Core
+  - ElvUI/Locales
+  - ElvUI/Mainline
+  - ElvUI/Wrath
+  - ElvUI_Libraries/Classic/LibClassicSpecs
+  - ElvUI_Libraries/Core/Ace3
+  - ElvUI_Libraries/Core/Ace3-ElvUI
+  - ElvUI_Libraries/Core/LibAceConfigHelper
+  - ElvUI_Libraries/Core/LibActionButton-1.0
+  - ElvUI_Libraries/Core/LibAnim
+  - ElvUI_Libraries/Core/LibDeflate
+  - ElvUI_Libraries/Core/LibElvUIPlugin-1.0
+  - ElvUI_Libraries/Core/LibRangeCheck-3.0
+  - ElvUI_Libraries/Core/LibSimpleSticky
+  - ElvUI_Libraries/Core/oUF
+  - ElvUI_Libraries/Core/oUF_Plugins
+  - ElvUI_Libraries/Mainline
+  - ElvUI_Libraries/Wrath
+  - ElvUI_Options/Core
+  - ElvUI_Options/Locales
 
 move-folders:
   ElvUI/ElvUI: ElvUI
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1152226761..22e168a25f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### Version 13.61 [ April 2nd 2024 ]
+*   Microbar Support Ticket button in middle of screen.
+*   Minimap Icons not hiding when using the keybind for Toggle Minimap.
+*   No Label, Decimal Length, Custom Label options for the Leech Datatext.
+*   Minimap Difficulty icon not respecting offsets on Wrath.
+*   Party and RaidPets not spawning until after combat.
+*   SoD Mage at low level having incorrect range on friendly NPCs.
+*   Wrath Nightelf Shadowmeld causing a taint during combat.
+*   LibDispel Bleed list updated again.
+*   Chat AFK and DND not displaying on Retail.
+
 ### Version 13.60 [ March 19th 2024 ]
 *   Difficulty Icon on Minimap improved, resolving an issue with the mouseover tooltip.
 *   Pet Battle XP bar overlapped Pass button.
diff --git a/ElvUI/Cata/Modules/DataTexts/DualSpec.lua b/ElvUI/Cata/Modules/DataTexts/DualSpec.lua
index dfad6a4d30..4efc28aa24 100644
--- a/ElvUI/Cata/Modules/DataTexts/DualSpec.lua
+++ b/ElvUI/Cata/Modules/DataTexts/DualSpec.lua
@@ -1,4 +1,5 @@
 local E, L, V, P, G = unpack(ElvUI)
+if not (E.Wrath or E.ClassicSOD) then return end
 local DT = E:GetModule('DataTexts')
 
 local _G = _G
@@ -20,27 +21,28 @@ local GetTalentTabInfo = GetTalentTabInfo
 local LoadAddOn = (C_AddOns and C_AddOns.LoadAddOn) or LoadAddOn
 
 local displayString, db = ''
-local primaryStr, secondaryStr, activeGroup, hasDualSpec
+local primaryStr, secondaryStr, activeGroup, hasDualSpec = '', ''
 
 local function BuildTalentString(talentGroup)
 	local str = ''
 
 	for i = 1, MAX_TALENT_TABS do
+<<<<<<<< HEAD:ElvUI/Cata/Modules/DataTexts/DualSpec.lua
 		local _, _, _, _, pointsSpent = GetTalentTabInfo(i, false, false, talentGroup)
 		if (str == '') then
 			str = pointsSpent
 		else
 			str = strjoin('/', str, pointsSpent)
 		end
+========
+		local _, _, pointsSpent = GetTalentTabInfo(i, false, false, talentGroup)
+		str = (str == '' and pointsSpent) or strjoin('/', str, pointsSpent)
+>>>>>>>> upstream/main:ElvUI/Core/Modules/DataTexts/DualSpec.lua
 	end
 
 	return str
 end
 
-local function ColorText(str, hex)
-	return format('|cff%s%s|r',hex,str)
-end
-
 local function OnEvent(self)
 	primaryStr, secondaryStr = BuildTalentString(1), BuildTalentString(2)
 
@@ -56,11 +58,10 @@ end
 
 local function OnEnter()
 	DT.tooltip:ClearLines()
-
-	DT.tooltip:AddDoubleLine(format('%s: %s', ColorText(PRIMARY, activeGroup == 1 and '0CD809' or 'FFFFFF'), primaryStr))
+	DT.tooltip:AddLine(format('|cff%s%s:|r %s', activeGroup == 1 and '0CD809' or 'FFFFFF', PRIMARY, primaryStr), 1, 1, 1)
 
 	if hasDualSpec then
-		DT.tooltip:AddDoubleLine(format('%s: %s', ColorText(SECONDARY, activeGroup == 2 and '0CD809' or 'FFFFFF'), secondaryStr))
+		DT.tooltip:AddLine(format('|cff%s%s:|r %s', activeGroup == 2 and '0CD809' or 'FFFFFF', SECONDARY, secondaryStr), 1, 1, 1)
 	end
 
 	DT.tooltip:AddLine(' ')
@@ -85,10 +86,8 @@ local function OnClick(_, button)
 			else
 				HideUIPanel(_G.PlayerTalentFrame)
 			end
-		else
-			if hasDualSpec then
-				SetActiveTalentGroup(activeGroup == 1 and 2 or 1)
-			end
+		elseif hasDualSpec then
+			SetActiveTalentGroup(activeGroup == 1 and 2 or 1)
 		end
 	end
 end
diff --git a/ElvUI/Cata/Modules/DataTexts/Load_DataTexts.xml b/ElvUI/Cata/Modules/DataTexts/Load_DataTexts.xml
index 7b58bdc8b3..990da61872 100644
--- a/ElvUI/Cata/Modules/DataTexts/Load_DataTexts.xml
+++ b/ElvUI/Cata/Modules/DataTexts/Load_DataTexts.xml
@@ -19,5 +19,5 @@
 	<Script file='..\..\..\Core\Modules\DataTexts\SpellHit.lua'/>
 	<Script file='..\..\..\Core\Modules\DataTexts\SpellPower.lua'/>
 	<Script file='..\..\..\Core\Modules\DataTexts\Spirit.lua'/>
-	<Script file='DualSpec.lua'/>
+	<Script file='..\..\..\Core\Modules\DataTexts\DualSpec.lua'/>
 </Ui>
diff --git a/ElvUI/Cata/Modules/Skins/AddonManager.lua b/ElvUI/Cata/Modules/Skins/AddonManager.lua
index 60be53e288..f4bb4c6de1 100644
--- a/ElvUI/Cata/Modules/Skins/AddonManager.lua
+++ b/ElvUI/Cata/Modules/Skins/AddonManager.lua
@@ -9,7 +9,6 @@ local UIDropDownMenu_GetSelectedValue = UIDropDownMenu_GetSelectedValue
 
 local GetNumAddOns = GetNumAddOns
 local GetAddOnInfo = GetAddOnInfo
-local GetAddOnEnableState = GetAddOnEnableState -- eventually this will be on C_AddOns and args swap
 
 function S:AddonList()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.addonManager) then return end
@@ -52,10 +51,10 @@ function S:AddonList()
 				if character == true then
 					character = nil
 				else
-					checkall = GetAddOnEnableState(nil, index)
+					checkall = E:GetAddOnEnableState(nil, index)
 				end
 
-				local checkstate = GetAddOnEnableState(character, index)
+				local checkstate = E:GetAddOnEnableState(character, index)
 				local enabled = checkstate > 0
 
 				entryTitle:SetFontObject('ElvUIFontNormal')
diff --git a/ElvUI/Cata/Modules/Skins/Alerts.lua b/ElvUI/Cata/Modules/Skins/Alerts.lua
index 24ad0186ae..a35f0562af 100644
--- a/ElvUI/Cata/Modules/Skins/Alerts.lua
+++ b/ElvUI/Cata/Modules/Skins/Alerts.lua
@@ -3,11 +3,12 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack = unpack
+local hooksecurefunc = hooksecurefunc
 
 local CreateFrame = CreateFrame
-local GetItemInfo = GetItemInfo
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+
 local ITEM_QUALITY_COLORS = ITEM_QUALITY_COLORS
-local hooksecurefunc = hooksecurefunc
 
 local function forceAlpha(self, alpha, forced)
 	if alpha ~= 1 and forced ~= true then
diff --git a/ElvUI/Cata/Modules/Skins/AuctionHouse.lua b/ElvUI/Cata/Modules/Skins/AuctionHouse.lua
index 24d099e5fb..19319d4608 100644
--- a/ElvUI/Cata/Modules/Skins/AuctionHouse.lua
+++ b/ElvUI/Cata/Modules/Skins/AuctionHouse.lua
@@ -6,9 +6,9 @@ local next = next
 local pairs = pairs
 local unpack = unpack
 
-local GetAuctionSellItemInfo = GetAuctionSellItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local CreateFrame = CreateFrame
+local GetAuctionSellItemInfo = GetAuctionSellItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 function S:Blizzard_AuctionUI()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.auctionhouse) then return end
diff --git a/ElvUI/Cata/Modules/Skins/Bags.lua b/ElvUI/Cata/Modules/Skins/Bags.lua
index 7ef0bc678c..9681962e89 100644
--- a/ElvUI/Cata/Modules/Skins/Bags.lua
+++ b/ElvUI/Cata/Modules/Skins/Bags.lua
@@ -6,13 +6,13 @@ local _G = _G
 local select, unpack = select, unpack
 local hooksecurefunc = hooksecurefunc
 
-local ContainerIDToInventoryID = ContainerIDToInventoryID or (C_Container and C_Container.ContainerIDToInventoryID)
-local GetContainerNumFreeSlots = GetContainerNumFreeSlots or (C_Container and C_Container.GetContainerNumFreeSlots)
-local GetContainerItemLink = GetContainerItemLink or (C_Container and C_Container.GetContainerItemLink)
-local GetInventoryItemLink = GetInventoryItemLink or (C_Container and C_Container.GetInventoryItemLink)
-local GetItemQualityColor = GetItemQualityColor
+local ContainerIDToInventoryID = (C_Container and C_Container.ContainerIDToInventoryID) or ContainerIDToInventoryID
+local GetContainerNumFreeSlots = (C_Container and C_Container.GetContainerNumFreeSlots) or GetContainerNumFreeSlots
+local GetContainerItemLink = (C_Container and C_Container.GetContainerItemLink) or GetContainerItemLink
+local GetInventoryItemLink = (C_Container and C_Container.GetInventoryItemLink) or GetInventoryItemLink
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
 local GetInventoryItemID = GetInventoryItemID
-local GetItemInfo = GetItemInfo
 
 local BANK_CONTAINER = Enum.BagIndex.Bank
 local LE_ITEM_CLASS_QUESTITEM = LE_ITEM_CLASS_QUESTITEM
diff --git a/ElvUI/Cata/Modules/Skins/Character.lua b/ElvUI/Cata/Modules/Skins/Character.lua
index 9be457177c..43ca8a08f6 100644
--- a/ElvUI/Cata/Modules/Skins/Character.lua
+++ b/ElvUI/Cata/Modules/Skins/Character.lua
@@ -5,13 +5,13 @@ local _G = _G
 local next = next
 local unpack = unpack
 local ipairs, pairs = ipairs, pairs
+local hooksecurefunc = hooksecurefunc
 
 local HasPetUI = HasPetUI
-local hooksecurefunc = hooksecurefunc
 local GetPetHappiness = GetPetHappiness
 local GetSkillLineInfo = GetSkillLineInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetInventoryItemQuality = GetInventoryItemQuality
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local NUM_FACTIONS_DISPLAYED = NUM_FACTIONS_DISPLAYED
 local NUM_COMPANIONS_PER_PAGE = NUM_COMPANIONS_PER_PAGE
diff --git a/ElvUI/Cata/Modules/Skins/Collectables.lua b/ElvUI/Cata/Modules/Skins/Collectables.lua
index 30c04cd864..9add36b4d8 100644
--- a/ElvUI/Cata/Modules/Skins/Collectables.lua
+++ b/ElvUI/Cata/Modules/Skins/Collectables.lua
@@ -3,11 +3,11 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local next, unpack = next, unpack
+local hooksecurefunc = hooksecurefunc
 
-local GetItemInfo = GetItemInfo
 local PlayerHasToy = PlayerHasToy
-local hooksecurefunc = hooksecurefunc
-local GetItemQualityColor = GetItemQualityColor
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 local C_Heirloom_PlayerHasHeirloom = C_Heirloom.PlayerHasHeirloom
 
 local QUALITY_7_R, QUALITY_7_G, QUALITY_7_B = GetItemQualityColor(7)
diff --git a/ElvUI/Cata/Modules/Skins/Inspect.lua b/ElvUI/Cata/Modules/Skins/Inspect.lua
index 6c3664e5a7..7128d25731 100644
--- a/ElvUI/Cata/Modules/Skins/Inspect.lua
+++ b/ElvUI/Cata/Modules/Skins/Inspect.lua
@@ -3,11 +3,11 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local ipairs, unpack = ipairs, unpack
+local hooksecurefunc = hooksecurefunc
 
 local GetInventoryItemID = GetInventoryItemID
-local GetItemQualityColor = GetItemQualityColor
-local GetItemInfo = GetItemInfo
-local hooksecurefunc = hooksecurefunc
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
 
 local MAX_ARENA_TEAMS = MAX_ARENA_TEAMS
 
diff --git a/ElvUI/Cata/Modules/Skins/Loot.lua b/ElvUI/Cata/Modules/Skins/Loot.lua
index d1f4935d72..068a560b27 100644
--- a/ElvUI/Cata/Modules/Skins/Loot.lua
+++ b/ElvUI/Cata/Modules/Skins/Loot.lua
@@ -6,7 +6,6 @@ local _G = _G
 local next = next
 local unpack = unpack
 
-local GetItemInfo = GetItemInfo
 local GetLootSlotInfo = GetLootSlotInfo
 local hooksecurefunc = hooksecurefunc
 local IsFishingLoot = IsFishingLoot
@@ -14,6 +13,8 @@ local UnitIsDead = UnitIsDead
 local UnitIsFriend = UnitIsFriend
 local UnitName = UnitName
 
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+
 local C_LootHistory_GetNumItems = C_LootHistory.GetNumItems
 local C_LootHistory_GetItem = C_LootHistory.GetItem
 local ITEM_QUALITY_COLORS = ITEM_QUALITY_COLORS
diff --git a/ElvUI/Cata/Modules/Skins/Mail.lua b/ElvUI/Cata/Modules/Skins/Mail.lua
index 187b4b0e98..701c86b20d 100644
--- a/ElvUI/Cata/Modules/Skins/Mail.lua
+++ b/ElvUI/Cata/Modules/Skins/Mail.lua
@@ -3,14 +3,15 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack = unpack
+local hooksecurefunc = hooksecurefunc
 
 local GetInboxHeaderInfo = GetInboxHeaderInfo
 local GetInboxItemLink = GetInboxItemLink
 local GetInboxNumItems = GetInboxNumItems
-local GetItemInfo = GetItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetSendMailItem = GetSendMailItem
-local hooksecurefunc = hooksecurefunc
+
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local function MailFrameSkin()
 	for i = 1, _G.ATTACHMENTS_MAX_SEND do
diff --git a/ElvUI/Cata/Modules/Skins/Merchant.lua b/ElvUI/Cata/Modules/Skins/Merchant.lua
index 9897853b11..ac630efbc2 100644
--- a/ElvUI/Cata/Modules/Skins/Merchant.lua
+++ b/ElvUI/Cata/Modules/Skins/Merchant.lua
@@ -3,13 +3,13 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack = unpack
+local hooksecurefunc = hooksecurefunc
 
-local GetItemInfo = GetItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetBuybackItemInfo = GetBuybackItemInfo
 local GetNumBuybackItems = GetNumBuybackItems
 local GetMerchantNumItems = GetMerchantNumItems
-local hooksecurefunc = hooksecurefunc
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local function merchantItemPoint()
 	S:HandlePointXY(_G.MerchantItem1, 6, -40)
diff --git a/ElvUI/Cata/Modules/Skins/Quest.lua b/ElvUI/Cata/Modules/Skins/Quest.lua
index abfdaed4cf..1e1bbf719c 100644
--- a/ElvUI/Cata/Modules/Skins/Quest.lua
+++ b/ElvUI/Cata/Modules/Skins/Quest.lua
@@ -4,10 +4,9 @@ local S = E:GetModule('Skins')
 local _G = _G
 local gsub, strmatch, unpack = gsub, strmatch, unpack
 local next, pairs = next, pairs
+local hooksecurefunc = hooksecurefunc
 
 local GetMoney = GetMoney
-local GetItemInfo = GetItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetNumQuestLeaderBoards = GetNumQuestLeaderBoards
 local GetNumQuestLogEntries = GetNumQuestLogEntries
 local GetQuestItemLink = GetQuestItemLink
@@ -17,11 +16,12 @@ local GetQuestLogRequiredMoney = GetQuestLogRequiredMoney
 local GetQuestLogTitle = GetQuestLogTitle
 local GetQuestMoneyToGet = GetQuestMoneyToGet
 local IsQuestComplete = IsQuestComplete
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local MAX_NUM_ITEMS = MAX_NUM_ITEMS
 local MAX_NUM_QUESTS = MAX_NUM_QUESTS
 local MAX_REQUIRED_ITEMS = MAX_REQUIRED_ITEMS
-local hooksecurefunc = hooksecurefunc
 
 local function UpdateGreetingFrame()
 	local i = 1
diff --git a/ElvUI/Cata/Modules/Skins/TradeSkill.lua b/ElvUI/Cata/Modules/Skins/TradeSkill.lua
index ad18fb6a4a..ba96bff7e1 100644
--- a/ElvUI/Cata/Modules/Skins/TradeSkill.lua
+++ b/ElvUI/Cata/Modules/Skins/TradeSkill.lua
@@ -5,13 +5,13 @@ local _G = _G
 local unpack = unpack
 local hooksecurefunc = hooksecurefunc
 
-local GetItemInfo = GetItemInfo
 local GetTradeSkillNumReagents = GetTradeSkillNumReagents
 local GetTradeSkillInfo = GetTradeSkillInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetTradeSkillItemLink = GetTradeSkillItemLink
 local GetTradeSkillReagentInfo = GetTradeSkillReagentInfo
 local GetTradeSkillReagentItemLink = GetTradeSkillReagentItemLink
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 function S:Blizzard_TradeSkillUI()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.tradeskill) then return end
diff --git a/ElvUI/Classic/Filters/Filters.lua b/ElvUI/Classic/Filters/Filters.lua
index 6209b84f31..4ba1a5995f 100644
--- a/ElvUI/Classic/Filters/Filters.lua
+++ b/ElvUI/Classic/Filters/Filters.lua
@@ -448,6 +448,7 @@ if E.ClassicSOD then
 	-- Whitelist World Event Auras
 	Whitelist[433804] = List(6) -- Blood for the Blood Loa
 	Whitelist[441785] = List(6) -- Drained of Blood
+	Whitelist[437751] = List(6) -- Bruised
 	Whitelist[436351] = List(6) -- Zandalari Ward
 	Whitelist[429959] = List(2) -- Well-Rested
 	-- Priest Rune Meditations
@@ -660,6 +661,30 @@ if E.ClassicSOD then
 	RaidDebuffs[438732] = List(2) -- Toxic Ventilation
 	RaidDebuffs[438735] = List(2) -- High Voltage!
 	RaidDebuffs[438720] = List(2) -- Freezing
+	----------------------------------------------------------
+	---------------------- Sunken Temple ---------------------
+	----------------------------------------------------------
+	-- Atal'alarion
+	RaidDebuffs[437617] = List(2) -- Demolishing Smash
+	-- Festering Rotslime
+	RaidDebuffs[438142] = List(3) -- Gunk
+	-- Atal'ai Defenders
+	RaidDebuffs[446354] = List(2) -- Shield Slam
+	RaidDebuffs[446373] = List(2) -- Corrupted Slam
+	-- Dreamscythe and Weaver
+	RaidDebuffs[442622] = List(2) -- Acid Breath
+	-- Jammal'an and Ogom
+	RaidDebuffs[437868] = List(3) -- Agonizing Weakness
+	RaidDebuffs[437847] = List(6) -- Mortal Lash
+	-- Morphaz and Hazzas
+	RaidDebuffs[445158] = List(2) -- Lucid Dreaming
+	RaidDebuffs[445555] = List(3) -- On Fire!!
+	-- Shade of Eranikus
+	RaidDebuffs[437390] = List(6) -- Lethargic Poison
+	RaidDebuffs[437324] = List(2) -- Deep Slumber
+	-- Avatar of Hakkar
+	RaidDebuffs[444255] = List(6) -- Corrupted Blood
+	RaidDebuffs[444165] = List(5) -- Skeletal
 end
 
 --[[
@@ -723,6 +748,19 @@ if E.ClassicSOD then
 	RaidBuffs[436837] = List(2) -- Widget Fortress
 	-- Mekgineer Thermaplugg
 	RaidBuffs[438715] = List(2) -- Furnace Surge
+	----------------------------------------------------------
+	---------------------- Sunken Temple ---------------------
+	----------------------------------------------------------
+	-- Atal'ai Defenders
+	RaidBuffs[446356] = List(2) -- Improved Blocking
+	-- Dreamscythe and Weaver
+	RaidBuffs[443302] = List(6) -- Emerald Ward
+	-- Jammal'an and Ogom
+	RaidBuffs[437791] = List(6) -- Ritual Leader
+	-- Shade of Eranikus
+	RaidBuffs[437410] = List(6) -- Deep Slumber
+	-- Avatar of Hakkar
+	RaidBuffs[443917] = List(2) -- Tides of Blood
 end
 
 G.unitframe.aurawatch = {
@@ -902,6 +940,7 @@ G.unitframe.ChannelTicks = {
 if E.ClassicSOD then
 	G.unitframe.ChannelTicks[402261] = 3 -- Penance (DPS)
 	G.unitframe.ChannelTicks[402277] = 3 -- Penance (Healing)
+	G.unitframe.ChannelTicks[413259] = 5 -- Mind Sear (Rune)
 end
 
 -- Spells that chain, second step
diff --git a/ElvUI/Classic/Modules/DataTexts/Load_DataTexts.xml b/ElvUI/Classic/Modules/DataTexts/Load_DataTexts.xml
index 5eaea5a3b6..cf825e5b62 100644
--- a/ElvUI/Classic/Modules/DataTexts/Load_DataTexts.xml
+++ b/ElvUI/Classic/Modules/DataTexts/Load_DataTexts.xml
@@ -12,4 +12,5 @@
 	<Script file='..\..\..\Core\Modules\DataTexts\SpellHit.lua'/>
 	<Script file='..\..\..\Core\Modules\DataTexts\SpellPower.lua'/>
 	<Script file='..\..\..\Core\Modules\DataTexts\Spirit.lua'/>
+	<Script file='..\..\..\Core\Modules\DataTexts\DualSpec.lua'/>
 </Ui>
diff --git a/ElvUI/Classic/Modules/Skins/AddonManager.lua b/ElvUI/Classic/Modules/Skins/AddonManager.lua
index 72d85210b2..38df7b9f28 100644
--- a/ElvUI/Classic/Modules/Skins/AddonManager.lua
+++ b/ElvUI/Classic/Modules/Skins/AddonManager.lua
@@ -7,7 +7,6 @@ local hooksecurefunc = hooksecurefunc
 
 local UIDropDownMenu_GetSelectedValue = UIDropDownMenu_GetSelectedValue
 
-local GetAddOnEnableState = C_AddOns and C_AddOns.GetAddOnEnableState
 local GetAddOnInfo = C_AddOns and C_AddOns.GetAddOnInfo
 local GetNumAddOns = C_AddOns and C_AddOns.GetNumAddOns
 
@@ -52,10 +51,10 @@ function S:AddonList()
 				if character == true then
 					character = nil
 				else
-					checkall = GetAddOnEnableState(index)
+					checkall = E:GetAddOnEnableState(index)
 				end
 
-				local checkstate = GetAddOnEnableState(index, character)
+				local checkstate = E:GetAddOnEnableState(index, character)
 				local enabled = checkstate > 0
 
 				entryTitle:SetFontObject('ElvUIFontNormal')
diff --git a/ElvUI/Classic/Modules/Skins/AuctionHouse.lua b/ElvUI/Classic/Modules/Skins/AuctionHouse.lua
index 79ccce88b1..5fec3a4bf5 100644
--- a/ElvUI/Classic/Modules/Skins/AuctionHouse.lua
+++ b/ElvUI/Classic/Modules/Skins/AuctionHouse.lua
@@ -7,9 +7,10 @@ local pairs = pairs
 local unpack = unpack
 
 local GetAuctionSellItemInfo = GetAuctionSellItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local CreateFrame = CreateFrame
 
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+
 function S:Blizzard_AuctionUI()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.auctionhouse) then return end
 
diff --git a/ElvUI/Classic/Modules/Skins/Bags.lua b/ElvUI/Classic/Modules/Skins/Bags.lua
index 7ef0bc678c..9681962e89 100644
--- a/ElvUI/Classic/Modules/Skins/Bags.lua
+++ b/ElvUI/Classic/Modules/Skins/Bags.lua
@@ -6,13 +6,13 @@ local _G = _G
 local select, unpack = select, unpack
 local hooksecurefunc = hooksecurefunc
 
-local ContainerIDToInventoryID = ContainerIDToInventoryID or (C_Container and C_Container.ContainerIDToInventoryID)
-local GetContainerNumFreeSlots = GetContainerNumFreeSlots or (C_Container and C_Container.GetContainerNumFreeSlots)
-local GetContainerItemLink = GetContainerItemLink or (C_Container and C_Container.GetContainerItemLink)
-local GetInventoryItemLink = GetInventoryItemLink or (C_Container and C_Container.GetInventoryItemLink)
-local GetItemQualityColor = GetItemQualityColor
+local ContainerIDToInventoryID = (C_Container and C_Container.ContainerIDToInventoryID) or ContainerIDToInventoryID
+local GetContainerNumFreeSlots = (C_Container and C_Container.GetContainerNumFreeSlots) or GetContainerNumFreeSlots
+local GetContainerItemLink = (C_Container and C_Container.GetContainerItemLink) or GetContainerItemLink
+local GetInventoryItemLink = (C_Container and C_Container.GetInventoryItemLink) or GetInventoryItemLink
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
 local GetInventoryItemID = GetInventoryItemID
-local GetItemInfo = GetItemInfo
 
 local BANK_CONTAINER = Enum.BagIndex.Bank
 local LE_ITEM_CLASS_QUESTITEM = LE_ITEM_CLASS_QUESTITEM
diff --git a/ElvUI/Classic/Modules/Skins/Character.lua b/ElvUI/Classic/Modules/Skins/Character.lua
index 5d2ad9d2e2..4f661004dd 100644
--- a/ElvUI/Classic/Modules/Skins/Character.lua
+++ b/ElvUI/Classic/Modules/Skins/Character.lua
@@ -4,15 +4,16 @@ local S = E:GetModule('Skins')
 local _G = _G
 local next = next
 local unpack, pairs = unpack, pairs
+local hooksecurefunc = hooksecurefunc
 
 local HasPetUI = HasPetUI
 local GetNumFactions = GetNumFactions
 local GetPetHappiness = GetPetHappiness
-local GetItemQualityColor = GetItemQualityColor
 local GetInventoryItemQuality = GetInventoryItemQuality
 local FauxScrollFrame_GetOffset = FauxScrollFrame_GetOffset
 
-local hooksecurefunc = hooksecurefunc
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+
 local NUM_FACTIONS_DISPLAYED = NUM_FACTIONS_DISPLAYED
 local CHARACTERFRAME_SUBFRAMES = CHARACTERFRAME_SUBFRAMES
 
@@ -24,6 +25,36 @@ local ResistanceCoords = {
 	{ 0.21875, 0.8125, 0.4765625, 0.55078125},	--Shadow
 }
 
+local function ReputationFrameUpdate()
+	local factionOffset = FauxScrollFrame_GetOffset(_G.ReputationListScrollFrame)
+	local numFactions = GetNumFactions()
+
+	for i = 1, NUM_FACTIONS_DISPLAYED do
+		local factionIndex = factionOffset + i
+		if factionIndex <= numFactions then
+			local factionHeader = _G['ReputationHeader'..i]
+			if factionHeader.isCollapsed then
+				factionHeader:SetNormalTexture(E.Media.Textures.PlusButton)
+			else
+				factionHeader:SetNormalTexture(E.Media.Textures.MinusButton)
+			end
+		end
+	end
+end
+
+local function PaperDollItemSlotButtonUpdate(frame)
+	if not frame.SetBackdropBorderColor then return end
+
+	local id = frame:GetID()
+	local rarity = id and GetInventoryItemQuality('player', id)
+	if rarity and rarity > 1 then
+		local r, g, b = GetItemQualityColor(rarity)
+		frame:SetBackdropBorderColor(r, g, b)
+	else
+		frame:SetBackdropBorderColor(unpack(E.media.bordercolor))
+	end
+end
+
 local function HandleTabs()
 	local lastTab
 	for index, tab in next, { _G.CharacterFrameTab1, HasPetUI() and _G.CharacterFrameTab2 or nil, _G.CharacterFrameTab3, _G.CharacterFrameTab4, _G.CharacterFrameTab5 } do
@@ -128,8 +159,6 @@ function S:CharacterFrame()
 			slot:SetTemplate(nil, true, true)
 			slot:StyleButton()
 
-			slot.characterSlot = true -- for color function
-
 			S:HandleIcon(icon)
 			icon:SetInside()
 
@@ -139,17 +168,7 @@ function S:CharacterFrame()
 		end
 	end
 
-	hooksecurefunc('PaperDollItemSlotButton_Update', function(frame)
-		if frame.characterSlot then
-			local rarity = GetInventoryItemQuality('player', frame:GetID())
-			if rarity and rarity > 1 then
-				local r, g, b = GetItemQualityColor(rarity)
-				frame:SetBackdropBorderColor(r, g, b)
-			else
-				frame:SetBackdropBorderColor(unpack(E.media.bordercolor))
-			end
-		end
-	end)
+	hooksecurefunc('PaperDollItemSlotButton_Update', PaperDollItemSlotButtonUpdate)
 
 	-- PetPaperDollFrame
 	_G.PetPaperDollFrame:StripTextures()
@@ -222,23 +241,7 @@ function S:CharacterFrame()
 		factionWar.Icon:SetTexture([[Interface\Buttons\UI-CheckBox-SwordCheck]])
 	end
 
-	hooksecurefunc('ReputationFrame_Update', function()
-		local numFactions = GetNumFactions()
-		local factionIndex, factionHeader
-		local factionOffset = FauxScrollFrame_GetOffset(_G.ReputationListScrollFrame)
-
-		for i = 1, NUM_FACTIONS_DISPLAYED, 1 do
-			factionHeader = _G['ReputationHeader'..i]
-			factionIndex = factionOffset + i
-			if factionIndex <= numFactions then
-				if factionHeader.isCollapsed then
-					factionHeader:SetNormalTexture(E.Media.Textures.PlusButton)
-				else
-					factionHeader:SetNormalTexture(E.Media.Textures.MinusButton)
-				end
-			end
-		end
-	end)
+	hooksecurefunc('ReputationFrame_Update', ReputationFrameUpdate)
 
 	_G.ReputationListScrollFrame:StripTextures()
 	S:HandleScrollBar(_G.ReputationListScrollFrameScrollBar)
diff --git a/ElvUI/Classic/Modules/Skins/Craft.lua b/ElvUI/Classic/Modules/Skins/Craft.lua
index f45a81fb8e..60776d3801 100644
--- a/ElvUI/Classic/Modules/Skins/Craft.lua
+++ b/ElvUI/Classic/Modules/Skins/Craft.lua
@@ -3,14 +3,15 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack = unpack
+local hooksecurefunc = hooksecurefunc
 
-local GetItemInfo = GetItemInfo
 local GetCraftNumReagents = GetCraftNumReagents
-local GetItemQualityColor = GetItemQualityColor
 local GetCraftItemLink = GetCraftItemLink
 local GetCraftReagentInfo = GetCraftReagentInfo
 local GetCraftReagentItemLink = GetCraftReagentItemLink
-local hooksecurefunc = hooksecurefunc
+
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 function S:SkinCraft()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.craft) then return end
diff --git a/ElvUI/Classic/Modules/Skins/Inspect.lua b/ElvUI/Classic/Modules/Skins/Inspect.lua
index a5309713fd..6c7fc3ead1 100644
--- a/ElvUI/Classic/Modules/Skins/Inspect.lua
+++ b/ElvUI/Classic/Modules/Skins/Inspect.lua
@@ -3,11 +3,11 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local ipairs, unpack = ipairs, unpack
+local hooksecurefunc = hooksecurefunc
 
 local GetInventoryItemID = GetInventoryItemID
-local GetItemQualityColor = GetItemQualityColor
-local GetItemInfo = GetItemInfo
-local hooksecurefunc = hooksecurefunc
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local function Update_InspectPaperDollItemSlotButton(button)
 	local unit = button.hasItem and _G.InspectFrame.unit
diff --git a/ElvUI/Classic/Modules/Skins/Loot.lua b/ElvUI/Classic/Modules/Skins/Loot.lua
index 651ff5369d..68f6ae5ff5 100644
--- a/ElvUI/Classic/Modules/Skins/Loot.lua
+++ b/ElvUI/Classic/Modules/Skins/Loot.lua
@@ -6,7 +6,6 @@ local _G = _G
 local next = next
 local unpack = unpack
 
-local GetItemInfo = GetItemInfo
 local GetLootSlotInfo = GetLootSlotInfo
 local hooksecurefunc = hooksecurefunc
 local IsFishingLoot = IsFishingLoot
@@ -14,6 +13,8 @@ local UnitIsDead = UnitIsDead
 local UnitIsFriend = UnitIsFriend
 local UnitName = UnitName
 
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+
 local C_LootHistory_GetNumItems = C_LootHistory.GetNumItems
 local C_LootHistory_GetItem = C_LootHistory.GetItem
 local ITEM_QUALITY_COLORS = ITEM_QUALITY_COLORS
diff --git a/ElvUI/Classic/Modules/Skins/Mail.lua b/ElvUI/Classic/Modules/Skins/Mail.lua
index 187b4b0e98..701c86b20d 100644
--- a/ElvUI/Classic/Modules/Skins/Mail.lua
+++ b/ElvUI/Classic/Modules/Skins/Mail.lua
@@ -3,14 +3,15 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack = unpack
+local hooksecurefunc = hooksecurefunc
 
 local GetInboxHeaderInfo = GetInboxHeaderInfo
 local GetInboxItemLink = GetInboxItemLink
 local GetInboxNumItems = GetInboxNumItems
-local GetItemInfo = GetItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetSendMailItem = GetSendMailItem
-local hooksecurefunc = hooksecurefunc
+
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local function MailFrameSkin()
 	for i = 1, _G.ATTACHMENTS_MAX_SEND do
diff --git a/ElvUI/Classic/Modules/Skins/Merchant.lua b/ElvUI/Classic/Modules/Skins/Merchant.lua
index f88631f07c..0a40f7344c 100644
--- a/ElvUI/Classic/Modules/Skins/Merchant.lua
+++ b/ElvUI/Classic/Modules/Skins/Merchant.lua
@@ -3,14 +3,15 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack = unpack
+local hooksecurefunc = hooksecurefunc
 
 local CreateFrame = CreateFrame
-local GetItemInfo = GetItemInfo
 local GetMerchantNumItems = GetMerchantNumItems
 local GetBuybackItemInfo = GetBuybackItemInfo
 local GetNumBuybackItems = GetNumBuybackItems
-local GetItemQualityColor = GetItemQualityColor
-local hooksecurefunc = hooksecurefunc
+
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local MERCHANT_ITEMS_PER_PAGE = MERCHANT_ITEMS_PER_PAGE
 
diff --git a/ElvUI/Classic/Modules/Skins/Quest.lua b/ElvUI/Classic/Modules/Skins/Quest.lua
index 693edd3877..26dccbe90a 100644
--- a/ElvUI/Classic/Modules/Skins/Quest.lua
+++ b/ElvUI/Classic/Modules/Skins/Quest.lua
@@ -3,12 +3,10 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack, gsub = unpack, gsub
-local pairs, next = pairs, next
-local strmatch = strmatch
+local pairs, next, strmatch = pairs, next, strmatch
+local hooksecurefunc = hooksecurefunc
 
 local GetMoney = GetMoney
-local GetItemInfo = GetItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetNumQuestLeaderBoards = GetNumQuestLeaderBoards
 local GetNumQuestLogEntries = GetNumQuestLogEntries
 local GetQuestItemLink = GetQuestItemLink
@@ -18,7 +16,9 @@ local GetQuestLogRequiredMoney = GetQuestLogRequiredMoney
 local GetQuestLogTitle = GetQuestLogTitle
 local GetQuestMoneyToGet = GetQuestMoneyToGet
 local IsQuestComplete = IsQuestComplete
-local hooksecurefunc = hooksecurefunc
+
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local MAX_NUM_ITEMS = MAX_NUM_ITEMS
 local MAX_NUM_QUESTS = MAX_NUM_QUESTS
diff --git a/ElvUI/Classic/Modules/Skins/TradeSkill.lua b/ElvUI/Classic/Modules/Skins/TradeSkill.lua
index c4e91df638..cf22b92e3b 100644
--- a/ElvUI/Classic/Modules/Skins/TradeSkill.lua
+++ b/ElvUI/Classic/Modules/Skins/TradeSkill.lua
@@ -3,15 +3,16 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local unpack, select = unpack, select
+local hooksecurefunc = hooksecurefunc
 
-local GetItemInfo = GetItemInfo
 local GetTradeSkillNumReagents = GetTradeSkillNumReagents
 local GetTradeSkillInfo = GetTradeSkillInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetTradeSkillItemLink = GetTradeSkillItemLink
 local GetTradeSkillReagentInfo = GetTradeSkillReagentInfo
 local GetTradeSkillReagentItemLink = GetTradeSkillReagentItemLink
-local hooksecurefunc = hooksecurefunc
+
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 function S:Blizzard_TradeSkillUI()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.tradeskill) then return end
diff --git a/ElvUI/Core/Defaults/Profile.lua b/ElvUI/Core/Defaults/Profile.lua
index 30c71419b5..af94666369 100644
--- a/ElvUI/Core/Defaults/Profile.lua
+++ b/ElvUI/Core/Defaults/Profile.lua
@@ -1348,6 +1348,7 @@ local UF_AuraBars = {
 
 local UF_AuraWatch = {
 	enable = false,
+	petSpecific = E.Retail,
 	profileSpecific = false,
 	countFont = 'PT Sans Narrow',
 	countFontOutline = 'OUTLINE',
@@ -1654,6 +1655,7 @@ local UF_SubGroup = {
 	width = 120,
 	height = 28,
 	threatStyle = 'GLOW',
+	threatPrimary = true,
 	colorOverride = 'USE_DEFAULT',
 	name = CopyTable(UF_Name),
 	raidicon = CopyTable(UF_RaidIcon),
@@ -1860,6 +1862,7 @@ P.unitframe = {
 			height = 54,
 			lowmana = 30,
 			threatStyle = 'GLOW',
+			threatPrimary = true,
 			smartAuraPosition = 'DISABLED',
 			colorOverride = 'USE_DEFAULT',
 			disableMouseoverGlow = false,
@@ -1916,6 +1919,8 @@ P.unitframe = {
 			height = 54,
 			orientation = 'RIGHT',
 			threatStyle = 'GLOW',
+			threatPrimary = true,
+			threatPlayer = false,
 			smartAuraPosition = 'DISABLED',
 			colorOverride = 'USE_DEFAULT',
 			middleClickFocus = true,
@@ -1948,6 +1953,7 @@ P.unitframe = {
 		targettarget = {
 			enable = true,
 			threatStyle = 'NONE',
+			threatPrimary = true,
 			orientation = 'MIDDLE',
 			smartAuraPosition = 'DISABLED',
 			colorOverride = 'USE_DEFAULT',
@@ -1973,6 +1979,8 @@ P.unitframe = {
 		focus = {
 			enable = true,
 			threatStyle = 'GLOW',
+			threatPrimary = true,
+			threatPlayer = false,
 			orientation = 'MIDDLE',
 			smartAuraPosition = 'DISABLED',
 			colorOverride = 'USE_DEFAULT',
@@ -2004,6 +2012,7 @@ P.unitframe = {
 			enable = true,
 			orientation = 'MIDDLE',
 			threatStyle = 'GLOW',
+			threatPrimary = true,
 			smartAuraPosition = 'DISABLED',
 			colorOverride = 'USE_DEFAULT',
 			width = 130,
@@ -2032,6 +2041,7 @@ P.unitframe = {
 		boss = {
 			enable = true,
 			threatStyle = 'NONE',
+			threatPrimary = true,
 			growthDirection = 'DOWN',
 			orientation = 'RIGHT',
 			smartAuraPosition = 'DISABLED',
@@ -2098,6 +2108,7 @@ P.unitframe = {
 		party = {
 			enable = true,
 			threatStyle = 'GLOW',
+			threatPrimary = true,
 			orientation = 'LEFT',
 			visibility = '[@raid6,exists][@party1,noexists] hide;show',
 			growthDirection = 'UP_RIGHT',
@@ -2149,6 +2160,7 @@ P.unitframe = {
 			enable = true,
 			orientation = 'LEFT',
 			threatStyle = 'GLOW',
+			threatPrimary = true,
 			colorOverride = 'USE_DEFAULT',
 			middleClickFocus = false,
 			width = 120,
@@ -2817,7 +2829,7 @@ P.actionbar.bar1.paging.ROGUE = '[bonusbar:1] 7;'..(E.Cata and ' [bonusbar:2] 8;
 P.actionbar.bar1.paging.WARLOCK = E.Cata and '[form:1] 7;' or nil
 P.actionbar.bar1.paging.DRUID = '[bonusbar:1,nostealth] 7; [bonusbar:1,stealth] 8; [bonusbar:2] 10; [bonusbar:3] 9; [bonusbar:4] 10;'
 P.actionbar.bar1.paging.EVOKER = '[bonusbar:1] 7;'
-P.actionbar.bar1.paging.PRIEST = '[bonusbar:1] 7;'..(E.Classic and ' [possessbar] 16;' or '')
+P.actionbar.bar1.paging.PRIEST = E.Classic and '[form:1] 7;' or '[bonusbar:1] 7;'
 P.actionbar.bar1.paging.WARRIOR = '[bonusbar:1] 7; [bonusbar:2] 8; [bonusbar:3] 9;'
 
 P.actionbar.bar3.enabled = true
diff --git a/ElvUI/Core/General/API.lua b/ElvUI/Core/General/API.lua
index 49bbbbf9d4..9124299ba2 100644
--- a/ElvUI/Core/General/API.lua
+++ b/ElvUI/Core/General/API.lua
@@ -49,9 +49,6 @@ local GetSpecializationInfo = (E.Classic or E.Cata) and LCS.GetSpecializationInf
 
 local IsAddOnLoaded = (C_AddOns and C_AddOns.IsAddOnLoaded) or IsAddOnLoaded
 
-local C_AddOns_GetAddOnEnableState = C_AddOns and C_AddOns.GetAddOnEnableState
-local GetAddOnEnableState = GetAddOnEnableState -- eventually this will be on C_AddOns and args swap
-
 local C_TooltipInfo_GetUnit = C_TooltipInfo and C_TooltipInfo.GetUnit
 local C_TooltipInfo_GetHyperlink = C_TooltipInfo and C_TooltipInfo.GetHyperlink
 local C_TooltipInfo_GetInventoryItem = C_TooltipInfo and C_TooltipInfo.GetInventoryItem
@@ -443,12 +440,7 @@ do
 end
 
 function E:Dump(object, inspect)
-	if C_AddOns_GetAddOnEnableState then
-		if C_AddOns_GetAddOnEnableState('Blizzard_DebugTools', E.myname) == 0 then
-			E:Print('Blizzard_DebugTools is disabled.')
-			return
-		end
-	elseif GetAddOnEnableState(E.myname, 'Blizzard_DebugTools') == 0 then
+	if not E:IsAddOnEnabled('Blizzard_DebugTools') then
 		E:Print('Blizzard_DebugTools is disabled.')
 		return
 	end
diff --git a/ElvUI/Core/General/Commands.lua b/ElvUI/Core/General/Commands.lua
index 1c1a73be5d..8916c893c9 100644
--- a/ElvUI/Core/General/Commands.lua
+++ b/ElvUI/Core/General/Commands.lua
@@ -2,7 +2,7 @@ local E, L, V, P, G = unpack(ElvUI)
 local DT = E:GetModule('DataTexts')
 local AB = E:GetModule('ActionBars')
 
-local type, pairs, select, tonumber = type, pairs, select, tonumber
+local type, pairs, tonumber = type, pairs, tonumber
 local lower, wipe, next, print = strlower, wipe, next, print
 
 local ReloadUI = ReloadUI
@@ -74,7 +74,18 @@ function E:DisplayCommands()
 	print(L["EHELP_COMMANDS"])
 end
 
+local BLIZZARD_DEPRECATED = {
+	'Blizzard_Deprecated',
+	'Blizzard_DeprecatedCurrencyScript',
+	'Blizzard_DeprecatedGuildScript',
+	'Blizzard_DeprecatedItemScript',
+	'Blizzard_DeprecatedPvpScript',
+	'Blizzard_DeprecatedSoundScript',
+	'Blizzard_DeprecatedSpellScript',
+}
+
 local BLIZZARD_ADDONS = {
+	'Blizzard_AccountSaveUI',
 	'Blizzard_AchievementUI',
 	'Blizzard_AdventureMap',
 	'Blizzard_AlliedRacesUI',
@@ -100,6 +111,7 @@ local BLIZZARD_ADDONS = {
 	'Blizzard_Channels',
 	'Blizzard_CharacterCreate',
 	'Blizzard_CharacterCustomize',
+	'Blizzard_ChatFrameUtil',
 	'Blizzard_ChromieTimeUI',
 	'Blizzard_ClassTalentUI',
 	'Blizzard_ClassTrial',
@@ -121,10 +133,11 @@ local BLIZZARD_ADDONS = {
 	'Blizzard_CUFProfiles',
 	'Blizzard_DeathRecap',
 	'Blizzard_DebugTools',
-	'Blizzard_Deprecated',
+	'Blizzard_Dispatcher',
 	'Blizzard_EncounterJournal',
 	'Blizzard_EventTrace',
 	'Blizzard_ExpansionLandingPage',
+	'Blizzard_ExpansionTrial',
 	'Blizzard_FlightMap',
 	'Blizzard_FrameEffects',
 	'Blizzard_GarrisonTemplates',
@@ -133,7 +146,6 @@ local BLIZZARD_ADDONS = {
 	'Blizzard_GMChatUI',
 	'Blizzard_GuildBankUI',
 	'Blizzard_GuildControlUI',
-	'Blizzard_GuildUI',
 	'Blizzard_HybridMinimap',
 	'Blizzard_InspectUI',
 	'Blizzard_IslandsPartyPoseUI',
@@ -146,6 +158,7 @@ local BLIZZARD_ADDONS = {
 	'Blizzard_MacroUI',
 	'Blizzard_MajorFactions',
 	'Blizzard_MapCanvas',
+	'Blizzard_MatchCelebrationPartyPoseUI',
 	'Blizzard_MawBuffs',
 	'Blizzard_MoneyReceipt',
 	'Blizzard_MovePad',
@@ -156,10 +169,13 @@ local BLIZZARD_ADDONS = {
 	'Blizzard_ObliterumUI',
 	'Blizzard_OrderHallUI',
 	'Blizzard_PartyPoseUI',
+	'Blizzard_PerksProgram',
 	'Blizzard_PetBattleUI',
+	'Blizzard_PingUI',
 	'Blizzard_PlayerChoice',
+	'Blizzard_PlunderstormBasics',
+	'Blizzard_PrivateAurasUI',
 	'Blizzard_Professions',
-	'Blizzard_ProfessionsCrafterOrders',
 	'Blizzard_ProfessionsCustomerOrders',
 	'Blizzard_ProfessionsTemplates',
 	'Blizzard_PTRFeedback',
@@ -171,12 +187,15 @@ local BLIZZARD_ADDONS = {
 	'Blizzard_RuneforgeUI',
 	'Blizzard_ScrappingMachineUI',
 	'Blizzard_SecureTransferUI',
+	'Blizzard_SelectorUI',
+	'Blizzard_Settings',
 	'Blizzard_SharedMapDataProviders',
 	'Blizzard_SharedTalentUI',
-	'Blizzard_SocialUI',
+	'Blizzard_SharedWidgetFrames',
 	'Blizzard_Soulbinds',
 	'Blizzard_StoreUI',
 	'Blizzard_SubscriptionInterstitialUI',
+	'Blizzard_Subtitles',
 	'Blizzard_TalentUI',
 	'Blizzard_TimeManager',
 	'Blizzard_TokenUI',
@@ -189,18 +208,39 @@ local BLIZZARD_ADDONS = {
 	'Blizzard_VoidStorageUI',
 	'Blizzard_WarfrontsPartyPoseUI',
 	'Blizzard_WeeklyRewards',
+	'Blizzard_WeeklyRewardsUtil',
 	'Blizzard_WorldMap',
-	'Blizzard_WowTokenUI'
+	'Blizzard_WowTokenUI',
 }
 
-function E:EnableBlizzardAddOns()
-	for _, addon in pairs(BLIZZARD_ADDONS) do
-		local reason = select(5, GetAddOnInfo(addon))
+function E:DisableBlizzardDeprecated()
+	for _, addon in pairs(BLIZZARD_DEPRECATED) do
+		local enabled = E:IsAddOnEnabled(addon)
+		if enabled then
+			DisableAddOn(addon)
+			E:Print('The following addon was disabled:', addon)
+		end
+	end
+end
+
+do
+	local function Enable(addon)
+		local _, _, _, _, reason = GetAddOnInfo(addon)
 		if reason == 'DISABLED' then
 			EnableAddOn(addon)
 			E:Print('The following addon was re-enabled:', addon)
 		end
 	end
+
+	function E:EnableBlizzardAddOns()
+		for _, addon in pairs(BLIZZARD_ADDONS) do
+			Enable(addon)
+		end
+
+		for _, addon in pairs(BLIZZARD_DEPRECATED) do
+			Enable(addon)
+		end
+	end
 end
 
 function E:DBConvertProfile()
diff --git a/ElvUI/Core/General/Core.lua b/ElvUI/Core/General/Core.lua
index 56ee474a25..eb03cadcb2 100644
--- a/ElvUI/Core/General/Core.lua
+++ b/ElvUI/Core/General/Core.lua
@@ -26,15 +26,12 @@ local UIParent = UIParent
 local UnitFactionGroup = UnitFactionGroup
 local UnitGUID = UnitGUID
 
-local GetSpecialization = (E.Classic or E.Cata) and LCS.GetSpecialization or GetSpecialization
+local GetSpecialization = (E.Classic or E.Wrath) and LCS.GetSpecialization or GetSpecialization
 
 local DisableAddOn = (C_AddOns and C_AddOns.DisableAddOn) or DisableAddOn
 local GetAddOnMetadata = (C_AddOns and C_AddOns.GetAddOnMetadata) or GetAddOnMetadata
 local GetCVarBool = C_CVar.GetCVarBool
 
-local C_AddOns_GetAddOnEnableState = C_AddOns and C_AddOns.GetAddOnEnableState
-local GetAddOnEnableState = GetAddOnEnableState -- eventually this will be on C_AddOns and args swap
-
 local LE_PARTY_CATEGORY_HOME = LE_PARTY_CATEGORY_HOME
 local LE_PARTY_CATEGORY_INSTANCE = LE_PARTY_CATEGORY_INSTANCE
 local C_ChatInfo_SendAddonMessage = C_ChatInfo.SendAddonMessage
@@ -62,7 +59,7 @@ local LSM = E.Libs.LSM
 E.noop = function() end
 E.title = format('%s%s|r', E.InfoColor, 'ElvUI')
 E.toc = tonumber(GetAddOnMetadata('ElvUI', 'X-Interface'))
-E.version, E.versionString = E:ParseVersionString('ElvUI')
+E.version, E.versionString, E.versionDev, E.versionGit = E:ParseVersionString('ElvUI')
 E.myfaction, E.myLocalizedFaction = UnitFactionGroup('player')
 E.myLocalizedClass, E.myclass, E.myClassID = UnitClass('player')
 E.myLocalizedRace, E.myrace, E.myRaceID = UnitRace('player')
@@ -525,14 +522,6 @@ do
 	end
 end
 
-function E:IsAddOnEnabled(addon)
-	if C_AddOns_GetAddOnEnableState then
-		return C_AddOns_GetAddOnEnableState(addon, E.myname) == 2
-	else
-		return GetAddOnEnableState(E.myname, addon) == 2
-	end
-end
-
 function E:IsIncompatible(module, addons)
 	for _, addon in ipairs(addons) do
 		local incompatible
@@ -900,14 +889,12 @@ end
 do
 	local SendMessageWaiting -- only allow 1 delay at a time regardless of eventing
 	function E:SendMessage()
-		if E.version < 99999 then
-			if IsInRaid() then
-				C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, (not IsInRaid(LE_PARTY_CATEGORY_HOME) and IsInRaid(LE_PARTY_CATEGORY_INSTANCE)) and 'INSTANCE_CHAT' or 'RAID')
-			elseif IsInGroup() then
-				C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, (not IsInGroup(LE_PARTY_CATEGORY_HOME) and IsInGroup(LE_PARTY_CATEGORY_INSTANCE)) and 'INSTANCE_CHAT' or 'PARTY')
-			elseif IsInGuild() then
-				C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, 'GUILD')
-			end
+		if IsInRaid() then
+			C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, (not IsInRaid(LE_PARTY_CATEGORY_HOME) and IsInRaid(LE_PARTY_CATEGORY_INSTANCE)) and 'INSTANCE_CHAT' or 'RAID')
+		elseif IsInGroup() then
+			C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, (not IsInGroup(LE_PARTY_CATEGORY_HOME) and IsInGroup(LE_PARTY_CATEGORY_INSTANCE)) and 'INSTANCE_CHAT' or 'PARTY')
+		elseif IsInGuild() then
+			C_ChatInfo_SendAddonMessage('ELVUI_VERSIONCHK', E.version, 'GUILD')
 		end
 
 		SendMessageWaiting = nil
@@ -957,10 +944,10 @@ do
 	_G.C_ChatInfo.RegisterAddonMessagePrefix('ELVUI_VERSIONCHK')
 
 	local f = CreateFrame('Frame')
+	f:SetScript('OnEvent', SendRecieve)
 	f:RegisterEvent('CHAT_MSG_ADDON')
 	f:RegisterEvent('GROUP_ROSTER_UPDATE')
 	f:RegisterEvent('PLAYER_ENTERING_WORLD')
-	f:SetScript('OnEvent', SendRecieve)
 end
 
 function E:UpdateStart(skipCallback, skipUpdateDB)
@@ -1486,7 +1473,7 @@ function E:UpdateActionBars(skipCallback)
 		ActionBars:UpdateExtraButtons()
 	end
 
-	if E.Cata and E.myclass == 'SHAMAN' then
+	if E.Wrath and E.myclass == 'SHAMAN' then
 		ActionBars:UpdateTotemBindings()
 	end
 
@@ -1566,7 +1553,7 @@ function E:UpdateMisc(skipCallback)
 
 	if E.Retail then
 		TotemTracker:PositionAndSize()
-	elseif E.Cata then
+	elseif E.Wrath then
 		ActionBars:PositionAndSizeTotemBar()
 	end
 
@@ -1995,7 +1982,7 @@ function E:Initialize()
 		E:Tutorials()
 	end
 
-	if E.Retail or E.Cata then
+	if E.Retail or E.Wrath or E.ClassicSOD then
 		E.Libs.DualSpec:EnhanceDatabase(E.data, 'ElvUI')
 	end
 
diff --git a/ElvUI/Core/General/Install.lua b/ElvUI/Core/General/Install.lua
index c0f8ed525e..59a2dbf815 100644
--- a/ElvUI/Core/General/Install.lua
+++ b/ElvUI/Core/General/Install.lua
@@ -108,7 +108,7 @@ function E:SetupChat(noDisplayMsg)
 	end
 
 	-- keys taken from `ChatTypeGroup` but doesnt add: 'OPENING', 'TRADESKILLS', 'PET_INFO', 'COMBAT_MISC_INFO', 'COMMUNITIES_CHANNEL', 'PET_BATTLE_COMBAT_LOG', 'PET_BATTLE_INFO', 'TARGETICONS'
-	local chatGroup = { 'SYSTEM', 'CHANNEL', 'SAY', 'EMOTE', 'YELL', 'WHISPER', 'PARTY', 'PARTY_LEADER', 'RAID', 'RAID_LEADER', 'RAID_WARNING', 'INSTANCE_CHAT', 'INSTANCE_CHAT_LEADER', 'GUILD', E.ClassicHC and 'GUILD_DEATHS' or nil, 'OFFICER', 'MONSTER_SAY', 'MONSTER_YELL', 'MONSTER_EMOTE', 'MONSTER_WHISPER', 'MONSTER_BOSS_EMOTE', 'MONSTER_BOSS_WHISPER', 'ERRORS', 'AFK', 'DND', 'IGNORED', 'BG_HORDE', 'BG_ALLIANCE', 'BG_NEUTRAL', 'ACHIEVEMENT', 'GUILD_ACHIEVEMENT', 'BN_WHISPER', 'BN_INLINE_TOAST_ALERT' }
+	local chatGroup = { 'SYSTEM', 'CHANNEL', 'SAY', 'EMOTE', 'YELL', 'WHISPER', 'PARTY', 'PARTY_LEADER', 'RAID', 'RAID_LEADER', 'RAID_WARNING', 'INSTANCE_CHAT', 'INSTANCE_CHAT_LEADER', 'GUILD', 'OFFICER', 'MONSTER_SAY', 'MONSTER_YELL', 'MONSTER_EMOTE', 'MONSTER_WHISPER', 'MONSTER_BOSS_EMOTE', 'MONSTER_BOSS_WHISPER', 'ERRORS', 'AFK', 'DND', 'IGNORED', 'BG_HORDE', 'BG_ALLIANCE', 'BG_NEUTRAL', 'ACHIEVEMENT', 'GUILD_ACHIEVEMENT', 'BN_WHISPER', 'BN_INLINE_TOAST_ALERT' }
 	ChatFrame_RemoveAllMessageGroups(_G.ChatFrame1)
 	for _, v in next, chatGroup do
 		ChatFrame_AddMessageGroup(_G.ChatFrame1, v)
diff --git a/ElvUI/Core/General/ItemLevel.lua b/ElvUI/Core/General/ItemLevel.lua
index 4ec97f4a7f..96edc8771b 100644
--- a/ElvUI/Core/General/ItemLevel.lua
+++ b/ElvUI/Core/General/ItemLevel.lua
@@ -11,14 +11,14 @@ local GetAverageItemLevel = GetAverageItemLevel
 local GetInspectSpecialization = GetInspectSpecialization
 local GetInventoryItemTexture = GetInventoryItemTexture
 local GetInventoryItemLink = GetInventoryItemLink
-local GetItemInfo = GetItemInfo
-local UIParent = UIParent
 local UnitIsUnit = UnitIsUnit
+local UIParent = UIParent
 
 local RETRIEVING_ITEM_INFO = RETRIEVING_ITEM_INFO
 local ITEM_SPELL_TRIGGER_ONEQUIP = ITEM_SPELL_TRIGGER_ONEQUIP
 local ESSENCE_DESCRIPTION = GetSpellDescription(277253)
 
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
 local GetCVarBool = C_CVar.GetCVarBool
 
 local MATCH_ITEM_LEVEL = ITEM_LEVEL:gsub('%%d', '(%%d+)')
diff --git a/ElvUI/Core/General/Tags.lua b/ElvUI/Core/General/Tags.lua
index 8b62cfb765..bbf8310c99 100644
--- a/ElvUI/Core/General/Tags.lua
+++ b/ElvUI/Core/General/Tags.lua
@@ -35,6 +35,7 @@ local QuestDifficultyColors = QuestDifficultyColors
 local UnitBattlePetLevel = UnitBattlePetLevel
 local UnitClassification = UnitClassification
 local UnitDetailedThreatSituation = UnitDetailedThreatSituation
+local UnitThreatPercentageOfLead = UnitThreatPercentageOfLead
 local UnitExists = UnitExists
 local UnitFactionGroup = UnitFactionGroup
 local UnitGetIncomingHeals = UnitGetIncomingHeals
@@ -627,6 +628,13 @@ E:AddTag('realm:dash:translit', 'UNIT_NAME_UPDATE', function(unit)
 	end
 end)
 
+E:AddTag('threat:lead', 'UNIT_THREAT_LIST_UPDATE UNIT_THREAT_SITUATION_UPDATE GROUP_ROSTER_UPDATE', function(unit)
+	local percent = UnitThreatPercentageOfLead('player', unit)
+	if percent and percent > 0 and (IsInGroup() or UnitExists('pet')) then
+		return format('%.0f%%', percent)
+	end
+end)
+
 E:AddTag('threat:percent', 'UNIT_THREAT_LIST_UPDATE UNIT_THREAT_SITUATION_UPDATE GROUP_ROSTER_UPDATE', function(unit)
 	local _, _, percent = UnitDetailedThreatSituation('player', unit)
 	if percent and percent > 0 and (IsInGroup() or UnitExists('pet')) then
@@ -1212,6 +1220,7 @@ do
 					if highestVersion < userVersion then
 						highestVersion = userVersion
 					end
+
 					return (userVersion < highestVersion) and '|cffFF3333E|r' or '|cff3366ffE|r'
 				end
 			end
@@ -1648,6 +1657,7 @@ E.TagInfo = {
 	-- Threat
 		['threat:current'] = { category = 'Threat', description = "Displays the current threat as a value" },
 		['threat:percent'] = { category = 'Threat', description = "Displays the current threat as a percent" },
+		['threat:lead'] = { category = 'Threat', description = "Displays the current threat of lead as a percent" },
 		['threat'] = { category = 'Threat', description = "Displays the current threat situation (Aggro is secure tanking, -- is losing threat and ++ is gaining threat)" },
 }
 
diff --git a/ElvUI/Core/Modules/ActionBars/MicroBar.lua b/ElvUI/Core/Modules/ActionBars/MicroBar.lua
index b138632eb9..1731e0a792 100644
--- a/ElvUI/Core/Modules/ActionBars/MicroBar.lua
+++ b/ElvUI/Core/Modules/ActionBars/MicroBar.lua
@@ -8,7 +8,6 @@ local gsub = gsub
 local assert = assert
 local unpack = unpack
 local tinsert = tinsert
-local strfind = strfind
 local CreateFrame = CreateFrame
 local UpdateMicroButtonsParent = UpdateMicroButtonsParent
 local RegisterStateDriver = RegisterStateDriver
diff --git a/ElvUI/Core/Modules/Auras/Auras.lua b/ElvUI/Core/Modules/Auras/Auras.lua
index b63063a636..4d4ca4915f 100644
--- a/ElvUI/Core/Modules/Auras/Auras.lua
+++ b/ElvUI/Core/Modules/Auras/Auras.lua
@@ -9,7 +9,6 @@ local format, tinsert, next = format, tinsert, next
 local select, unpack, strmatch = select, unpack, strmatch
 local GetInventoryItemQuality = GetInventoryItemQuality
 local GetInventoryItemTexture = GetInventoryItemTexture
-local GetItemQualityColor = GetItemQualityColor
 local GetWeaponEnchantInfo = GetWeaponEnchantInfo
 local RegisterAttributeDriver = RegisterAttributeDriver
 local SecureHandlerSetFrameRef = SecureHandlerSetFrameRef
@@ -20,6 +19,8 @@ local CreateFrame = CreateFrame
 local UIParent = UIParent
 local GetTime = GetTime
 
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+
 local Masque = E.Masque
 local MasqueGroupBuffs = Masque and Masque:Group('ElvUI', 'Buffs')
 local MasqueGroupDebuffs = Masque and Masque:Group('ElvUI', 'Debuffs')
diff --git a/ElvUI/Core/Modules/Bags/Bags.lua b/ElvUI/Core/Modules/Bags/Bags.lua
index ec5ade3a78..a748d09add 100644
--- a/ElvUI/Core/Modules/Bags/Bags.lua
+++ b/ElvUI/Core/Modules/Bags/Bags.lua
@@ -21,9 +21,6 @@ local GameTooltip_Hide = GameTooltip_Hide
 local GetBindingKey = GetBindingKey
 local GetCursorMoney = GetCursorMoney
 local GetInventoryItemTexture = GetInventoryItemTexture
-local GetItemInfo = GetItemInfo
-local GetItemQualityColor = GetItemQualityColor
-local GetItemSpell = GetItemSpell
 local GetKeyRingSize = GetKeyRingSize
 local GetMoney = GetMoney
 local GetNumBankSlots = GetNumBankSlots
@@ -67,23 +64,26 @@ local C_NewItems_RemoveNewItem = C_NewItems.RemoveNewItem
 local C_Item_IsBound = C_Item.IsBound
 
 local GetCVarBool = C_CVar.GetCVarBool
-local SetCurrencyBackpack = SetCurrencyBackpack or (C_CurrencyInfo and C_CurrencyInfo.SetCurrencyBackpack)
-local SortBags = SortBags or (C_Container and C_Container.SortBags)
-local SortBankBags = SortBankBags or (C_Container and C_Container.SortBankBags)
-local SortReagentBankBags = SortReagentBankBags or (C_Container and C_Container.SortReagentBankBags)
-local SplitContainerItem = SplitContainerItem or (C_Container and C_Container.SplitContainerItem)
-local SetItemSearch = SetItemSearch or (C_Container and C_Container.SetItemSearch)
-local GetBagSlotFlag = GetBagSlotFlag or (C_Container and C_Container.GetBagSlotFlag)
-local SetBagSlotFlag = SetBagSlotFlag or (C_Container and C_Container.SetBagSlotFlag)
-local ContainerIDToInventoryID = ContainerIDToInventoryID or (C_Container and C_Container.ContainerIDToInventoryID)
-local GetBackpackAutosortDisabled = GetBackpackAutosortDisabled or (C_Container and C_Container.GetBackpackAutosortDisabled)
-local GetBankAutosortDisabled = GetBankAutosortDisabled or (C_Container and C_Container.GetBankAutosortDisabled)
-local GetContainerItemCooldown = GetContainerItemCooldown or (C_Container and C_Container.GetContainerItemCooldown)
-local GetContainerNumFreeSlots = GetContainerNumFreeSlots or (C_Container and C_Container.GetContainerNumFreeSlots)
-local GetContainerNumSlots = GetContainerNumSlots or (C_Container and C_Container.GetContainerNumSlots)
-local SetBackpackAutosortDisabled = SetBackpackAutosortDisabled or (C_Container and C_Container.SetBackpackAutosortDisabled)
-local SetInsertItemsLeftToRight = SetInsertItemsLeftToRight or (C_Container and C_Container.SetInsertItemsLeftToRight)
-local UseContainerItem = UseContainerItem or (C_Container and C_Container.UseContainerItem)
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemSpell = (C_Item and C_Item.GetItemSpell) or GetItemSpell
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+local SetCurrencyBackpack = (C_CurrencyInfo and C_CurrencyInfo.SetCurrencyBackpack) or SetCurrencyBackpack
+local SortBags = (C_Container and C_Container.SortBags) or SortBags
+local SortBankBags = (C_Container and C_Container.SortBankBags) or SortBankBags
+local SortReagentBankBags = (C_Container and C_Container.SortReagentBankBags) or SortReagentBankBags
+local SplitContainerItem = (C_Container and C_Container.SplitContainerItem) or SplitContainerItem
+local SetItemSearch = (C_Container and C_Container.SetItemSearch) or SetItemSearch
+local GetBagSlotFlag = (C_Container and C_Container.GetBagSlotFlag) or GetBagSlotFlag
+local SetBagSlotFlag = (C_Container and C_Container.SetBagSlotFlag) or SetBagSlotFlag
+local ContainerIDToInventoryID = (C_Container and C_Container.ContainerIDToInventoryID) or ContainerIDToInventoryID
+local GetBackpackAutosortDisabled = (C_Container and C_Container.GetBackpackAutosortDisabled) or GetBackpackAutosortDisabled
+local GetBankAutosortDisabled = (C_Container and C_Container.GetBankAutosortDisabled) or GetBankAutosortDisabled
+local GetContainerItemCooldown = (C_Container and C_Container.GetContainerItemCooldown) or GetContainerItemCooldown
+local GetContainerNumFreeSlots = (C_Container and C_Container.GetContainerNumFreeSlots) or GetContainerNumFreeSlots
+local GetContainerNumSlots = (C_Container and C_Container.GetContainerNumSlots) or GetContainerNumSlots
+local SetBackpackAutosortDisabled = (C_Container and C_Container.SetBackpackAutosortDisabled) or SetBackpackAutosortDisabled
+local SetInsertItemsLeftToRight = (C_Container and C_Container.SetInsertItemsLeftToRight) or SetInsertItemsLeftToRight
+local UseContainerItem = (C_Container and C_Container.UseContainerItem) or UseContainerItem
 
 local CONTAINER_OFFSET_X, CONTAINER_OFFSET_Y = CONTAINER_OFFSET_X, CONTAINER_OFFSET_Y
 local IG_BACKPACK_CLOSE = SOUNDKIT.IG_BACKPACK_CLOSE
@@ -1468,7 +1468,7 @@ function B:VendorGrayCheck()
 	local value = B:GetGraysValue()
 	if value == 0 then
 		E:Print(L["No gray items to delete."])
-	elseif not _G.MerchantFrame:IsShown() and not E.Retail then
+	elseif not _G.MerchantFrame:IsShown() and E.Wrath then
 		E.PopupDialogs.DELETE_GRAYS.Money = value
 		E:StaticPopup_Show('DELETE_GRAYS')
 	else
diff --git a/ElvUI/Core/Modules/Bags/Sort.lua b/ElvUI/Core/Modules/Bags/Sort.lua
index 310a024c5f..db4b7310eb 100644
--- a/ElvUI/Core/Modules/Bags/Sort.lua
+++ b/ElvUI/Core/Modules/Bags/Sort.lua
@@ -12,8 +12,6 @@ local GetGuildBankItemInfo = GetGuildBankItemInfo
 local GetGuildBankItemLink = GetGuildBankItemLink
 local GetGuildBankTabInfo = GetGuildBankTabInfo
 local GetInventoryItemLink = GetInventoryItemLink
-local GetItemFamily = GetItemFamily
-local GetItemInfo = GetItemInfo
 local GetTime = GetTime
 local InCombatLockdown = InCombatLockdown
 local PickupGuildBankItem = PickupGuildBankItem
@@ -35,14 +33,16 @@ local FILTER_FLAG_QUEST = (BagSlotFlags and BagSlotFlags.PriorityQuestItems) or
 local ItemClass_Armor = Enum.ItemClass.Armor
 local ItemClass_Weapon = Enum.ItemClass.Weapon
 
-local C_PetJournalGetPetInfoBySpeciesID = C_PetJournal and C_PetJournal.GetPetInfoBySpeciesID
-local ContainerIDToInventoryID = ContainerIDToInventoryID or (C_Container and C_Container.ContainerIDToInventoryID)
-local GetContainerItemID = GetContainerItemID or (C_Container and C_Container.GetContainerItemID)
-local GetContainerItemLink = GetContainerItemLink or (C_Container and C_Container.GetContainerItemLink)
-local GetContainerNumFreeSlots = GetContainerNumFreeSlots or (C_Container and C_Container.GetContainerNumFreeSlots)
-local GetContainerNumSlots = GetContainerNumSlots or (C_Container and C_Container.GetContainerNumSlots)
-local PickupContainerItem = PickupContainerItem or (C_Container and C_Container.PickupContainerItem)
-local SplitContainerItem = SplitContainerItem or (C_Container and C_Container.SplitContainerItem)
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemFamily = (C_Item and C_Item.GetItemFamily) or GetItemFamily
+local GetPetInfoBySpeciesID = C_PetJournal and C_PetJournal.GetPetInfoBySpeciesID
+local ContainerIDToInventoryID = (C_Container and C_Container.ContainerIDToInventoryID) or ContainerIDToInventoryID
+local GetContainerItemID = (C_Container and C_Container.GetContainerItemID) or GetContainerItemID
+local GetContainerItemLink = (C_Container and C_Container.GetContainerItemLink) or GetContainerItemLink
+local GetContainerNumFreeSlots = (C_Container and C_Container.GetContainerNumFreeSlots) or GetContainerNumFreeSlots
+local GetContainerNumSlots = (C_Container and C_Container.GetContainerNumSlots) or GetContainerNumSlots
+local PickupContainerItem = (C_Container and C_Container.PickupContainerItem) or PickupContainerItem
+local SplitContainerItem = (C_Container and C_Container.SplitContainerItem) or SplitContainerItem
 
 local guildBags = {51,52,53,54,55,56,57,58}
 local bankBags = {BANK_CONTAINER}
@@ -280,8 +280,8 @@ local function DefaultSort(a, b)
 	if not aID or not bID then return aID end
 
 	if E.Retail and bagPetIDs[a] and bagPetIDs[b] then
-		local aName, _, aType = C_PetJournalGetPetInfoBySpeciesID(aID)
-		local bName, _, bType = C_PetJournalGetPetInfoBySpeciesID(bID)
+		local aName, _, aType = GetPetInfoBySpeciesID(aID)
+		local bName, _, bType = GetPetInfoBySpeciesID(bID)
 
 		if aType and bType and aType ~= bType then
 			return aType > bType
diff --git a/ElvUI/Core/Modules/Blizzard/GuildBank.lua b/ElvUI/Core/Modules/Blizzard/GuildBank.lua
index 2f139dc6a5..01173f848d 100644
--- a/ElvUI/Core/Modules/Blizzard/GuildBank.lua
+++ b/ElvUI/Core/Modules/Blizzard/GuildBank.lua
@@ -6,10 +6,11 @@ local LSM = E.Libs.LSM
 local _G = _G
 local hooksecurefunc = hooksecurefunc
 local GetCurrentGuildBankTab = GetCurrentGuildBankTab
-local GetDetailedItemLevelInfo = GetDetailedItemLevelInfo
 local GetGuildBankItemLink = GetGuildBankItemLink
-local GetItemQualityColor = GetItemQualityColor
-local GetItemInfo = GetItemInfo
+
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+local GetDetailedItemLevelInfo = (C_Item and C_Item.GetDetailedItemLevelInfo) or GetDetailedItemLevelInfo
 
 local NUM_SLOTS_PER_GUILDBANK_GROUP = 14
 local NUM_GUILDBANK_COLUMNS = 7
diff --git a/ElvUI/Core/Modules/Chat/Chat.lua b/ElvUI/Core/Modules/Chat/Chat.lua
index 6736abcca3..3c58bf8d76 100644
--- a/ElvUI/Core/Modules/Chat/Chat.lua
+++ b/ElvUI/Core/Modules/Chat/Chat.lua
@@ -150,7 +150,6 @@ local historyTypes = { -- most of these events are set in FindURL_Events, this i
 	CHAT_MSG_BN_WHISPER_INFORM	= 'WHISPER',
 	CHAT_MSG_GUILD				= 'GUILD',
 	CHAT_MSG_GUILD_ACHIEVEMENT	= 'GUILD',
-	CHAT_MSG_GUILD_DEATHS 		= E.ClassicHC and 'GUILD' or nil,
 	CHAT_MSG_PARTY			= 'PARTY',
 	CHAT_MSG_PARTY_LEADER	= 'PARTY',
 	CHAT_MSG_RAID			= 'RAID',
@@ -165,7 +164,7 @@ local historyTypes = { -- most of these events are set in FindURL_Events, this i
 	CHAT_MSG_EMOTE			= 'EMOTE' -- this never worked, check it sometime
 }
 
-if not (E.Retail or E.Cata) then
+if not (E.Retail or E.Wrath) then
 	CH.BNGetFriendInfo = _G.BNGetFriendInfo
 	CH.BNGetFriendInfoByID = _G.BNGetFriendInfoByID
 	CH.BNGetFriendGameAccountInfo = _G.BNGetFriendGameAccountInfo
@@ -310,8 +309,8 @@ do --this can save some main file locals
 		local MelColors = function(t) return specialText(t, 0.98,0.31,0.43, 0.97,0.78,0.13, 0.31,0.76,0.43, 0.49,0.48,0.97, 0.07,0.69,0.92) end
 		--Thradex: summer without you
 		local ThradexColors = function(t) return specialText(t, 0.00,0.60,0.09, 0.22,0.65,0.90, 0.22,0.65,0.90, 1.00,0.74,0.27, 1.00,0.66,0.00, 1.00,0.50,0.20, 0.92,0.31,0.23) end
-		--Repooc: Monk, Demon Hunter, Paladin, Warlock colors
-		local PoocsColors = function(t) return specialText(t, 0,1,0.6, 0.64,0.19,0.79, 0.96,0.55,0.73, 0.53,0.53,0.93) end
+		--Repooc: Something to change it up a little
+		local PoocsColors = function(t) return specialText(t, 0.9,0.8,0.5) end
 
 		itsSimpy = function() return ElvSimpy, SimpyColors end
 		itsElv = function() return ElvBlue, ElvColors end
@@ -324,196 +323,201 @@ do --this can save some main file locals
 	local z = {}
 	specialChatIcons = z
 
-	if E.Classic then
-		-- Simpy (5099: Myzrael)
-		z['Player-5099-01947A77']	= itsSimpy -- Warlock: Simpy
-		-- Luckyone Seasonal (5826: Lone Wolf EU)
-		z['Player-5826-0202765F']	= ElvBlue -- [Alliance] Hunter
-		z['Player-5826-020F7F10']	= ElvBlue -- [Alliance] Paladin
-		z['Player-5826-02172E79']	= ElvBlue -- [Alliance] Warlock
-		z['Player-5826-0234253E']	= ElvBlue -- [Alliance] Mage
-		z['Player-5826-02342508']	= ElvBlue -- [Alliance] Priest
-		z['Player-5826-023424EF']	= ElvBlue -- [Alliance] Druid
-		z['Player-5826-02342520']	= ElvBlue -- [Alliance] Rogue
-		z['Player-5826-02342556']	= ElvBlue -- [Alliance] Warrior
-		-- Luckyone Hardcore
-		z["Lucky-Nek'Rosh"]			= ElvBlue -- [Horde] Rogue
-		z["Luckyone-Nek'Rosh"]		= ElvBlue -- [Horde] Hunter
-		z["Unluckyone-Nek'Rosh"] 	= ElvBlue -- [Horde] Mage
-		z["Gigachad-Nek'Rosh"] 		= ElvBlue -- [Horde] Druid
-		-- Luckyone Classic Era (5233: Firemaw)
-		z['Player-5233-01D22A72']	= ElvBlue -- [Horde] Hunter: Unluckyone
-		z['Player-5233-01D27011']	= ElvBlue -- [Horde] Druid: Luckydruid
-	elseif E.Cata then
-		-- Temp
-		z['Player-4618-002BC7AB'] 	= ElvBlue -- Beta Testing
-		-- Simpy (4373: Myzrael)
-		z['Player-4373-011657A7']	= itsSimpy -- Paladin:		Cutepally
-		z['Player-4373-032FFEE2']	= itsSimpy -- Shaman:		Kalline
-		z['Player-4373-03351BC7']	= itsSimpy -- [Horde] DK:	Imsojelly
-		-- Luckyone (4467: Firemaw, 4440: Everlook, 4476: Gehennas)
-		z['Player-4467-04540395']	= ElvBlue -- [Alliance] Druid
-		z['Player-4467-04542B4A']	= ElvBlue -- [Alliance] Priest
-		z['Player-4467-04571AA2']	= ElvBlue -- [Alliance] Warlock
-		z['Player-4467-04571A8D']	= ElvBlue -- [Alliance] DK
-		z['Player-4467-04571A9F']	= ElvBlue -- [Alliance] Mage
-		z['Player-4467-04571A98']	= ElvBlue -- [Alliance] Warrior
-		z['Player-4467-04571911']	= ElvBlue -- [Alliance] Paladin
-		z['Player-4440-03AD654A']	= ElvBlue -- [Alliance] Rogue
-		z['Player-4440-03ADE2DF']	= ElvBlue -- [Alliance] Shaman
-		z['Player-4476-03BF41C9']	= ElvBlue -- [Horde] Hunter
-		-- Repooc
-		z['Poocsdk-Mankrik']		= ElvBlue -- [Horde] DK
-		z['Repooc-Mankrik']			= ElvBlue
-	elseif E.Retail then
-		-- Elv
-		z['Elv-Spirestone']			= itsElv
-		z['Elvz-Spirestone']		= itsElv
-		z['Fleshlite-Spirestone']	= itsElv
-		z['Elvidan-Spirestone']		= itsElv
-		z['Elvilas-Spirestone']		= itsElv
-		z['Fraku-Spirestone']		= itsElv
-		z['Jarvix-Spirestone']		= itsElv
-		z['Watermelon-Spirestone']	= itsElv
-		z['Zinxbe-Spirestone']		= itsElv
-		z['Whorlock-Spirestone']	= itsElv
-		-- Blazeflack
-		z['Blazii-Silvermoon']		= ElvBlue -- Priest
-		z['Chazii-Silvermoon']		= ElvBlue -- Shaman
-		-- Merathilis (1401: Shattrath/Garrosh)
-		z['Player-1401-04217BB2']	= ElvPurple	-- [Alliance] Warlock:	Asragoth
-		z['Player-1401-0421EB9F']	= ElvBlue	-- [Alliance] Warrior:	Brìtt
-		z['Player-1401-0421F909']	= ElvRed	-- [Alliance] Paladin:	Damará
-		z['Player-1401-0421EC36']	= ElvBlue	-- [Alliance] Priest:	Jazira
-		z['Player-1401-041CD0A6']	= ElvYellow	-- [Alliance] Rogue:	Jústice
-		z['Player-1401-041E4D64']	= ElvGreen	-- [Alliance] Monk:		Maithilis
-		z['Player-1401-0648F4AD']	= ElvPurple	-- [Alliance] DH:		Mattdemôn
-		z['Player-1401-0421F27B']	= ElvBlue	-- [Alliance] Mage:		Melisendra
-		z['Player-1401-04221546']	= ElvOrange	-- [Alliance] Druid:	Merathilis
-		z['Player-1401-04221344']	= ElvBlue	-- [Alliance] Shaman:	Merathilîs
-		z['Player-1401-0A80006F']	= ElvBlue	-- [Alliance] Shaman:	Ronan
-		z['Player-1401-0A4C8DF4']	= ElvGreen	-- [Alliance] Evoker:	Meravoker
-		z['Player-1401-041C0AE2']	= ElvGreen	-- [Alliance] Hunter:	Róhal
-		z['Player-1401-05CEABFA']	= ElvRed	-- [Alliance] DK:		Jahzzy
-		-- Luckyone (1598: LaughingSkull)
-		z['Player-1598-0F5E4639']	= ElvBlue -- [Alliance] Druid: Luckyone
-		z['Player-1598-0F3E51B0']	= ElvBlue -- [Alliance] Druid: Luckydruid
-		z['Player-1598-0F46FF5A']	= ElvBlue -- [Horde] Evoker
-		z['Player-1598-0BFF3341']	= ElvBlue -- [Horde] DH
-		z['Player-1598-0BD22704']	= ElvBlue -- [Horde] Priest
-		z['Player-1598-0BEFA545']	= ElvBlue -- [Horde] Monk
-		z['Player-1598-0E1A06DE']	= ElvBlue -- [Horde] Rogue
-		z['Player-1598-0BF2E377']	= ElvBlue -- [Horde] Hunter
-		z['Player-1598-0BF18248']	= ElvBlue -- [Horde] DK
-		z['Player-1598-0BFABB95']	= ElvBlue -- [Horde] Mage
-		z['Player-1598-0E67511D']	= ElvBlue -- [Horde] Paladin
-		z['Player-1598-0C0DD01B']	= ElvBlue -- [Horde] Warlock
-		z['Player-1598-0BF8013A']	= ElvBlue -- [Horde] Warrior
-		z['Player-1598-0BF56103']	= ElvBlue -- [Horde] Shaman
-		-- Repooc
-		z['Sifpooc-Stormrage']		= itsPooc	-- [Alliance] DH
-		z['Fragmented-Stormrage']	= itsPooc	-- [Alliance] Warlock
-		z['Dapooc-Stormrage']		= itsPooc	-- [Alliance] Druid
-		z['Poocvoker-Stormrage']	= itsPooc	-- [Alliance] Evoker
-		z['Sifupooc-Stormrage']		= itsPooc	-- [Alliance] Monk
-		z['Pooc-Stormrage']			= itsPooc	-- [Alliance] Paladin
-		z['Repøøc-Stormrage']		= itsPooc	-- [Alliance] Shaman
-		-- Simpy (1168: Cenarius, 125: Cenarion Circle)
-		z['Player-1168-069A1283']	= itsSimpy -- Hunter:	Arieva
-		z['Player-1168-0698394A']	= itsSimpy -- Rogue:	Buddercup
-		z['Player-1168-069A3A12']	= itsSimpy -- Paladin:	Cutepally
-		z['Player-1168-0A99F54B']	= itsSimpy -- Mage:		Cuddle
-		z['Player-1168-0680170F']	= itsSimpy -- DK:		Ezek
-		z['Player-1168-06981C6F']	= itsSimpy -- Warrior:	Glice
-		z['Player-1168-0698066B']	= itsSimpy -- Shaman:	Kalline
-		z['Player-1168-06989ADF']	= itsSimpy -- Druid:	Puttietat
-		z['Player-1168-069837CD']	= itsSimpy -- Warlock:	Simpy
-		z['Player-1168-06984CD4']	= itsSimpy -- Monk:		Twigly
-		z['Player-1168-0A98C560']	= itsSimpy -- [Horde] Evoker:	Imsofire
-		z['Player-1168-090A34ED']	= itsSimpy -- [Horde] Shaman:	Imsobeefy
-		z['Player-1168-090A34E6']	= itsSimpy -- [Horde] Priest:	Imsocheesy
-		z['Player-1168-069838E1']	= itsSimpy -- [Horde] DK:		Imsojelly
-		z['Player-1168-0870FBCE']	= itsSimpy -- [Horde] Druid:	Imsojuicy
-		z['Player-1168-07C00783']	= itsSimpy -- [Horde] DH:		Imsopeachy
-		z['Player-1168-07B41C4C']	= itsSimpy -- [Horde] Paladin:	Imsosalty
-		z['Player-1168-0870F320']	= itsSimpy -- [Horde] Mage:		Imsospicy
-		z['Player-1168-0A395531']	= itsSimpy -- [Horde] Hunter:	Imsonutty
-		z['Player-1168-0A395540']	= itsSimpy -- [Horde] Monk:		Imsotasty
-		z['Player-1168-0A39554F']	= itsSimpy -- [Horde] Warlock:	Imsosaucy
-		z['Player-1168-0A395551']	= itsSimpy -- [Horde] Rogue:	Imsodrippy
-		z['Player-125-0A62DE05']	= itsSimpy -- [RP] Evoker:	Lumee
-		z['Player-125-09A7F9ED']	= itsSimpy -- [RP] Warrior:	Bunne
-		z['Player-125-09A8CC43']	= itsSimpy -- [RP] Monk:	Loppie
-		z['Player-125-09A7EB72']	= itsSimpy -- [RP] Mage:	Loppybunny
-		z['Player-125-09A7DAD9']	= itsSimpy -- [RP] DH:		Rubee
-		z['Player-125-09A8E282']	= itsSimpy -- [RP] Priest:	Wennie
-		-- Melbelle (Simpys Bestie)
-		z['Melbelle-Bladefist']		= itsMel -- Hunter
-		z['Deathchaser-Bladefist']	= itsMel -- DH
-		z['Alyosha-Cenarius']		= itsMel -- Warrior
-		z['Dãwn-Cenarius']			= itsMel -- Paladin
-		z['Faelen-Cenarius']		= itsMel -- Rogue
-		z['Freckles-Cenarius']		= itsMel -- DK
-		z['Lõvi-Cenarius']			= itsMel -- Priest
-		z['Melbelle-Cenarius']		= itsMel -- Druid
-		z['Perìwìnkle-Cenarius']	= itsMel -- Shaman
-		z['Pìper-Cenarius']			= itsMel -- Warlock
-		z['Spãrkles-Cenarius']		= itsMel -- Mage
-		z['Mellybear-Cenarius']		= itsMel -- Hunter
-		z['Zuria-Cenarius']			= itsMel -- DH
-		z['Tinybubbles-Cenarius']	= itsMel -- Monk
-		z['Alykat-Cenarius']		= itsMel -- [Horde] Druid
-		z['Alybones-Cenarius']		= itsMel -- [Horde] DK
-		z['Alyfreeze-Cenarius']		= itsMel -- [Horde] Mage
-		z['Alykins-Cenarius']		= itsMel -- [Horde] DH
-		z['Alyrage-Cenarius']		= itsMel -- [Horde] Warrior
-		z['Alysneaks-Cenarius']		= itsMel -- [Horde] Rogue
-		z['Alytotes-Cenarius']		= itsMel -- [Horde] Shaman
-		-- Thradex (Simpys Buddy)
-		z['Foam-Area52']			= itsThradex -- Horde
-		z['Gur-Area52']				= itsThradex -- Horde
-		z['Archmage-Area52']		= itsThradex -- Horde
-		z['Counselor-Area52']		= itsThradex -- Horde
-		z['Psychiatrist-Area52']	= itsThradex -- Horde
-		z['Monk-CenarionCircle']	= itsThradex
-		z['Thradex-Stormrage']		= itsThradex
-		z['Wrecked-Stormrage']		= itsThradex
-		z['Tb-Stormrage']			= itsThradex
-		-- AcidWeb
-		z['Livarax-BurningLegion']		= Gem
-		z['Filevandrel-BurningLegion']	= Gem
-		z['Akavaya-BurningLegion']		= Gem
-		z['Athyneos-BurningLegion']		= Gem
-		-- Affinity
-		z['Affinichi-Illidan']		= Bathrobe
-		z['Affinitii-Illidan']		= Bathrobe
-		z['Affinity-Illidan']		= Bathrobe
-		z['Uplift-Illidan']			= Bathrobe
-		-- Tirain (NOTE: lol)
-		z['Tierone-Spirestone']		= TyroneBiggums
-		z['Tirain-Spirestone']		= TyroneBiggums
-		z['Sinth-Spirestone']		= TyroneBiggums
-		z['Tee-Spirestone']			= TyroneBiggums
-		z['Teepac-Area52']			= TyroneBiggums
-		z['Teekettle-Area52']		= TyroneBiggums
-		-- Mis (NOTE: I will forever have the picture you accidently shared of the manikin wearing a strapon burned in my brain)
-		z['Twunk-Area52']			= itsMis
-		z['Twunkie-Area52']			= itsMis
-		z['Misoracle-Area52']		= itsMis
-		z['Mismayhem-Area52']		= itsMis
-		z['Misdîrect-Area52']		= itsMis
-		z['Misdecay-Area52']		= itsMis
-		z['Mislust-Area52'] 		= itsMis
-		z['Misdivine-Area52']		= itsMis
-		z['Mislight-Area52']		= itsMis
-		z['Misillidan-Spirestone']	= itsMis
-		z['Mispel-Spirestone']		= itsMis
-		--Bladesdruid
-		z['Bladedemonz-Spirestone']	= SuperBear
-		z['Bladesdruid-Spirestone']	= SuperBear
-		z['Rollerblade-Spirestone']	= SuperBear
-		--Bozaum
-		z['Bozaum-Spirestone']		= Beer
+	local portal = GetCVar('portal')
+	if portal == 'US' then
+		if E.Classic then
+			-- Simpy (5099: Myzrael)
+			z['Player-5099-01947A77']	= itsSimpy -- Warlock: Simpy
+		elseif E.Wrath then
+			-- Simpy (4373: Myzrael)
+			z['Player-4373-011657A7']	= itsSimpy -- Paladin:		Cutepally
+			z['Player-4373-032FFEE2']	= itsSimpy -- Shaman:		Kalline
+			z['Player-4373-03351BC7']	= itsSimpy -- [Horde] DK:	Imsojelly
+			-- Repooc
+			z['Poocsdk-Mankrik']		= ElvBlue -- [Horde] DK
+			z['Repooc-Mankrik']			= ElvBlue
+		elseif E.Retail then
+			-- Elv
+			z['Elv-Spirestone']			= itsElv
+			z['Elvz-Spirestone']		= itsElv
+			z['Fleshlite-Spirestone']	= itsElv
+			z['Elvidan-Spirestone']		= itsElv
+			z['Elvilas-Spirestone']		= itsElv
+			z['Fraku-Spirestone']		= itsElv
+			z['Jarvix-Spirestone']		= itsElv
+			z['Watermelon-Spirestone']	= itsElv
+			z['Zinxbe-Spirestone']		= itsElv
+			z['Whorlock-Spirestone']	= itsElv
+			-- Repooc
+			z['Sifpooc-Stormrage']		= itsPooc	-- [Alliance] DH
+			z['Fragmented-Stormrage']	= itsPooc	-- [Alliance] Warlock
+			z['Dapooc-Stormrage']		= itsPooc	-- [Alliance] Druid
+			z['Poocvoker-Stormrage']	= itsPooc	-- [Alliance] Evoker
+			z['Sifupooc-Stormrage']		= itsPooc	-- [Alliance] Monk
+			z['Pooc-Stormrage']			= itsPooc	-- [Alliance] Paladin
+			z['Repøøc-Stormrage']		= itsPooc	-- [Alliance] Shaman
+			-- Simpy (1168: Cenarius, 125: Cenarion Circle)
+			z['Player-1168-069A1283']	= itsSimpy -- Hunter:	Arieva
+			z['Player-1168-0698394A']	= itsSimpy -- Rogue:	Buddercup
+			z['Player-1168-069A3A12']	= itsSimpy -- Paladin:	Cutepally
+			z['Player-1168-0A99F54B']	= itsSimpy -- Mage:		Cuddle
+			z['Player-1168-0680170F']	= itsSimpy -- DK:		Ezek
+			z['Player-1168-06981C6F']	= itsSimpy -- Warrior:	Glice
+			z['Player-1168-0698066B']	= itsSimpy -- Shaman:	Kalline
+			z['Player-1168-06989ADF']	= itsSimpy -- Druid:	Puttietat
+			z['Player-1168-069837CD']	= itsSimpy -- Warlock:	Simpy
+			z['Player-1168-06984CD4']	= itsSimpy -- Monk:		Twigly
+			z['Player-1168-0A98C560']	= itsSimpy -- [Horde] Evoker:	Imsofire
+			z['Player-1168-090A34ED']	= itsSimpy -- [Horde] Shaman:	Imsobeefy
+			z['Player-1168-090A34E6']	= itsSimpy -- [Horde] Priest:	Imsocheesy
+			z['Player-1168-069838E1']	= itsSimpy -- [Horde] DK:		Imsojelly
+			z['Player-1168-0870FBCE']	= itsSimpy -- [Horde] Druid:	Imsojuicy
+			z['Player-1168-07C00783']	= itsSimpy -- [Horde] DH:		Imsopeachy
+			z['Player-1168-07B41C4C']	= itsSimpy -- [Horde] Paladin:	Imsosalty
+			z['Player-1168-0870F320']	= itsSimpy -- [Horde] Mage:		Imsospicy
+			z['Player-1168-0A395531']	= itsSimpy -- [Horde] Hunter:	Imsonutty
+			z['Player-1168-0A395540']	= itsSimpy -- [Horde] Monk:		Imsotasty
+			z['Player-1168-0A39554F']	= itsSimpy -- [Horde] Warlock:	Imsosaucy
+			z['Player-1168-0A395551']	= itsSimpy -- [Horde] Rogue:	Imsodrippy
+			z['Player-125-0A62DE05']	= itsSimpy -- [RP] Evoker:	Lumee
+			z['Player-125-09A7F9ED']	= itsSimpy -- [RP] Warrior:	Bunne
+			z['Player-125-09A8CC43']	= itsSimpy -- [RP] Monk:	Loppie
+			z['Player-125-09A7EB72']	= itsSimpy -- [RP] Mage:	Loppybunny
+			z['Player-125-09A7DAD9']	= itsSimpy -- [RP] DH:		Rubee
+			z['Player-125-09A8E282']	= itsSimpy -- [RP] Priest:	Wennie
+			-- Melbelle (Simpys Bestie)
+			z['Melbelle-Bladefist']		= itsMel -- Hunter
+			z['Deathchaser-Bladefist']	= itsMel -- DH
+			z['Alyosha-Cenarius']		= itsMel -- Warrior
+			z['Dãwn-Cenarius']			= itsMel -- Paladin
+			z['Faelen-Cenarius']		= itsMel -- Rogue
+			z['Freckles-Cenarius']		= itsMel -- DK
+			z['Lõvi-Cenarius']			= itsMel -- Priest
+			z['Melbelle-Cenarius']		= itsMel -- Druid
+			z['Perìwìnkle-Cenarius']	= itsMel -- Shaman
+			z['Pìper-Cenarius']			= itsMel -- Warlock
+			z['Spãrkles-Cenarius']		= itsMel -- Mage
+			z['Mellybear-Cenarius']		= itsMel -- Hunter
+			z['Zuria-Cenarius']			= itsMel -- DH
+			z['Tinybubbles-Cenarius']	= itsMel -- Monk
+			z['Alykat-Cenarius']		= itsMel -- [Horde] Druid
+			z['Alybones-Cenarius']		= itsMel -- [Horde] DK
+			z['Alyfreeze-Cenarius']		= itsMel -- [Horde] Mage
+			z['Alykins-Cenarius']		= itsMel -- [Horde] DH
+			z['Alyrage-Cenarius']		= itsMel -- [Horde] Warrior
+			z['Alysneaks-Cenarius']		= itsMel -- [Horde] Rogue
+			z['Alytotes-Cenarius']		= itsMel -- [Horde] Shaman
+			-- Thradex (Simpys Buddy)
+			z['Foam-Area52']			= itsThradex -- Horde
+			z['Gur-Area52']				= itsThradex -- Horde
+			z['Archmage-Area52']		= itsThradex -- Horde
+			z['Counselor-Area52']		= itsThradex -- Horde
+			z['Psychiatrist-Area52']	= itsThradex -- Horde
+			z['Monk-CenarionCircle']	= itsThradex
+			z['Thradex-Stormrage']		= itsThradex
+			z['Wrecked-Stormrage']		= itsThradex
+			z['Tb-Stormrage']			= itsThradex
+			-- Affinity
+			z['Affinichi-Illidan']		= Bathrobe
+			z['Affinitii-Illidan']		= Bathrobe
+			z['Affinity-Illidan']		= Bathrobe
+			z['Uplift-Illidan']			= Bathrobe
+			-- Tirain (NOTE: lol)
+			z['Tierone-Spirestone']		= TyroneBiggums
+			z['Tirain-Spirestone']		= TyroneBiggums
+			z['Sinth-Spirestone']		= TyroneBiggums
+			z['Tee-Spirestone']			= TyroneBiggums
+			z['Teepac-Area52']			= TyroneBiggums
+			z['Teekettle-Area52']		= TyroneBiggums
+			-- Mis (NOTE: I will forever have the picture you accidently shared of the manikin wearing a strapon burned in my brain)
+			z['Twunk-Area52']			= itsMis
+			z['Twunkie-Area52']			= itsMis
+			z['Misoracle-Area52']		= itsMis
+			z['Mismayhem-Area52']		= itsMis
+			z['Misdîrect-Area52']		= itsMis
+			z['Misdecay-Area52']		= itsMis
+			z['Mislust-Area52'] 		= itsMis
+			z['Misdivine-Area52']		= itsMis
+			z['Mislight-Area52']		= itsMis
+			z['Misillidan-Spirestone']	= itsMis
+			z['Mispel-Spirestone']		= itsMis
+			--Bladesdruid
+			z['Bladedemonz-Spirestone']	= SuperBear
+			z['Bladesdruid-Spirestone']	= SuperBear
+			z['Rollerblade-Spirestone']	= SuperBear
+			--Bozaum
+			z['Bozaum-Spirestone']		= Beer
+		end
+	elseif portal == 'EU' then
+		if E.Classic then
+			-- Luckyone Seasonal (5826: Lone Wolf EU, 5827: Living Flame EU)
+			z['Player-5826-0202765F']	= ElvBlue -- [Alliance] Hunter
+			z['Player-5826-020F7F10']	= ElvBlue -- [Alliance] Paladin
+			z['Player-5826-02172E79']	= ElvBlue -- [Alliance] Warlock
+			z['Player-5826-0234253E']	= ElvBlue -- [Alliance] Mage
+			z['Player-5826-02342508']	= ElvBlue -- [Alliance] Priest
+			z['Player-5826-023424EF']	= ElvBlue -- [Alliance] Druid
+			z['Player-5826-02342520']	= ElvBlue -- [Alliance] Rogue
+			z['Player-5826-02342556']	= ElvBlue -- [Alliance] Warrior
+			z['Player-5827-02331C4B']	= ElvBlue -- [Horde] Shaman
+			-- Luckyone Hardcore
+			z["Lucky-Nek'Rosh"]			= ElvBlue -- [Horde] Rogue
+			z["Luckyone-Nek'Rosh"]		= ElvBlue -- [Horde] Hunter
+			z["Unluckyone-Nek'Rosh"] 	= ElvBlue -- [Horde] Mage
+			z["Gigachad-Nek'Rosh"] 		= ElvBlue -- [Horde] Druid
+			-- Luckyone Classic Era (5233: Firemaw)
+			z['Player-5233-01D22A72']	= ElvBlue -- [Horde] Hunter: Unluckyone
+			z['Player-5233-01D27011']	= ElvBlue -- [Horde] Druid: Luckydruid
+		elseif E.Wrath then
+			-- Luckyone (4467: Firemaw, 4440: Everlook, 4476: Gehennas)
+			z['Player-4467-04540395']	= ElvBlue -- [Alliance] Druid
+			z['Player-4467-04542B4A']	= ElvBlue -- [Alliance] Priest
+			z['Player-4467-04571AA2']	= ElvBlue -- [Alliance] Warlock
+			z['Player-4467-04571A8D']	= ElvBlue -- [Alliance] DK
+			z['Player-4467-04571A9F']	= ElvBlue -- [Alliance] Mage
+			z['Player-4467-04571A98']	= ElvBlue -- [Alliance] Warrior
+			z['Player-4467-04571911']	= ElvBlue -- [Alliance] Paladin
+			z['Player-4440-03AD654A']	= ElvBlue -- [Alliance] Rogue
+			z['Player-4440-03ADE2DF']	= ElvBlue -- [Alliance] Shaman
+			z['Player-4476-03BF41C9']	= ElvBlue -- [Horde] Hunter
+		elseif E.Retail then
+			-- Blazeflack
+			z['Blazii-Silvermoon']		= ElvBlue -- Priest
+			z['Chazii-Silvermoon']		= ElvBlue -- Shaman
+			-- Merathilis (1401: Shattrath/Garrosh)
+			z['Player-1401-04217BB2']	= ElvPurple	-- [Alliance] Warlock:	Asragoth
+			z['Player-1401-0421EB9F']	= ElvBlue	-- [Alliance] Warrior:	Brìtt
+			z['Player-1401-0421F909']	= ElvRed	-- [Alliance] Paladin:	Damará
+			z['Player-1401-0421EC36']	= ElvBlue	-- [Alliance] Priest:	Jazira
+			z['Player-1401-0A9B0131']	= ElvYellow	-- [Alliance] Rogue:	Anonia
+			z['Player-1401-041E4D64']	= ElvGreen	-- [Alliance] Monk:		Maithilis
+			z['Player-1401-0648F4AD']	= ElvPurple	-- [Alliance] DH:		Mattdemôn
+			z['Player-1401-0421F27B']	= ElvBlue	-- [Alliance] Mage:		Melisendra
+			z['Player-1401-04221546']	= ElvOrange	-- [Alliance] Druid:	Merathilis
+			z['Player-1401-04221344']	= ElvBlue	-- [Alliance] Shaman:	Merathilîs
+			z['Player-1401-0A80006F']	= ElvBlue	-- [Alliance] Shaman:	Ronan
+			z['Player-1401-0A4C8DF4']	= ElvGreen	-- [Alliance] Evoker:	Meravoker
+			z['Player-1401-041C0AE2']	= ElvGreen	-- [Alliance] Hunter:	Róhal
+			z['Player-1401-05CEABFA']	= ElvRed	-- [Alliance] DK:		Jahzzy
+			-- Luckyone (1598: LaughingSkull)
+			z['Player-1598-0F5E4639']	= ElvBlue -- [Alliance] Druid: Luckyone
+			z['Player-1598-0F3E51B0']	= ElvBlue -- [Alliance] Druid: Luckydruid
+			z['Player-1598-0F46FF5A']	= ElvBlue -- [Horde] Evoker
+			z['Player-1598-0BFF3341']	= ElvBlue -- [Horde] DH
+			z['Player-1598-0BD22704']	= ElvBlue -- [Horde] Priest
+			z['Player-1598-0BEFA545']	= ElvBlue -- [Horde] Monk
+			z['Player-1598-0E1A06DE']	= ElvBlue -- [Horde] Rogue
+			z['Player-1598-0BF2E377']	= ElvBlue -- [Horde] Hunter
+			z['Player-1598-0BF18248']	= ElvBlue -- [Horde] DK
+			z['Player-1598-0BFABB95']	= ElvBlue -- [Horde] Mage
+			z['Player-1598-0E67511D']	= ElvBlue -- [Horde] Paladin
+			z['Player-1598-0C0DD01B']	= ElvBlue -- [Horde] Warlock
+			z['Player-1598-0BF8013A']	= ElvBlue -- [Horde] Warrior
+			z['Player-1598-0BF56103']	= ElvBlue -- [Horde] Shaman
+			-- Sneaky Darth
+			z['Player-1925-05F494A6']	= ElvPurple
+			z['Player-1925-05F495A1']	= ElvPurple
+		end
 	end
 end
 
@@ -1765,25 +1769,18 @@ function CH:ChatFrame_ReplaceIconAndGroupExpressions(message, noIconReplacement,
 end
 
 -- copied from ChatFrame.lua
-local function GetPFlag(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17)
-	-- Renaming for clarity:
-	local specialFlag = arg6
-	local zoneChannelID = arg7
-	--local localChannelID = arg8
-
+local function GetPFlag(specialFlag, zoneChannelID, localChannelID)
 	if specialFlag ~= '' then
 		if specialFlag == 'GM' or specialFlag == 'DEV' then
 			-- Add Blizzard Icon if this was sent by a GM/DEV
 			return [[|TInterface\ChatFrame\UI-ChatIcon-Blizz:12:20:0:0:32:16:4:28:0:16|t ]]
-		elseif E.Retail then
-			if specialFlag == 'GUIDE' then
-				if _G.ChatFrame_GetMentorChannelStatus(CHATCHANNELRULESET_MENTOR, GetChannelRulesetForChannelID(zoneChannelID)) == CHATCHANNELRULESET_MENTOR then
-					return NPEV2_CHAT_USER_TAG_GUIDE
-				end
-			elseif specialFlag == 'NEWCOMER' then
-				if _G.ChatFrame_GetMentorChannelStatus(PLAYERMENTORSHIPSTATUS_NEWCOMER, GetChannelRulesetForChannelID(zoneChannelID)) == PLAYERMENTORSHIPSTATUS_NEWCOMER then
-					return _G.NPEV2_CHAT_USER_TAG_NEWCOMER
-				end
+		elseif specialFlag == 'GUIDE' and E.Retail then
+			if _G.ChatFrame_GetMentorChannelStatus(CHATCHANNELRULESET_MENTOR, GetChannelRulesetForChannelID(zoneChannelID)) == CHATCHANNELRULESET_MENTOR then
+				return NPEV2_CHAT_USER_TAG_GUIDE
+			end
+		elseif specialFlag == 'NEWCOMER' and E.Retail then
+			if _G.ChatFrame_GetMentorChannelStatus(PLAYERMENTORSHIPSTATUS_NEWCOMER, GetChannelRulesetForChannelID(zoneChannelID)) == PLAYERMENTORSHIPSTATUS_NEWCOMER then
+				return _G.NPEV2_CHAT_USER_TAG_NEWCOMER
 			end
 		else
 			return _G['CHAT_FLAG_'..specialFlag]
@@ -1922,7 +1919,7 @@ function CH:MessageFormatter(frame, info, chatType, chatGroup, chatTarget, chann
 	end
 
 	-- Player Flags
-	local pflag = GetPFlag(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17)
+	local pflag = GetPFlag(arg6, arg7, arg8)
 	if not bossMonster then
 		local chatIcon, pluginChatIcon = specialChatIcons[arg12] or specialChatIcons[playerName], CH:GetPluginIcon(arg12, playerName)
 		if type(chatIcon) == 'function' then
@@ -1969,7 +1966,7 @@ function CH:MessageFormatter(frame, info, chatType, chatGroup, chatTarget, chann
 		end
 	else
 		if not showLink or arg2 == '' then
-			if chatType == 'TEXT_EMOTE' or chatType == 'GUILD_DEATHS' then
+			if chatType == 'TEXT_EMOTE' then
 				body = message
 			else
 				body = format(_G['CHAT_'..chatType..'_GET']..message, pflag..arg2, arg2)
@@ -2961,7 +2958,6 @@ local FindURL_Events = {
 	'CHAT_MSG_BN_WHISPER_INFORM',
 	'CHAT_MSG_BN_INLINE_TOAST_BROADCAST',
 	'CHAT_MSG_GUILD_ACHIEVEMENT',
-	E.ClassicHC and 'CHAT_MSG_GUILD_DEATHS' or nil,
 	'CHAT_MSG_GUILD',
 	'CHAT_MSG_PARTY',
 	'CHAT_MSG_PARTY_LEADER',
diff --git a/ElvUI/Core/Modules/DataTexts/Ammo.lua b/ElvUI/Core/Modules/DataTexts/Ammo.lua
index 99e556d602..f7ded9bc9c 100644
--- a/ElvUI/Core/Modules/DataTexts/Ammo.lua
+++ b/ElvUI/Core/Modules/DataTexts/Ammo.lua
@@ -6,15 +6,15 @@ local select, wipe = select, wipe
 local format, strjoin = format, strjoin
 
 local _G = _G
-local GetItemInfo = GetItemInfo
 local GetItemCount = GetItemCount
-local GetItemInfoInstant = GetItemInfoInstant
 local GetInventoryItemCount = GetInventoryItemCount
 local GetInventoryItemID = GetInventoryItemID
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemInfoInstant = (C_Item and C_Item.GetItemInfoInstant) or GetItemInfoInstant
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 local ContainerIDToInventoryID = (C_Container and C_Container.ContainerIDToInventoryID) or ContainerIDToInventoryID
 local GetContainerNumSlots = (C_Container and C_Container.GetContainerNumSlots) or GetContainerNumSlots
 local GetContainerNumFreeSlots = (C_Container and C_Container.GetContainerNumFreeSlots) or GetContainerNumFreeSlots
-local GetItemQualityColor = GetItemQualityColor
 
 local NUM_BAG_SLOTS = NUM_BAG_SLOTS
 local NUM_BAG_FRAMES = NUM_BAG_FRAMES
diff --git a/ElvUI/Core/Modules/DataTexts/Avoidance.lua b/ElvUI/Core/Modules/DataTexts/Avoidance.lua
index 7247517fff..73801b8bd7 100644
--- a/ElvUI/Core/Modules/DataTexts/Avoidance.lua
+++ b/ElvUI/Core/Modules/DataTexts/Avoidance.lua
@@ -8,12 +8,13 @@ local GetBonusBarOffset = GetBonusBarOffset
 local GetDodgeChance = GetDodgeChance
 local GetInventoryItemID = GetInventoryItemID
 local GetInventorySlotInfo = GetInventorySlotInfo
-local GetItemInfo = GetItemInfo
 local GetParryChance = GetParryChance
 local UnitDefense = UnitDefense
 local UnitExists = UnitExists
 local UnitLevel = UnitLevel
 
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+
 local BOSS = BOSS
 local MISS_CHANCE = MISS_CHANCE
 local BLOCK_CHANCE = BLOCK_CHANCE
diff --git a/ElvUI/Core/Modules/DataTexts/Bags.lua b/ElvUI/Core/Modules/DataTexts/Bags.lua
index c0b19662b3..a0dea6df85 100644
--- a/ElvUI/Core/Modules/DataTexts/Bags.lua
+++ b/ElvUI/Core/Modules/DataTexts/Bags.lua
@@ -7,12 +7,12 @@ local strjoin = strjoin
 
 local GetInventoryItemQuality = GetInventoryItemQuality
 local GetInventoryItemTexture = GetInventoryItemTexture
-local GetItemQualityColor = GetItemQualityColor
 
-local GetBagName = GetBagName or (C_Container and C_Container.GetBagName)
-local GetContainerNumFreeSlots = GetContainerNumFreeSlots or (C_Container and C_Container.GetContainerNumFreeSlots)
-local GetContainerNumSlots = GetContainerNumSlots or (C_Container and C_Container.GetContainerNumSlots)
-local ContainerIDToInventoryID = ContainerIDToInventoryID or (C_Container and C_Container.ContainerIDToInventoryID)
+local GetBagName = (C_Container and C_Container.GetBagName) or GetBagName
+local GetContainerNumFreeSlots = (C_Container and C_Container.GetContainerNumFreeSlots) or GetContainerNumFreeSlots
+local GetContainerNumSlots = (C_Container and C_Container.GetContainerNumSlots) or GetContainerNumSlots
+local ContainerIDToInventoryID = (C_Container and C_Container.ContainerIDToInventoryID) or ContainerIDToInventoryID
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local CURRENCY = CURRENCY
 local MAX_WATCHED_TOKENS = MAX_WATCHED_TOKENS or 3
diff --git a/ElvUI/Core/Modules/DataTexts/Difficulty.lua b/ElvUI/Core/Modules/DataTexts/Difficulty.lua
index 9cc776b28e..a610122d42 100644
--- a/ElvUI/Core/Modules/DataTexts/Difficulty.lua
+++ b/ElvUI/Core/Modules/DataTexts/Difficulty.lua
@@ -50,7 +50,7 @@ local DiffIDLabel = { -- also has IDs maintained in Nameplate StyleFilters
 	['N'] = { 1, 14, 38, 173, 198, 201 },
 	['H'] = { 2, 15, 39, 174 },
 	['M'] = { 16, 23, 40 },
-	['20'] = { 148, 185 },
+	['20'] = { 148, 185, 215 },
 	['10N'] = { 3, 175 },
 	['25N'] = { 4, 176 },
 	['10H'] = { 5, 193 },
diff --git a/ElvUI/Core/Modules/DataTexts/DualSpec.lua b/ElvUI/Core/Modules/DataTexts/DualSpec.lua
new file mode 100644
index 0000000000..4efc28aa24
--- /dev/null
+++ b/ElvUI/Core/Modules/DataTexts/DualSpec.lua
@@ -0,0 +1,103 @@
+local E, L, V, P, G = unpack(ElvUI)
+if not (E.Wrath or E.ClassicSOD) then return end
+local DT = E:GetModule('DataTexts')
+
+local _G = _G
+local format, strjoin = format, strjoin
+local HideUIPanel = HideUIPanel
+local IsShiftKeyDown = IsShiftKeyDown
+local ShowUIPanel = ShowUIPanel
+
+local LEVEL_UP_DUALSPEC = LEVEL_UP_DUALSPEC
+local MAX_TALENT_TABS = MAX_TALENT_TABS
+local PRIMARY = PRIMARY
+local SECONDARY = SECONDARY
+
+local GetActiveTalentGroup = GetActiveTalentGroup
+local GetNumTalentGroups = GetNumTalentGroups
+local SetActiveTalentGroup = SetActiveTalentGroup
+local GetTalentTabInfo = GetTalentTabInfo
+
+local LoadAddOn = (C_AddOns and C_AddOns.LoadAddOn) or LoadAddOn
+
+local displayString, db = ''
+local primaryStr, secondaryStr, activeGroup, hasDualSpec = '', ''
+
+local function BuildTalentString(talentGroup)
+	local str = ''
+
+	for i = 1, MAX_TALENT_TABS do
+<<<<<<<< HEAD:ElvUI/Cata/Modules/DataTexts/DualSpec.lua
+		local _, _, _, _, pointsSpent = GetTalentTabInfo(i, false, false, talentGroup)
+		if (str == '') then
+			str = pointsSpent
+		else
+			str = strjoin('/', str, pointsSpent)
+		end
+========
+		local _, _, pointsSpent = GetTalentTabInfo(i, false, false, talentGroup)
+		str = (str == '' and pointsSpent) or strjoin('/', str, pointsSpent)
+>>>>>>>> upstream/main:ElvUI/Core/Modules/DataTexts/DualSpec.lua
+	end
+
+	return str
+end
+
+local function OnEvent(self)
+	primaryStr, secondaryStr = BuildTalentString(1), BuildTalentString(2)
+
+	activeGroup = GetActiveTalentGroup()
+	local str = activeGroup == 1 and primaryStr or secondaryStr
+
+	if not hasDualSpec then
+		hasDualSpec = GetNumTalentGroups() == 2
+	end
+
+	self.text:SetFormattedText(displayString, db.NoLabel and str or activeGroup == 1 and PRIMARY or SECONDARY, str)
+end
+
+local function OnEnter()
+	DT.tooltip:ClearLines()
+	DT.tooltip:AddLine(format('|cff%s%s:|r %s', activeGroup == 1 and '0CD809' or 'FFFFFF', PRIMARY, primaryStr), 1, 1, 1)
+
+	if hasDualSpec then
+		DT.tooltip:AddLine(format('|cff%s%s:|r %s', activeGroup == 2 and '0CD809' or 'FFFFFF', SECONDARY, secondaryStr), 1, 1, 1)
+	end
+
+	DT.tooltip:AddLine(' ')
+
+	if hasDualSpec then
+		DT.tooltip:AddLine(L["|cffFFFFFFLeft Click:|r Change Talent Specialization"])
+	end
+
+	DT.tooltip:AddLine(L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"])
+	DT.tooltip:Show()
+end
+
+local function OnClick(_, button)
+	if button == 'LeftButton' then
+		if not _G.PlayerTalentFrame then
+			LoadAddOn('Blizzard_TalentUI')
+		end
+
+		if IsShiftKeyDown() then
+			if not _G.PlayerTalentFrame:IsShown() then
+				ShowUIPanel(_G.PlayerTalentFrame)
+			else
+				HideUIPanel(_G.PlayerTalentFrame)
+			end
+		elseif hasDualSpec then
+			SetActiveTalentGroup(activeGroup == 1 and 2 or 1)
+		end
+	end
+end
+
+local function ApplySettings(self, hex)
+	if not db then
+		db = E.global.datatexts.settings[self.name]
+	end
+
+	displayString = strjoin('', db.NoLabel and '' or '%s: ', hex, '%s|r')
+end
+
+DT:RegisterDatatext('DualSpecialization', nil, { 'CHARACTER_POINTS_CHANGED', 'ACTIVE_TALENT_GROUP_CHANGED' }, OnEvent, nil, OnClick, OnEnter, nil, LEVEL_UP_DUALSPEC, nil, ApplySettings)
diff --git a/ElvUI/Core/Modules/DataTexts/Gold.lua b/ElvUI/Core/Modules/DataTexts/Gold.lua
index 7e11a42e6a..a85f4923ac 100644
--- a/ElvUI/Core/Modules/DataTexts/Gold.lua
+++ b/ElvUI/Core/Modules/DataTexts/Gold.lua
@@ -26,7 +26,7 @@ local CURRENCY = CURRENCY
 
 local menuList, myGold = {}, {}
 local totalGold, totalHorde, totalAlliance = 0, 0, 0
-local iconString = '|T%s:16:16:0:0:64:64:4:60:4:60|t'
+local iconStringName = '|T%s:16:16:0:0:64:64:4:60:4:60|t %s'
 local db
 
 local function sortFunction(a, b)
@@ -218,7 +218,7 @@ local function OnEnter()
 			end
 
 			if info.quantity then
-				DT.tooltip:AddDoubleLine(format('%s %s', format(iconString, info.iconFileID), name), BreakUpLargeNumbers(info.quantity), 1, 1, 1, 1, 1, 1)
+				DT.tooltip:AddDoubleLine(format(iconStringName, info.iconFileID, name), BreakUpLargeNumbers(info.quantity), 1, 1, 1, 1, 1, 1)
 			end
 
 			index = index + 1
diff --git a/ElvUI/Core/Modules/DataTexts/Location.lua b/ElvUI/Core/Modules/DataTexts/Location.lua
index a6381a36cc..f20538466f 100644
--- a/ElvUI/Core/Modules/DataTexts/Location.lua
+++ b/ElvUI/Core/Modules/DataTexts/Location.lua
@@ -2,10 +2,10 @@ local E, L, V, P, G = unpack(ElvUI)
 local DT = E:GetModule('DataTexts')
 
 local _G = _G
-local GetZonePVPInfo = GetZonePVPInfo
 local IsInInstance = IsInInstance
 local ToggleFrame = ToggleFrame
 
+local GetZonePVPInfo = (C_PvP and C_PvP.GetZonePVPInfo) or GetZonePVPInfo
 local NOT_APPLICABLE = NOT_APPLICABLE
 
 local mapInfo = E.MapInfo
diff --git a/ElvUI/Core/Modules/DataTexts/Time.lua b/ElvUI/Core/Modules/DataTexts/Time.lua
index 2bed32d431..cd06b915f5 100644
--- a/ElvUI/Core/Modules/DataTexts/Time.lua
+++ b/ElvUI/Core/Modules/DataTexts/Time.lua
@@ -49,6 +49,22 @@ local displayFormats = {
 	eu_color = ''
 }
 
+local allowID = { -- also has IDs maintained in Nameplate StyleFilters
+	[2] = true,		-- heroic
+	[23] = true,	-- mythic
+	[148] = true,	-- ZG/AQ40
+	[174] = true,	-- heroic (dungeon)
+	[185] = true,	-- normal (legacy)
+	[198] = true,	-- Classic: Season of Discovery
+	[201] = true,	-- Classic: Hardcore
+	[215] = true,	-- Classic: Sunken Temple
+}
+
+local lfrID = {
+	[7] = true,
+	[17] = true
+}
+
 local OnUpdate, db
 
 local function ToTime(start, seconds)
@@ -212,17 +228,14 @@ local function OnEnter()
 	for i = 1, GetNumSavedInstances() do
 		local info = { GetSavedInstanceInfo(i) } -- we want to send entire info
 		local name, _, _, difficulty, locked, extended, _, isRaid = unpack(info)
-		if name and (locked or extended) then
-			local isDungeon = difficulty == 2 or difficulty == 23 or difficulty == 174 or difficulty == 198 or difficulty == 201
-			if isRaid or isDungeon then
-				local isLFR = difficulty == 7 or difficulty == 17
-				local _, _, isHeroic, _, displayHeroic, displayMythic = GetDifficultyInfo(difficulty)
-				local sortName = name .. (displayMythic and 4 or (isHeroic or displayHeroic) and 3 or isLFR and 1 or 2)
-				local difficultyLetter = (displayMythic and difficultyTag[4]) or ((isHeroic or displayHeroic) and difficultyTag[3]) or (isLFR and difficultyTag[1]) or difficultyTag[2]
-				local buttonImg = instanceIconByName[name] and format('|T%s:16:16:0:0:96:96:0:64:0:64|t ', instanceIconByName[name]) or ''
-
-				tinsert(lockedInstances[isRaid and 'raids' or 'dungeons'], { sortName, difficultyLetter, buttonImg, info })
-			end
+		if name and (locked or extended) and (isRaid or allowID[difficulty]) then
+			local isLFR = lfrID[difficulty]
+			local _, _, isHeroic, _, displayHeroic, displayMythic = GetDifficultyInfo(difficulty)
+			local sortName = name .. (displayMythic and 4 or (isHeroic or displayHeroic) and 3 or isLFR and 1 or 2)
+			local difficultyLetter = (displayMythic and difficultyTag[4]) or ((isHeroic or displayHeroic) and difficultyTag[3]) or (isLFR and difficultyTag[1]) or difficultyTag[2]
+			local buttonImg = instanceIconByName[name] and format('|T%s:16:16:0:0:96:96:0:64:0:64|t ', instanceIconByName[name]) or ''
+
+			tinsert(lockedInstances[isRaid and 'raids' or 'dungeons'], { sortName, difficultyLetter, buttonImg, info })
 		end
 	end
 
diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua
index 1454309c26..fd733fd3a9 100644
--- a/ElvUI/Core/Modules/Maps/Minimap.lua
+++ b/ElvUI/Core/Modules/Maps/Minimap.lua
@@ -16,7 +16,6 @@ local CloseAllWindows = CloseAllWindows
 local CloseMenus = CloseMenus
 local CreateFrame = CreateFrame
 local GetMinimapZoneText = GetMinimapZoneText
-local GetZonePVPInfo = GetZonePVPInfo
 local HideUIPanel = HideUIPanel
 local InCombatLockdown = InCombatLockdown
 local IsShiftKeyDown = IsShiftKeyDown
@@ -32,6 +31,7 @@ local MainMenuMicroButton_SetNormal = MainMenuMicroButton_SetNormal
 local UIDropDownMenu_RefreshAll = UIDropDownMenu_RefreshAll
 
 local IsAddOnLoaded = (C_AddOns and C_AddOns.IsAddOnLoaded) or IsAddOnLoaded
+local GetZonePVPInfo = (C_PvP and C_PvP.GetZonePVPInfo) or GetZonePVPInfo
 
 local WorldMapFrame = _G.WorldMapFrame
 local MinimapCluster = _G.MinimapCluster
diff --git a/ElvUI/Core/Modules/Misc/LootRoll.lua b/ElvUI/Core/Modules/Misc/LootRoll.lua
index d1e4f6b0e2..fba3c3b8fa 100644
--- a/ElvUI/Core/Modules/Misc/LootRoll.lua
+++ b/ElvUI/Core/Modules/Misc/LootRoll.lua
@@ -10,7 +10,6 @@ local tinsert, tremove, format = tinsert, tremove, format
 
 local CreateFrame = CreateFrame
 local GameTooltip = GameTooltip
-local GetItemInfo = GetItemInfo
 local GetLootRollItemInfo = GetLootRollItemInfo
 local GetLootRollItemLink = GetLootRollItemLink
 local GetLootRollTimeLeft = GetLootRollTimeLeft
@@ -21,6 +20,7 @@ local UIParent = UIParent
 
 local GameTooltip_Hide = GameTooltip_Hide
 local GameTooltip_ShowCompareItem = GameTooltip_ShowCompareItem
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
 local C_LootHistory_GetItem = C_LootHistory.GetItem
 local C_LootHistory_GetPlayerInfo = C_LootHistory.GetPlayerInfo
 
diff --git a/ElvUI/Core/Modules/Misc/Misc.lua b/ElvUI/Core/Modules/Misc/Misc.lua
index 922f642a49..c9efc44ced 100644
--- a/ElvUI/Core/Modules/Misc/Misc.lua
+++ b/ElvUI/Core/Modules/Misc/Misc.lua
@@ -17,7 +17,6 @@ local CanGuildBankRepair = CanGuildBankRepair
 local CanMerchantRepair = CanMerchantRepair
 local GetGuildBankWithdrawMoney = GetGuildBankWithdrawMoney
 local GetInstanceInfo = GetInstanceInfo
-local GetItemInfo = GetItemInfo
 local GetNumGroupMembers = GetNumGroupMembers
 local GetQuestItemInfo = GetQuestItemInfo
 local GetQuestItemLink = GetQuestItemLink
@@ -38,7 +37,6 @@ local SendChatMessage = SendChatMessage
 local StaticPopup_Hide = StaticPopup_Hide
 local StaticPopupSpecial_Hide = StaticPopupSpecial_Hide
 local UninviteUnit = UninviteUnit
-local UnitExists = UnitExists
 local UnitGUID = UnitGUID
 local UnitInRaid = UnitInRaid
 local UnitName = UnitName
@@ -46,18 +44,21 @@ local IsInGuild = IsInGuild
 local PlaySound = PlaySound
 local GetNumFactions = GetNumFactions
 local GetFactionInfo = GetFactionInfo
+local UnitIsGroupLeader = UnitIsGroupLeader
 local GetWatchedFactionInfo = GetWatchedFactionInfo
 local ExpandAllFactionHeaders = ExpandAllFactionHeaders
 local SetWatchedFactionIndex = SetWatchedFactionIndex
 local GetCurrentCombatTextEventInfo = GetCurrentCombatTextEventInfo
 local CombatLogGetCurrentEventInfo = CombatLogGetCurrentEventInfo
 
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
 local IsAddOnLoaded = (C_AddOns and C_AddOns.IsAddOnLoaded) or IsAddOnLoaded
 local LeaveParty = C_PartyInfo.LeaveParty or LeaveParty
 local IsFriend = C_FriendList.IsFriend
 
 local LE_GAME_ERR_GUILD_NOT_ENOUGH_MONEY = LE_GAME_ERR_GUILD_NOT_ENOUGH_MONEY
 local LE_GAME_ERR_NOT_ENOUGH_MONEY = LE_GAME_ERR_NOT_ENOUGH_MONEY
+local LE_PARTY_CATEGORY_HOME = LE_PARTY_CATEGORY_HOME
 local MAX_PARTY_MEMBERS = MAX_PARTY_MEMBERS
 local UNKNOWN = UNKNOWN
 
@@ -72,7 +73,7 @@ end
 
 local BOOST_THANKSFORPLAYING_SMALLER = SOUNDKIT.UI_70_BOOST_THANKSFORPLAYING_SMALLER
 local INTERRUPT_MSG = L["Interrupted %s's |cff71d5ff|Hspell:%d:0|h[%s]|h|r!"]
-if not (E.Retail or E.Cata) then
+if not (E.Retail or E.Wrath) then
 	INTERRUPT_MSG = INTERRUPT_MSG:gsub('|cff71d5ff|Hspell:%%d:0|h(%[%%s])|h|r','%1')
 end
 
@@ -118,8 +119,14 @@ function M:COMBAT_LOG_EVENT_UNFILTERED()
 		inRaid = false --IsInRaid() returns true for arenas and they should not be considered a raid
 	end
 
+	local name, msg = destName or UNKNOWN
+	if E.locale == 'msMX' or E.locale == 'esES' or E.locale == 'ptBR' then -- name goes after
+		msg = (E.Retail or E.Wrath) and format(INTERRUPT_MSG, spellID, spellName, name) or format(INTERRUPT_MSG, spellName, name)
+	else
+		msg = (E.Retail or E.Wrath) and format(INTERRUPT_MSG, name, spellID, spellName) or format(INTERRUPT_MSG, name, spellName)
+	end
+
 	local channel = E.db.general.interruptAnnounce
-	local msg = (E.Retail or E.Cata) and format(INTERRUPT_MSG, destName or UNKNOWN, spellID, spellName) or format(INTERRUPT_MSG, destName or UNKNOWN, spellName)
 	if channel == 'PARTY' then
 		SendChatMessage(msg, inPartyLFG and 'INSTANCE_CHAT' or 'PARTY')
 	elseif channel == 'RAID' then
@@ -218,17 +225,24 @@ end
 function M:DisbandRaidGroup()
 	if InCombatLockdown() then return end -- Prevent user error in combat
 
-	if UnitInRaid('player') then
-		for i = 1, GetNumGroupMembers() do
-			local name, _, _, _, _, _, _, online = GetRaidRosterInfo(i)
-			if online and name ~= E.myname then
-				UninviteUnit(name)
+	local myIndex = UnitInRaid('player')
+	if myIndex then
+		local _, myRank = GetRaidRosterInfo(myIndex)
+		if myRank == 2 then -- real raid leader
+			for i = 1, GetNumGroupMembers() do
+				if i ~= myIndex then -- dont kick yourself
+					local name = GetRaidRosterInfo(i)
+					if name then
+						UninviteUnit(name)
+					end
+				end
 			end
 		end
-	else
+	elseif not myIndex and UnitIsGroupLeader('player', LE_PARTY_CATEGORY_HOME) then
 		for i = MAX_PARTY_MEMBERS, 1, -1 do
-			if UnitExists('party'..i) then
-				UninviteUnit(UnitName('party'..i))
+			local name = UnitName('party'..i)
+			if name then
+				UninviteUnit(name)
 			end
 		end
 	end
diff --git a/ElvUI/Core/Modules/Misc/RaidUtility.lua b/ElvUI/Core/Modules/Misc/RaidUtility.lua
index e1918052ff..beeccc2e28 100644
--- a/ElvUI/Core/Modules/Misc/RaidUtility.lua
+++ b/ElvUI/Core/Modules/Misc/RaidUtility.lua
@@ -26,6 +26,7 @@ local UnitIsGroupLeader = UnitIsGroupLeader
 local IsEveryoneAssistant = IsEveryoneAssistant
 local SetEveryoneIsAssistant = SetEveryoneIsAssistant
 local PlaySound = PlaySound
+local IsInGroup = IsInGroup
 
 local SetRestrictPings = C_PartyInfo.SetRestrictPings
 local GetRestrictPings = C_PartyInfo.GetRestrictPings
@@ -45,6 +46,11 @@ local roles = {
 	{ role = 'DAMAGER' }
 }
 
+local buttonEvents = {
+	'GROUP_ROSTER_UPDATE',
+	'PARTY_LEADER_CHANGED'
+}
+
 local function SetGrabCoords(data, xOffset, yOffset)
 	data.texA, data.texB, data.texC, data.texD = GetTexCoordsByGrid(xOffset, yOffset, 256, 256, 67, 67)
 end
@@ -53,12 +59,32 @@ SetGrabCoords(roles[1], 1, 2)
 SetGrabCoords(roles[2], 2, 1)
 SetGrabCoords(roles[3], 2, 2)
 
-local ShowButton = CreateFrame('Button', 'RaidUtility_ShowButton', E.UIParent, 'UIMenuButtonStretchTemplate, SecureHandlerClickTemplate')
+local ShowButton = CreateFrame('Button', 'RaidUtility_ShowButton', E.UIParent, 'SecureHandlerClickTemplate')
 ShowButton:SetMovable(true)
 ShowButton:SetClampedToScreen(true)
 ShowButton:SetClampRectInsets(0, 0, -1, 1)
 ShowButton:Hide()
 
+function RU:FixSecureClicks(button)
+	if E.Retail then
+		button:RegisterForClicks('AnyDown', 'AnyUp')
+	else
+		button:RegisterForClicks('AnyUp')
+	end
+end
+
+function RU:SetEnabled(button, enabled, isLeader)
+	if button.SetChecked then
+		button:SetChecked(enabled)
+	else
+		button.enabled = enabled
+	end
+
+	if button.Text then -- show text grey when isLeader is false, nil and true should be white
+		button.Text:SetFormattedText('%s%s|r', ((isLeader ~= nil and isLeader) or (isLeader == nil and enabled)) and '|cFFffffff' or '|cFF888888', button.label)
+	end
+end
+
 function RU:CleanButton(button)
 	button.BottomLeft:SetAlpha(0)
 	button.BottomRight:SetAlpha(0)
@@ -74,12 +100,21 @@ function RU:CleanButton(button)
 	button:SetDisabledTexture(E.ClearTexture)
 end
 
--- Check if We are Raid Leader or Raid Officer
-function RU:CheckRaidStatus()
-	if UnitIsGroupLeader('player') or UnitIsGroupAssistant('player') then
-		local _, instanceType = GetInstanceInfo()
-		return instanceType ~= 'pvp' and instanceType ~= 'arena'
-	end
+function RU:NotInPVP()
+	local _, instanceType = GetInstanceInfo()
+	return instanceType ~= 'pvp' and instanceType ~= 'arena'
+end
+
+function RU:IsLeader()
+	return UnitIsGroupLeader('player') and RU:NotInPVP()
+end
+
+function RU:HasPermission()
+	return (UnitIsGroupLeader('player') or UnitIsGroupAssistant('player')) and RU:NotInPVP()
+end
+
+function RU:InGroup()
+	return IsInGroup() and RU:NotInPVP()
 end
 
 -- Change border when mouse is inside the button
@@ -94,10 +129,11 @@ function RU:OnLeave_Button()
 	self:SetBackdropBorderColor(unpack(E.media.bordercolor))
 end
 
-function RU:CreateCheckBox(name, parent, template, width, height, point, relativeto, point2, xOfs, yOfs, label, events, eventFunc, clickFunc)
+function RU:CreateCheckBox(name, parent, template, size, point, relativeto, point2, xOfs, yOfs, label, events, eventFunc, clickFunc)
 	local checkbox = type(name) == 'table' and name
-	local box = checkbox or CreateFrame('CheckButton', name, parent, template or 'UICheckButtonTemplate')
-	box:Size(height)
+	local box = checkbox or CreateFrame('CheckButton', name, parent, template)
+	box:Size(size)
+	box.label = label or ''
 
 	if events then
 		box:UnregisterAllEvents()
@@ -116,29 +152,42 @@ function RU:CreateCheckBox(name, parent, template, width, height, point, relativ
 
 	if box.Text then
 		box.Text:Point('LEFT', box, 'RIGHT', 2, 0)
-		box.Text:SetText(label or '')
-		box.Text:SetTextColor(1, 1, 1, 1)
+		box.Text:SetText(box.label)
 	end
 
 	if not box:GetPoint() then
 		box:Point(point, relativeto, point2, xOfs, yOfs)
 	end
 
+	if eventFunc then
+		eventFunc(box)
+	end
+
 	RU.CheckBoxes[name] = box
 
 	return box
 end
 
 -- Function to create buttons in this module
-function RU:CreateUtilButton(name, parent, template, width, height, point, relativeto, point2, xOfs, yOfs, label, texture)
+function RU:CreateUtilButton(name, parent, template, width, height, point, relativeto, point2, xOfs, yOfs, label, texture, events, eventFunc, mouseFunc)
 	local button = type(name) == 'table' and name
 	local btn = button or CreateFrame('Button', name, parent, template)
 	btn:HookScript('OnEnter', RU.OnEnter_Button)
 	btn:HookScript('OnLeave', RU.OnLeave_Button)
 	btn:Size(width, height)
 	btn:SetTemplate(nil, true)
+	btn.label = label or ''
 
-	RU:CleanButton(btn)
+	if events then
+		btn:UnregisterAllEvents()
+
+		for _, event in next, events do
+			btn:RegisterEvent(event)
+		end
+	end
+
+	btn:SetScript('OnEvent', eventFunc)
+	btn:SetScript('OnMouseUp', mouseFunc)
 
 	if not btn:GetPoint() then
 		btn:Point(point, relativeto, point2, xOfs, yOfs)
@@ -149,9 +198,9 @@ function RU:CreateUtilButton(name, parent, template, width, height, point, relat
 		text:FontTemplate()
 		text:Point('CENTER', btn, 'CENTER', 0, -1)
 		text:SetJustifyH('CENTER')
-		text:SetText(label)
+		text:SetText(btn.label)
 		btn:SetFontString(text)
-		btn.text = text
+		btn.Text = text
 	elseif texture then
 		local tex = btn:CreateTexture(nil, 'OVERLAY')
 		tex:SetTexture(texture)
@@ -161,6 +210,10 @@ function RU:CreateUtilButton(name, parent, template, width, height, point, relat
 		btn.texture = tex
 	end
 
+	if eventFunc then
+		eventFunc(btn)
+	end
+
 	RU.Buttons[name] = btn
 
 	return btn
@@ -168,7 +221,7 @@ end
 
 function RU:UpdateMedia()
 	for _, btn in next, RU.Buttons do
-		if btn.text then btn.text:FontTemplate() end
+		if btn.Text then btn.Text:FontTemplate() end
 		if btn.texture then btn.texture:SetTexture(btn.texture.tex) end
 		btn:SetTemplate(nil, true)
 	end
@@ -185,7 +238,7 @@ function RU:ToggleRaidUtil(event)
 	end
 
 	local panel = _G.RaidUtilityPanel
-	local status = RU:CheckRaidStatus()
+	local status = RU:InGroup()
 	ShowButton:SetShown(status and not panel.toggled)
 	panel:SetShown(status and panel.toggled)
 
@@ -232,25 +285,33 @@ function RU:OnClick_CloseButton()
 end
 
 function RU:OnClick_DisbandRaidButton()
-	if RU:CheckRaidStatus() then
+	if RU:InGroup() then
 		E:StaticPopup_Show('DISBAND_RAID')
 	end
 end
 
+function RU:OnEvent_ReadyCheckButton()
+	RU:SetEnabled(self, RU:HasPermission())
+end
+
 function RU:OnClick_ReadyCheckButton()
-	if RU:CheckRaidStatus() then
+	if self.enabled and RU:InGroup() then
 		DoReadyCheck()
 	end
 end
 
+function RU:OnEvent_RoleCheckButton()
+	RU:SetEnabled(self, RU:HasPermission())
+end
+
 function RU:OnClick_RoleCheckButton()
-	if RU:CheckRaidStatus() then
+	if self.enabled and RU:InGroup() then
 		InitiateRolePoll()
 	end
 end
 
 function RU:OnClick_RaidCountdownButton()
-	if RU:CheckRaidStatus() then
+	if RU:InGroup() then
 		C_PartyInfo.DoCountdown(10)
 	end
 end
@@ -259,22 +320,38 @@ function RU:OnClick_RaidControlButton()
 	ToggleFriendsFrame(E.Retail and 3 or 4)
 end
 
+function RU:OnEvent_MainTankButton()
+	RU:SetEnabled(self, RU:HasPermission())
+end
+
+function RU:OnEvent_MainAssistButton()
+	RU:SetEnabled(self, RU:HasPermission())
+end
+
 function RU:OnClick_EveryoneAssist()
-	PlaySound(IG_MAINMENU_OPTION_CHECKBOX_ON)
-	SetEveryoneIsAssistant(self:GetChecked())
+	if RU:IsLeader() then
+		PlaySound(IG_MAINMENU_OPTION_CHECKBOX_ON)
+		SetEveryoneIsAssistant(self:GetChecked())
+	else
+		self:SetChecked(IsEveryoneAssistant())
+	end
 end
 
 function RU:OnEvent_EveryoneAssist()
-	self:SetChecked(IsEveryoneAssistant())
+	RU:SetEnabled(self, IsEveryoneAssistant(), RU:IsLeader())
 end
 
 function RU:OnClick_RestrictPings()
-	PlaySound(IG_MAINMENU_OPTION_CHECKBOX_ON)
-	SetRestrictPings(self:GetChecked())
+	if RU:HasPermission() then
+		PlaySound(IG_MAINMENU_OPTION_CHECKBOX_ON)
+		SetRestrictPings(self:GetChecked())
+	else
+		self:SetChecked(GetRestrictPings())
+	end
 end
 
 function RU:OnEvent_RestrictPings()
-	self:SetChecked(GetRestrictPings())
+	RU:SetEnabled(self, GetRestrictPings(), RU:HasPermission())
 end
 
 -- Credits oRA3 for the RoleIcons
@@ -326,7 +403,7 @@ function RU:OnEnter_Role()
 end
 
 function RU:PositionRoleIcons()
-	if E.Retail or E.Cata then
+	if E.Retail or E.Wrath then
 		_G.RaidUtilityRoleIcons:ClearAllPoints()
 
 		local point = E:GetScreenQuadrant(ShowButton)
@@ -383,7 +460,7 @@ function RU:Initialize()
 	RaidUtilityPanel:SetFrameStrata('HIGH')
 	E.FrameLocks.RaidUtilityPanel = true
 
-	RU:CreateUtilButton(ShowButton, nil, nil, 136, 18, 'TOP', E.UIParent, 'TOP', -400, E.Border, _G.RAID_CONTROL)
+	RU:CreateUtilButton(ShowButton, nil, nil, 136, 18, 'TOP', E.UIParent, 'TOP', -400, E.Border, _G.RAID_CONTROL, nil, nil, nil, RU.OnClick_ShowButton)
 	SecureHandlerSetFrameRef(ShowButton, 'RaidUtilityPanel', RaidUtilityPanel)
 	ShowButton:RegisterForDrag('RightButton')
 	ShowButton:SetFrameStrata('HIGH')
@@ -414,18 +491,16 @@ function RU:Initialize()
 		raidUtil:SetPoint(raidUtilPoint, self, raidUtilPoint)
 		closeButton:SetPoint(raidUtilPoint, raidUtil, closeButtonPoint, 0, yOffset)
 	]=], -E.Border + E.Spacing*3))
-	ShowButton:SetScript('OnMouseUp', RU.OnClick_ShowButton)
 	ShowButton:SetScript('OnDragStart', RU.DragStart_ShowButton)
 	ShowButton:SetScript('OnDragStop', RU.DragStop_ShowButton)
 	E.FrameLocks.RaidUtility_ShowButton = true
 
-	local CloseButton = RU:CreateUtilButton('RaidUtility_CloseButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate, SecureHandlerClickTemplate', 136, 18, 'TOP', RaidUtilityPanel, 'BOTTOM', 0, -1, _G.CLOSE)
+	local CloseButton = RU:CreateUtilButton('RaidUtility_CloseButton', RaidUtilityPanel, 'SecureHandlerClickTemplate', 136, 18, 'TOP', RaidUtilityPanel, 'BOTTOM', 0, -1, _G.CLOSE, nil, nil, nil, RU.OnClick_CloseButton)
 	SecureHandlerSetFrameRef(CloseButton, 'RaidUtility_ShowButton', ShowButton)
 	CloseButton:SetAttribute('_onclick', [=[self:GetParent():Hide(); self:GetFrameRef('RaidUtility_ShowButton'):Show()]=])
-	CloseButton:SetScript('OnMouseUp', RU.OnClick_CloseButton)
 	SecureHandlerSetFrameRef(RaidUtilityPanel, 'RaidUtility_CloseButton', CloseButton)
 
-	if E.Retail or E.Cata then
+	if E.Retail or E.Wrath then
 		local RoleIcons = CreateFrame('Frame', 'RaidUtilityRoleIcons', RaidUtilityPanel)
 		RoleIcons:Point('LEFT', RaidUtilityPanel, 'RIGHT', -1, 0)
 		RoleIcons:Size(36, PANEL_HEIGHT - countdownHeight)
@@ -469,41 +544,34 @@ function RU:Initialize()
 	end
 
 	local BUTTON_WIDTH = PANEL_WIDTH - 20
-	local RaidControlButton = RU:CreateUtilButton('RaidUtility_RaidControlButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', RaidUtilityPanel, 'TOPLEFT', 10, -4, L["Raid Menu"])
-	RaidControlButton:SetScript('OnMouseUp', RU.OnClick_RaidControlButton)
-
-	local DisbandRaidButton = RU:CreateUtilButton('RaidUtility_DisbandRaidButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', RaidControlButton, 'TOPRIGHT', 3, 0, L["Disband Group"])
-	DisbandRaidButton:SetScript('OnMouseUp', RU.OnClick_DisbandRaidButton)
+	local RaidControlButton = RU:CreateUtilButton('RaidUtility_RaidControlButton', RaidUtilityPanel, nil, BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', RaidUtilityPanel, 'TOPLEFT', 10, -4, L["Raid Menu"], nil, nil, nil, RU.OnClick_RaidControlButton)
+	local ReadyCheckButton = RU:CreateUtilButton('RaidUtility_ReadyCheckButton', RaidUtilityPanel, nil, BUTTON_WIDTH * (E.Classic and 1 or 0.49), BUTTON_HEIGHT, 'TOPLEFT', RaidControlButton, 'BOTTOMLEFT', 0, -5, _G.READY_CHECK, nil, buttonEvents, RU.OnEvent_ReadyCheckButton, RU.OnClick_ReadyCheckButton)
+	RU:CreateUtilButton('RaidUtility_DisbandRaidButton', RaidUtilityPanel, nil, BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', RaidControlButton, 'TOPRIGHT', 3, 0, L["Disband Group"], nil, nil, nil, RU.OnClick_DisbandRaidButton)
 
-	local ReadyCheckButton = RU:CreateUtilButton('RaidUtility_ReadyCheckButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH * (E.Classic and 1 or 0.49), BUTTON_HEIGHT, 'TOPLEFT', RaidControlButton, 'BOTTOMLEFT', 0, -5, _G.READY_CHECK)
-	ReadyCheckButton:SetScript('OnMouseUp', RU.OnClick_ReadyCheckButton)
-
-	local RoleCheckButton
-	if E.Retail or E.Cata then
-		RoleCheckButton = RU:CreateUtilButton('RaidUtility_RoleCheckButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', ReadyCheckButton, 'TOPRIGHT', 3, 0, _G.ROLE_POLL)
-		RoleCheckButton:SetScript('OnMouseUp', RU.OnClick_RoleCheckButton)
+	if E.Retail or E.Wrath then
+		RU:CreateUtilButton('RaidUtility_RoleCheckButton', RaidUtilityPanel, nil, BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', ReadyCheckButton, 'TOPRIGHT', 3, 0, _G.ROLE_POLL, nil, buttonEvents, RU.OnEvent_RoleCheckButton, RU.OnClick_RoleCheckButton)
 	end
 
-	local MainTankButton = RU:CreateUtilButton('RaidUtility_MainTankButton', RaidUtilityPanel, 'SecureActionButtonTemplate, UIMenuButtonStretchTemplate', BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', ReadyCheckButton, 'BOTTOMLEFT', 0, -5, _G.MAINTANK)
+	local MainTankButton = RU:CreateUtilButton('RaidUtility_MainTankButton', RaidUtilityPanel, 'SecureActionButtonTemplate', BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', ReadyCheckButton, 'BOTTOMLEFT', 0, -5, _G.MAINTANK, nil, buttonEvents, RU.OnEvent_MainTankButton)
 	MainTankButton:SetAttribute('type', 'maintank')
 	MainTankButton:SetAttribute('unit', 'target')
 	MainTankButton:SetAttribute('action', 'toggle')
+	RU:FixSecureClicks(MainTankButton)
 
-	local MainAssistButton = RU:CreateUtilButton('RaidUtility_MainAssistButton', RaidUtilityPanel, 'SecureActionButtonTemplate, UIMenuButtonStretchTemplate', BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', MainTankButton, 'TOPRIGHT', 3, 0, _G.MAINASSIST)
+	local MainAssistButton = RU:CreateUtilButton('RaidUtility_MainAssistButton', RaidUtilityPanel, 'SecureActionButtonTemplate', BUTTON_WIDTH * 0.49, BUTTON_HEIGHT, 'TOPLEFT', MainTankButton, 'TOPRIGHT', 3, 0, _G.MAINASSIST, nil, buttonEvents, RU.OnEvent_MainAssistButton)
 	MainAssistButton:SetAttribute('type', 'mainassist')
 	MainAssistButton:SetAttribute('unit', 'target')
 	MainAssistButton:SetAttribute('action', 'toggle')
+	RU:FixSecureClicks(MainAssistButton)
 
 	local RaidCountdownButton
 	if hasCountdown then
-		RaidCountdownButton = RU:CreateUtilButton('RaidUtility_RaidCountdownButton', RaidUtilityPanel, 'UIMenuButtonStretchTemplate', BUTTON_WIDTH * (E.Retail and 0.78 or 1), BUTTON_HEIGHT, 'TOPLEFT', MainTankButton, 'BOTTOMLEFT', 0, -5, L["Countdown"])
-		RaidCountdownButton:SetScript('OnMouseUp', RU.OnClick_RaidCountdownButton)
+		RaidCountdownButton = RU:CreateUtilButton('RaidUtility_RaidCountdownButton', RaidUtilityPanel, nil, BUTTON_WIDTH * (E.Retail and 0.78 or 1), BUTTON_HEIGHT, 'TOPLEFT', MainTankButton, 'BOTTOMLEFT', 0, -5, L["Countdown"], nil, nil, nil, RU.OnClick_RaidCountdownButton)
 	end
 
-	local EveryoneAssist = RU:CreateCheckBox('RaidUtility_EveryoneAssist', RaidUtilityPanel, nil, BUTTON_WIDTH, BUTTON_HEIGHT + 4, 'TOPLEFT', RaidCountdownButton or MainTankButton, 'BOTTOMLEFT', -4, -3, _G.ALL_ASSIST_LABEL_LONG, {'GROUP_ROSTER_UPDATE', 'PARTY_LEADER_CHANGED'}, RU.OnEvent_EveryoneAssist, RU.OnClick_EveryoneAssist)
-
+	local EveryoneAssist = RU:CreateCheckBox('RaidUtility_EveryoneAssist', RaidUtilityPanel, 'UICheckButtonTemplate', BUTTON_HEIGHT + 4, 'TOPLEFT', RaidCountdownButton or MainTankButton, 'BOTTOMLEFT', -4, -3, _G.ALL_ASSIST_LABEL_LONG, buttonEvents, RU.OnEvent_EveryoneAssist, RU.OnClick_EveryoneAssist)
 	if SetRestrictPings then
-		RU:CreateCheckBox('RaidUtility_RestrictPings', RaidUtilityPanel, nil, BUTTON_WIDTH, BUTTON_HEIGHT + 4, 'TOPLEFT', EveryoneAssist, 'BOTTOMLEFT', 0, 0, _G.RAID_MANAGER_RESTRICT_PINGS, {'GROUP_ROSTER_UPDATE', 'PARTY_LEADER_CHANGED'}, RU.OnEvent_RestrictPings, RU.OnClick_RestrictPings)
+		RU:CreateCheckBox('RaidUtility_RestrictPings', RaidUtilityPanel, 'UICheckButtonTemplate', BUTTON_HEIGHT + 4, 'TOPLEFT', EveryoneAssist, 'BOTTOMLEFT', 0, 0, _G.RAID_MANAGER_RESTRICT_PINGS, buttonEvents, RU.OnEvent_RestrictPings, RU.OnClick_RestrictPings)
 	end
 
 	if E.Retail then
diff --git a/ElvUI/Core/Modules/Nameplates/StyleFilter.lua b/ElvUI/Core/Modules/Nameplates/StyleFilter.lua
index d3c4340b90..bff988d701 100644
--- a/ElvUI/Core/Modules/Nameplates/StyleFilter.lua
+++ b/ElvUI/Core/Modules/Nameplates/StyleFilter.lua
@@ -143,6 +143,7 @@ NP.TriggerConditions = {
 		[174] = 'heroic',
 		[185] = 'legacy20normal',
 		[186] = 'legacy40normal',
+		[215] = 'normal', -- Classic: Sunken Temple
 		-- wotlk
 		[175] = 'legacy10normal',
 		[176] = 'legacy25normal',
diff --git a/ElvUI/Core/Modules/Tooltip/Tooltip.lua b/ElvUI/Core/Modules/Tooltip/Tooltip.lua
index d8a748e486..cfa91e5b63 100644
--- a/ElvUI/Core/Modules/Tooltip/Tooltip.lua
+++ b/ElvUI/Core/Modules/Tooltip/Tooltip.lua
@@ -22,8 +22,6 @@ local GetCraftSelectionIndex = GetCraftSelectionIndex
 local GetCreatureDifficultyColor = GetCreatureDifficultyColor
 local GetGuildInfo = GetGuildInfo
 local GetItemCount = GetItemCount
-local GetItemInfo = GetItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetMouseFocus = GetMouseFocus
 local GetNumGroupMembers = GetNumGroupMembers
 local GetRelativeDifficultyColor = GetRelativeDifficultyColor
@@ -73,6 +71,9 @@ local TooltipDataType = Enum.TooltipDataType
 local AddTooltipPostCall = TooltipDataProcessor and TooltipDataProcessor.AddTooltipPostCall
 local GetDisplayedItem = TooltipUtil and TooltipUtil.GetDisplayedItem
 
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+
 local GameTooltip, GameTooltipStatusBar = GameTooltip, GameTooltipStatusBar
 local C_QuestLog_GetQuestIDForLogIndex = C_QuestLog.GetQuestIDForLogIndex
 local C_ChallengeMode_GetDungeonScoreRarityColor = C_ChallengeMode and C_ChallengeMode.GetDungeonScoreRarityColor
diff --git a/ElvUI/Core/Modules/UnitFrames/Elements/BuffIndicator.lua b/ElvUI/Core/Modules/UnitFrames/Elements/BuffIndicator.lua
index e1744bc309..1105269868 100644
--- a/ElvUI/Core/Modules/UnitFrames/Elements/BuffIndicator.lua
+++ b/ElvUI/Core/Modules/UnitFrames/Elements/BuffIndicator.lua
@@ -29,18 +29,17 @@ function UF:Configure_AuraWatch(frame, isPet)
 		frame.AuraWatch.countFontSize = db.countFontSize
 		frame.AuraWatch.countFontOutline = db.countFontOutline
 
-		if frame.unit == 'pet' or isPet then
-			frame.AuraWatch:SetNewTable(E.global.unitframe.aurawatch.PET)
+		local auraTable
+		if (frame.unit == 'pet' or isPet) and db.petSpecific then
+			auraTable = E.global.unitframe.aurawatch.PET
+		elseif db.profileSpecific then
+			auraTable = E.db.unitframe.filters.aurawatch
 		else
-			local auraTable
-			if db.profileSpecific then
-				auraTable = E.db.unitframe.filters.aurawatch
-			else
-				auraTable = E.Filters.Expand({}, E.global.unitframe.aurawatch[E.myclass] or {})
-				E:CopyTable(auraTable, E.global.unitframe.aurawatch.GLOBAL)
-			end
-			frame.AuraWatch:SetNewTable(auraTable)
+			auraTable = E.Filters.Expand({}, E.global.unitframe.aurawatch[E.myclass] or {})
+			E:CopyTable(auraTable, E.global.unitframe.aurawatch.GLOBAL)
 		end
+
+		frame.AuraWatch:SetNewTable(auraTable)
 	elseif frame:IsElementEnabled('AuraWatch') then
 		frame:DisableElement('AuraWatch')
 	end
diff --git a/ElvUI/Core/Modules/UnitFrames/Elements/Threat.lua b/ElvUI/Core/Modules/UnitFrames/Elements/Threat.lua
index 2f57bf4690..55283d9dbb 100644
--- a/ElvUI/Core/Modules/UnitFrames/Elements/Threat.lua
+++ b/ElvUI/Core/Modules/UnitFrames/Elements/Threat.lua
@@ -32,12 +32,16 @@ function UF:Configure_Threat(frame)
 	local threat = frame.ThreatIndicator
 	if not threat then return end
 
-	local threatStyle = frame.db and frame.db.threatStyle
+	local db = frame.db
+	local threatStyle = db and db.threatStyle
 	if threatStyle and threatStyle ~= 'NONE' then
 		if not frame:IsElementEnabled('ThreatIndicator') then
 			frame:EnableElement('ThreatIndicator')
 		end
 
+		local unit = frame.unitframeType
+		threat.feedbackUnit = db.threatPlayer and (unit == 'target' or unit == 'focus') and 'player' or nil
+
 		if threatStyle == 'GLOW' then
 			threat:SetFrameStrata('BACKGROUND')
 			threat.MainGlow:ClearAllPoints()
@@ -151,12 +155,13 @@ end
 
 function UF:UpdateThreat(unit, status, r, g, b)
 	local parent = self:GetParent()
-	local db = parent.db and parent.db.threatStyle
-	local badunit = not unit or parent.unit ~= unit
 
-	if not badunit and status and status > 1 then
-		UF:ThreatHandler(self, parent, db, status, r, g, b)
+	local db = parent.db
+	if not db then return end
+
+	if (unit and parent.unit == unit) and status and status > (db.threatPrimary and 1 or 0) then
+		UF:ThreatHandler(self, parent, db.threatStyle, status, r, g, b)
 	else
-		UF:ThreatHandler(self, parent, db, nil, unpack(E.media.unitframeBorderColor))
+		UF:ThreatHandler(self, parent, db.threatStyle, nil, unpack(E.media.unitframeBorderColor))
 	end
 end
diff --git a/ElvUI/Core/Modules/UnitFrames/UnitFrames.lua b/ElvUI/Core/Modules/UnitFrames/UnitFrames.lua
index 96fcd23ffd..fc653318e2 100644
--- a/ElvUI/Core/Modules/UnitFrames/UnitFrames.lua
+++ b/ElvUI/Core/Modules/UnitFrames/UnitFrames.lua
@@ -561,7 +561,7 @@ do -- IDs maintained in Difficulty Datatext and Nameplate StyleFilters
 			dungeonHeroic = {2, 39, 174},
 			dungeonMythic = {23, 40},
 			dungeonMythicKeystone = {8},
-			raidNormal = {3, 4, 14, 148, 175, 176, 185, 186}, -- 148 is ZG/AQ40
+			raidNormal = {3, 4, 14, 148, 175, 176, 185, 186, 215}, -- 148 is ZG/AQ40, 215 is Sunken Temple
 			raidHeroic = {5, 6, 15, 193, 194},
 			raidMythic = {16},
 		}
diff --git a/ElvUI/Core/init.lua b/ElvUI/Core/init.lua
index edb51a7be5..9b8d5826e9 100644
--- a/ElvUI/Core/init.lua
+++ b/ElvUI/Core/init.lua
@@ -5,8 +5,8 @@
 ]]
 
 local _G = _G
-local gsub, tinsert, next = gsub, tinsert, next
-local tostring, strfind, type, strsub = tostring, strfind, type, strsub
+local gsub, tinsert, next, type = gsub, tinsert, next, type
+local tostring, tonumber, strfind, strmatch = tostring, tonumber, strfind, strmatch
 
 local CreateFrame = CreateFrame
 local GetBuildInfo = GetBuildInfo
@@ -83,7 +83,6 @@ E.twoPixelsPlease = false -- changing this option is not supported! :P
 
 -- Expansions
 E.TBC = WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC -- not used
-E.Cata = WOW_PROJECT_ID == 11 -- TODO: Cata
 E.Wrath = WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC
 E.Retail = WOW_PROJECT_ID == WOW_PROJECT_MAINLINE
 E.Classic = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
@@ -106,7 +105,7 @@ do
 end
 
 do -- this is different from E.locale because we need to convert for ace locale files
-	local convert = {enGB = 'enUS', esES = 'esMX', itIT = 'enUS'}
+	local convert = { enGB = 'enUS', esES = 'esMX', itIT = 'enUS' }
 	local gameLocale = convert[E.locale] or E.locale or 'enUS'
 
 	function E:GetLocale()
@@ -115,13 +114,12 @@ do -- this is different from E.locale because we need to convert for ace locale
 end
 
 function E:ParseVersionString(addon)
-	local version = strsub(GetAddOnMetadata(addon, 'Version'), 2)
-	if not strfind(version, '%-') then
-		return tonumber(version), version
-	elseif strfind(version, 'project%-version') then
-		return 99999, 'Development'
+	local version = GetAddOnMetadata(addon, 'Version')
+	if strfind(version, 'project%-version') then
+		return 13.61, '13.61-git', nil, true
 	else
-		return 99999, version
+		local release, extra = strmatch(version, '^v?([%d.]+)(.*)')
+		return tonumber(release), release..extra, extra ~= ''
 	end
 end
 
@@ -162,7 +160,7 @@ do
 	E:AddLib('AceConfigRegistry', 'AceConfigRegistry-3.0-ElvUI')
 	E:AddLib('AceDBOptions', 'AceDBOptions-3.0')
 
-	if E.Retail or E.Cata then
+	if E.Retail or E.Wrath or E.ClassicSOD then
 		E:AddLib('DualSpec', 'LibDualSpec-1.0')
 	end
 
@@ -265,6 +263,18 @@ function E:SetCVar(cvar, value, ...)
 	end
 end
 
+function E:GetAddOnEnableState(addon, character)
+	if C_AddOns_GetAddOnEnableState then
+		return C_AddOns_GetAddOnEnableState(addon, character)
+	else
+		return GetAddOnEnableState(character, addon)
+	end
+end
+
+function E:IsAddOnEnabled(addon)
+	return E:GetAddOnEnableState(addon, E.myname) == 2
+end
+
 function E:SetEasyMenuAnchor(menu, frame)
 	local point = E:GetScreenQuadrant(frame)
 	local bottom = point and strfind(point, 'BOTTOM')
@@ -345,11 +355,7 @@ function E:OnInitialize()
 		E.Minimap:SetGetMinimapShape() -- This is just to support for other mods, keep below UIMult
 	end
 
-	if C_AddOns_GetAddOnEnableState then
-		if C_AddOns_GetAddOnEnableState('Tukui', E.myname) == 2 then
-			E:StaticPopup_Show('TUKUI_ELVUI_INCOMPATIBLE')
-		end
-	elseif GetAddOnEnableState(E.myname, 'Tukui') == 2 then
+	if E:IsAddOnEnabled('Tukui') then
 		E:StaticPopup_Show('TUKUI_ELVUI_INCOMPATIBLE')
 	end
-end
\ No newline at end of file
+end
diff --git a/ElvUI/ElvUI_Classic.toc b/ElvUI/ElvUI_Classic.toc
index e2dd131d53..06d56a1794 100644
--- a/ElvUI/ElvUI_Classic.toc
+++ b/ElvUI/ElvUI_Classic.toc
@@ -6,8 +6,8 @@
 ## SavedVariablesPerCharacter: ElvCharacterDB
 ## OptionalDeps: SharedMedia, Tukui, Masque
 ## RequiredDeps: ElvUI_Libraries
-## Interface: 11501
-## X-Interface: 11501
+## Interface: 11502
+## X-Interface: 11502
 ## X-Tukui-ProjectID: -2
 ## X-Tukui-ProjectFolders: ElvUI, ElvUI_Libraries, ElvUI_Options
 
diff --git a/ElvUI/Locales/esMX.lua b/ElvUI/Locales/esMX.lua
index 61b4259c88..6fde631ddc 100644
--- a/ElvUI/Locales/esMX.lua
+++ b/ElvUI/Locales/esMX.lua
@@ -11,7 +11,7 @@ L["%s frame has a conflicting anchor point. Forcing the Buffs to be attached to
 L["%s is attempting to share his filters with you. Would you like to accept the request?"] = "%s quiere compartir sus filtros contigo. ¿Aceptas la petición?"
 L["%s is attempting to share the profile %s with you. Would you like to accept the request?"] = "%s quiere compartir el perfil %s contigo. ¿Aceptas la petición?"
 L["%s: %s tried to call the protected function '%s'."] = "%s: %s intentó llamar a la función protegida '%s'."
-L["(Ctrl & Shift Click) Toggle CPU Profiling"] = true
+L["(Ctrl & Shift Click) Toggle CPU Profiling"] = "(Ctrl y Clic Shift) Mostrar/Ocultar perfilado de CPU"
 L["(Hold Shift) Memory Usage"] = "(Mantén Shift) Uso de Memoria"
 L["(Shift Click) Collect Garbage"] = "(Clic Shift) Recolectar basura"
 L["A raid marker feature is available by pressing Escape -> Keybinds. Scroll to the bottom -> ElvUI -> Raid Marker."] = "La función de marcador de banda está disponible presionando Escape -> Keybinds. Desplázate a la parte inferior -> ElvUI -> Marcador de banda."
@@ -20,16 +20,16 @@ L["ABOVE_THREAT_FORMAT"] = "%s: %.0f%% [%.0f%% above |cff%02x%02x%02x%s|r]"
 L["Accepting this will reset the UnitFrame settings for %s. Are you sure?"] = "Al aceptar esto, se restablecerá la configuración de UnitFrame para %s. ¿Estás seguro?"
 L["Accepting this will reset your Filter Priority lists for all auras on NamePlates. Are you sure?"] = "Al aceptar esto, se restablecerán las listas de Prioridad de filtro para todas las auras en NamePlates. ¿Estás seguro?"
 L["Accepting this will reset your Filter Priority lists for all auras on UnitFrames. Are you sure?"] = "Al aceptar esto, se restablecerán las listas de Prioridad de filtro para todas las auras en UnitFrames. ¿Estás seguro?"
-L["Active Output Audio Device"] = true
-L["AddOn Memory:"] = true
+L["Active Output Audio Device"] = "Dispositivo de Salida de Audio Activo"
+L["AddOn Memory:"] = "Memoria de addon:"
 L["Adjust the UI Scale to fit your screen."] = "Ajuste la escala de la interfaz de usuario para que se adapte a su pantalla."
-L["Affix"] = true
+L["Affix"] = "Afijo"
 L["AFK"] = "Ausente"
 L["All keybindings cleared for |cff00ff00%s|r."] = "Todos los teclas borrados para |cff00ff00%s|r."
 L["Alliance: "] = "Alianza: "
 L["Already Running.. Bailing Out!"] = "Ya está en ejecución... ¡Cancelando!"
 L["Alternative Power"] = "Poder Alternativo"
-L["Ammo/Shard Counter"] = true
+L["Ammo/Shard Counter"] = "Contador de Municiones/Fragmentos"
 L["AP:"] = "PA:"
 L["Archeology Progress Bar"] = "Barra de Progreso de Arqueología"
 L["Are you sure you want to apply this font to all ElvUI elements?"] = "¿Estás seguro de que deseas aplicar esta fuente a todos los elementos de ElvUI?"
@@ -37,10 +37,10 @@ L["Are you sure you want to disband the group?"] = "¿Estás seguro que quieres
 L["Are you sure you want to reset all the settings on this profile?"] = "¿Estás seguro que deseas restablecer todos los ajustes de este perfil?"
 L["Are you sure you want to reset every mover back to it's default position?"] = "¿Estás seguro que quieres resetear cada fijador a su posición por defecto?"
 L["Arena Frames"] = "Marcos de Arena"
-L["Arena"] = true
+L["Arena"] = "Arenas"
 L["Aura Bars"] = "Barra de Auras"
 L["Auras Set"] = "Conjunto de Auras"
-L["Auras"] = true
+L["Auras"] = "Auras"
 L["Auto Scale"] = "Escalado Automático"
 L["AVD: "] = "EVA: "
 L["Avoidance Breakdown"] = "Desglose de Evasión"
@@ -68,13 +68,13 @@ L["BoE"] = true
 L["BoP"] = true
 L["Boss Button"] = "Botón de Jefe"
 L["Boss Frames"] = "Marco de Jefe"
-L["Boss"] = true
+L["Boss"] = "Jefe"
 L["BossBannerWidget"] = "Jefe Banner"
 L["BoU"] = true
 L["Buffs"] = "Beneficios"
 L["Building(s) Report:"] = "Informe de Edificio(s)"
 L["Calendar"] = "Calendario"
-L["Calling Quest(s) available."] = true
+L["Calling Quest(s) available."] = "Misiones de llamada disponibles."
 L["Can't buy anymore slots!"] = "¡No puedes comprar más espacios!"
 L["Can't Roll"] = "No puede tirar dados"
 L["Character: "] = "Personaje: "
@@ -83,19 +83,19 @@ L["Chat"] = "Chat"
 L["Choose a theme layout you wish to use for your initial setup."] = "Elige un tema de distribución para usar en tu configuración inicial."
 L["Class Bar"] = "Barra de Clase"
 L["Classic"] = "Clásico"
-L["Combat Indicator"] = true
+L["Combat Indicator"] = "Indicador de Combate"
 L["Combat"] = "Combate"
 L["Combat/Arena Time"] = "Tiempo de Combate / Arena"
 L["Config Mode:"] = "Modo de Configuración"
 L["Confused.. Try Again!"] = "Confundido... ¡Intenta de Nuevo!"
 L["Continue"] = "Continuar"
-L["Coords"] = true
+L["Coords"] = "Coordenadas"
 L["copperabbrev"] = "|cffeda55fc|r"
 L["Current Difficulties:"] = "Dificultades actuales:"
 L["Current Level:"] = "Nivel Actual:"
 L["CVars Set"] = "CVars Configuradas"
 L["CVars"] = "CVars"
-L["Daily Reset"] = true
+L["Daily Reset"] = "Reinicio de Diara"
 L["Dark"] = "Oscuro"
 L["Data From: %s"] = "Datos De: %s"
 L["Dead"] = "Muerto"
@@ -105,7 +105,7 @@ L["Delete gray items?"] = "¿Eliminar objetos grises?"
 L["Deposit Reagents"] = "Depositar Componentes"
 L["Disable Warning"] = "Deshabilitar Advertencia"
 L["Disable"] = "Desactivar"
-L["Disabled"] = true
+L["Disabled"] = "Desactivado"
 L["Disband Group"] = "Disolver Grupo"
 L["Discard"] = "Descartar"
 L["Discord"] = true
@@ -114,7 +114,7 @@ L["Do you swear not to post in technical support about something not working wit
 L["Don't forget to backup your WTF folder, all your profiles and settings are in there."] = "No olvides hacer una copia de seguridad de tu carpeta WTF, todos tus perfiles y configuraciones están ahí."
 L["Download"] = "Descarga"
 L["DPS"] = "DPS"
-L["Durability Frame"] = true
+L["Durability Frame"] = "Marco de Durabilidad"
 L["Earned:"] = "Ganada:"
 L["Elite"] = "Élite"
 L["ElvUI has a dual spec feature which allows you to load different profiles based on your current spec on the fly. You can enable it in the profiles tab."] = "ElvUI tiene una función de doble especificación que te permite cargar diferentes perfiles basados en tu especificación actual sobre la marcha. Puedes activarlo en la pestaña de perfiles."
@@ -123,7 +123,7 @@ L["ElvUI is five or more revisions out of date. You can download the newest vers
 L["ElvUI is out of date. You can download the newest version from tukui.org."] = "ElvUI está desactualizado. Puedes descargar la versión más nueva de tukui.org."
 L["ElvUI Plugin Installation"] = "Instalación del plugin de ElvUI"
 L["Status"] = "Estatus"
-L["ElvUI Version:"] = true
+L["ElvUI Version:"] = "Versión de ElvUI:"
 L["Error resetting UnitFrame."] = "Error al restablecer UnitFrame."
 L["EventToastWidget"] = true
 L["Experience Bar"] = "Barra de Experiencia"
@@ -131,7 +131,7 @@ L["Experience"] = "Experiencia"
 L["Filter download complete from %s, would you like to apply changes now?"] = "Se completó la descarga de los filtros de %s. ¿Quieres aplicar los cambios ahora?"
 L["Finished"] = "Terminado"
 L["Fishy Loot"] = "Botín Sospechoso"
-L["Focus Aura Bars"] = true
+L["Focus Aura Bars"] = "Barras de Aura del Foco"
 L["Focus Castbar"] = "Barra de Lanzamiento del Foco"
 L["Focus Frame"] = "Marco de Foco"
 L["FocusTarget Frame"] = "Marco de Objetivo del Foco"
@@ -143,19 +143,19 @@ L["Ghost"] = "Fantasma"
 L["GM Ticket Frame"] = "Marco de Consultas para el MJ"
 L["Gold"] = "Oro"
 L["goldabbrev"] = "|cffffd700g|r"
-L["Grays"] = true
+L["Grays"] = "Grises"
 L["Grid Size:"] = "Tamaño de la Rejilla:"
-L["Heal Power"] = true
+L["Heal Power"] = "Poder de Sanación"
 L["Healer"] = "Sanador"
 L["Hold Control + Right Click:"] = "Mantén Control y Haz Clic Derecho:"
 L["Hold Shift + Drag:"] = "Mantén Shift y Arrastra:"
 L["Hold Shift + Right Click:"] = "Mantén Shift + Botón Derecho:"
-L["Hold Shift:"] = true
+L["Hold Shift:"] = "Mantén Shift:"
 L["Home Latency:"] = "Latencia Local:"
 L["Home Protocol:"] = "Protocolo Local:"
 L["Honor Bar"] = "Barra de Honor"
-L["Honor Remaining:"] = "Honor restante:"
-L["Honor XP:"] = true
+L["Honor Remaining:"] = "Honor Restante:"
+L["Honor XP:"] = "EXP de Honor:"
 L["Horde: "] = "Horda: "
 L["HP"] = "Salud"
 L["HPS"] = "VPS"
@@ -164,7 +164,7 @@ L["I"] = true
 L["Icons Only"] = "Sólo Iconos"
 L["If you accidentally removed a default chat tab you can always re-run the chat part of the ElvUI installer."] = "Si accidentalmente has eliminado una pestaña de chat por defecto, siempre puedes volver a ejecutar la parte del chat del instalador de ElvUI."
 L["If you are experiencing issues with ElvUI try disabling all your addons except ElvUI first."] = "Si estás experimentando problemas con ElvUI intenta desactivar todos tus complementos excepto ElvUI primero."
-L["If you have an icon or aurabar that you don't want to display simply hold down shift and right click the icon for it to disapear."] = true
+L["If you have an icon or aurabar that you don't want to display simply hold down shift and right click the icon for it to disapear."] = "Si tienes un icono o una barra de aura que no deseas mostrar, simplemente mantén presionada la tecla Shift y haz clic derecho en el icono para que desaparezca."
 L["IL"] = "LI"
 L["Importance: |cFF33FF33Low|r"] = "Importancia: |cFF33FF33Baja|r"
 L["Importance: |cffD3CF00Medium|r"] = "Importancia: |cffD3CF00Media|r"
@@ -172,7 +172,7 @@ L["Importance: |cffFF3333High|r"] = "Importancia: |cffFF3333Alta|r"
 L["In Progress"] = "En Progreso"
 L["INCOMPATIBLE_ADDON"] = "%s is not compatible with %s.\nPlease select the addon/module to use."
 L["Installation Complete"] = "Instalación Completa"
-L["Interrupted %s's |cff71d5ff|Hspell:%d:0|h[%s]|h|r!"] = true
+L["Interrupted %s's |cff71d5ff|Hspell:%d:0|h[%s]|h|r!"] = "¡|cff71d5ff|Hspell:%d:0|h[%s]|h|r de %s Interrumpido!"
 L["Invalid Target"] = "Objetivo Inválido"
 L["is looking for members"] = "está buscando miembros"
 L["It appears one of your AddOns have disabled the AddOn Blizzard_CompactRaidFrames. This can cause errors and other issues. The AddOn will now be re-enabled."] = "Parece ser que uno de tus addons ha desactivado el addon Blizzard_CompactRaidFrames. Esto puede causar errores y otros problemas. El addon será ahora reactivado."
@@ -203,11 +203,11 @@ L["Layout Set"] = "Distribución Establecida"
 L["Layout"] = "Distribución"
 L["Left Chat"] = "Chat Izquierdo"
 L["Left Click:"] = "Clic Izquierdo"
-L["Level %d"] = true
+L["Level %d"] = "Nivel %d"
 L["Level"] = "Nivel"
 L["List of installations in queue:"] = "Lista de Instalaciones en cola:"
-L["Loadouts"] = true
-L["Location"] = true
+L["Loadouts"] = "Cargas"
+L["Location"] = "Ubicación"
 L["Lock"] = "Bloquear"
 L["LOGIN_MSG"] = ("Bienvenido a *ElvUI|r versión *%s|r, escribe */ec|r para acceder al menú de configuración del juego. Si necesita ayuda, puede visítenos en https://tukui.org o unirse a nuestro Discord: https://discord.tukui.org"):gsub('*', E.InfoColor)
 L["LOGIN_MSG_HELP"] = ("Por favor, escriba */ehelp|r para obtener una lista de los comandos de *ElvUI|r disponibles."):gsub('*', E.InfoColor)
@@ -218,26 +218,26 @@ L["Lord! It's a miracle! The download up and vanished like a fart in the wind! T
 L["Loss Control Icon"] = "Icono de Pérdida de Control"
 L["lvl"] = "Niv"
 L["MA Frames"] = "Marcos de AP"
-L["Max Level"] = true
+L["Max Level"] = "Nivel Máx."
 L["Micro Bar"] = "Micro Barra"
-L["Minimap Cluster"] = true
+L["Minimap Cluster"] = "Grupo de Minimapa"
 L["Minimap"] = "Minimapa"
 L["MirrorTimer"] = true
 L["Mission(s) Report:"] = "Informe de Misión(es)"
 L["Mitigation By Level: "] = "Mitigación Por Nivel: "
 L["Mobile"] = "Móvil"
-L["Mov. Speed"] = true
+L["Mov. Speed"] = "Velocidad de Movimiento"
 L["MT Frames"] = "Marcos de TP"
-L["Mythic+ Best Run:"] = true
-L["Mythic+ Score:"] = true
+L["Mythic+ Best Run:"] = "Mejor Mítico+:"
+L["Mythic+ Score:"] = "Índice Mítico+:"
 L["Naval Mission(s) Report:"] = "Informe de Misión(es) Navales"
 L["Need help? Join our Discord: https://discord.tukui.org"] = "¿Necesitas ayuda? Únase a nuestro Discord: https://discord.tukui.org"
-L["New Profile will create a fresh profile for this character."] = true
-L["New Profile"] = true
+L["New Profile will create a fresh profile for this character."] = "Nuevo Perfil creará un perfil nuevo para este personaje."
+L["New Profile"] = "Nuevo Perfil"
 L["No bindings set."] = "No hay teclas establecidas."
 L["No gray items to delete."] = "No hay objetos grises para eliminar."
 L["No Guild"] = "Sin Hermandad"
-L["No Loot"] = true
+L["No Loot"] = "Sin Botín"
 L["None"] = "Ninguno"
 L["Nudge"] = "Ajuste Fino"
 L["O"] = "O"
@@ -246,20 +246,20 @@ L["Offline"] = "Fuera de Línea"
 L["Oh lord, you have got ElvUI and Tukui both enabled at the same time. Select an addon to disable."] = "Oh cielos, tienes ElvUI y Tukui habilitados al mismo tiempo. Elige un addon a deshabilitar"
 L["One or more of the changes you have made require a ReloadUI."] = "Uno o más de los cambios que has hecho requieren una recarga de la interfaz."
 L["One or more of the changes you have made will effect all characters using this addon. You will have to reload the user interface to see the changes you have made."] = "Uno o más de los cambios que has hecho afectaran a todos los personajes que usen este addon. Tendrás que recargar la intefaz de usuario para ver el cambio que has realizado."
-L["Output Audio Device"] = true
+L["Output Audio Device"] = "Dispositivo de Salida de Audio"
 L["P"] = "G"
 L["Paragon"] = true
 L["Party Frames"] = "Marco de Grupo"
 L["Pending"] = "Pendiente"
-L["Pet Aura Bars"] = true
+L["Pet Aura Bars"] = "Barras de Aura de Mascota"
 L["Pet Bar"] = "Barra de Mascota"
 L["Pet Castbar"] = "Barra de Lanzamiento de Mascota"
-L["Pet Experience Bar"] = true
-L["Pet Experience"] = true
+L["Pet Experience Bar"] = "Barra de Experiencia de Mascota"
+L["Pet Experience"] = "Experiencia de Mascota"
 L["Pet Frame"] = "Marco de Mascota"
 L["PetTarget Frame"] = "Marco de Objetivo de Mascota"
 L["PL"] = "LG"
-L["Player Aura Bars"] = true
+L["Player Aura Bars"] = "Barras de Aura del Jugador"
 L["Player Buffs"] = "Ventajas de Jugador"
 L["Player Castbar"] = "Barra de Lanzamiento del Jugador"
 L["Player Debuffs"] = "Perjuicios de Jugador"
@@ -267,33 +267,33 @@ L["Player Frame"] = "Marco de Jugador"
 L["Player NamePlate"] = "Placa de Nombre de Jugador"
 L["Please click the button below so you can setup variables and ReloadUI."] = "Haz clic en el botón de abajo para configurar variables y recargar la interfaz."
 L["Please click the button below to setup your CVars."] = "Haz clic en el botón de abajo para configurar las CVars"
-L["Please click the button below to setup your Profile Settings."] = true
+L["Please click the button below to setup your Profile Settings."] = "Haz clic en el botón de abajo para configurar tus ajustes de perfil."
 L["Please press the continue button to go onto the next step."] = "Presiona el botón de continuar para ir al siguiente paso"
 L["PowerBarWidget"] = true
 L["Profile download complete from %s, but the profile %s already exists. Change the name or else it will overwrite the existing profile."] = "Descarga de perfil de %s completa, pero el perfil %s ya existe. Cámbiale el nombre o se reemplazará el perfil existente."
 L["Profile download complete from %s, would you like to load the profile %s now?"] = "Descarga de perfil de %s completa ¿Quieres cargar el perfil %s ahora?"
 L["Profile request sent. Waiting for response from player."] = "Petición de perfil enviada. Esperando respuesta del jugador."
-L["Profile Settings Setup"] = true
+L["Profile Settings Setup"] = "Configuración de ajustes de perfil"
 L["Profit:"] = "Ganancia:"
 L["Purchase Bags"] = "Comprar Bolsas"
 L["Purchase"] = "Comprar"
-L["Quest Log XP:"] = true
-L["Quest Log"] = true
-L["Quest Objective Frame"] = true
-L["Quest Timer Frame"] = true
+L["Quest Log XP:"] = "EXP de Registro de Misiones"
+L["Quest Log"] = "Registro de Misiones"
+L["Quest Objective Frame"] = "Marco de Objetivo de Misión"
+L["Quest Timer Frame"] = "Marco de Temporizador de Misión"
 L["R"] = "B"
-L["Raid %d Frames"] = true
+L["Raid %d Frames"] = "Marco de Banda %d"
 L["Raid Menu"] = "Menú de Banda"
-L["Raid Pet Frames"] = true
-L["Rare Elite"] = true
-L["Rare"] = true
+L["Raid Pet Frames"] = "Marcos de Mascota de Banda"
+L["Rare Elite"] = "Élite Raro"
+L["Rare"] = "Raro"
 L["Reagent Bank"] = "Banco de Componentes"
 L["Remaining:"] = "Restante"
 L["Remove Bar %d Action Page"] = "Quitar Barra %d de la paginación"
 L["Reputation Bar"] = "Barra de Reputación"
 L["Request was denied by user."] = "Petición denegada por el jugador."
 L["Reset Character Data: Hold Shift + Right Click"] = "Restablecer los datos de los personajes: Mantener Shift + Click derecho"
-L["Reset Position"] = "Reestablecer Posición"
+L["Reset Position"] = "Restablecer Posición"
 L["Reset Session Data: Hold Ctrl + Right Click"] = "Restablecer los datos de la sesión: Mantener Ctrl + Click derecho"
 L["Rested:"] = "Descansado:"
 L["Right Chat"] = "Chat Derecho"
@@ -305,37 +305,37 @@ L["Saved Dungeon(s)"] = "Mazmorra(s) Guardada"
 L["Saved Raid(s)"] = "Banda(s) Guardada(s)"
 L["says"] = "dice"
 L["Select the type of aura system you want to use with ElvUI's unitframes. Set to Aura Bars to use both aura bars and icons, set to Icons Only to only see icons."] = "Seleccione el tipo de sistema de aura que desea usar con los cuadros unitarios de ElvUI. Establezca en barras de Aura y Iconos para usar tanto las barras de aura como los íconos, configure los íconos solo para ver solo los íconos."
-L["Select Volume Stream"] = true
+L["Select Volume Stream"] = "Seleccionar Flujo de Volumen"
 L["Server: "] = "Servidor: "
 L["Session:"] = "Sesión:"
 L["Setup Chat"] = "Configurar Chat"
 L["Setup CVars"] = "Configurar CVars"
-L["Shared Profile will select the default profile."] = true
-L["Shared Profile"] = true
-L["Shift + Left Click to Toggle Bag"] = true
+L["Shared Profile will select the default profile."] = "El Perfil Compartido seleccionará el perfil predeterminado."
+L["Shared Profile"] = "Perfil Compartido"
+L["Shift + Left Click to Toggle Bag"] = "Shift + Clic Izquierdo para Mostrar/Ocultar la Bolsa"
 L["Show/Hide Reagents"] = "Mostrar/Ocultar Componentes"
 L["Shows a frame with needed info for support."] = "Muestra un marco que contiene información para ayudar a apoyar."
 L["silverabbrev"] = "|cffc7c7cfs|r"
-L["Sort Bags"] = true
+L["Sort Bags"] = "Ordenar Bolsas"
 L["SP"] = "PH"
 L["Spec"] = "Espec"
-L["Spell Haste"] = true
-L["Spell Hit"] = true
-L["Spell Power"] = true
+L["Spell Haste"] = "Celeridad de Hechizo"
+L["Spell Hit"] = "Golpear con Hechizo"
+L["Spell Power"] = "Poder de Hechizo"
 L["Spent:"] = "Gastada:"
-L["Stack Items In Bags"] = true
-L["Stack Items In Bank"] = true
-L["Stack Items To Bags"] = true
-L["Stack Items To Bank"] = true
+L["Stack Items In Bags"] = "Apilar Objetos en Bolsas"
+L["Stack Items In Bank"] = "Apilar Objetos en Banco"
+L["Stack Items To Bags"] = "Apilar Objetos a las Bolsas"
+L["Stack Items To Bank"] = "Apilar Objetos al Banco"
 L["Stance Bar"] = "Barra de Forma"
 L["Steps"] = "Pasos"
 L["Sticky Frames"] = "Marcos Adhesivos"
 L["System"] = "Sistema"
 L["Talent/Loot Specialization"] = "Especialización en Talento / Botín"
-L["Target Aura Bars"] = true
+L["Target Aura Bars"] = "Barras de Aura del Objetivo"
 L["Target Castbar"] = "Barra de Lanzamiento del Objetivo"
 L["Target Frame"] = "Marco de Objetivo"
-L["Target Mitigation"] = true
+L["Target Mitigation"] = "Mitigación de Objetivo"
 L["Targeted By:"] = "Objetivo De:"
 L["TargetTarget Frame"] = "Marco de Objetivo de Objetivo"
 L["TargetTargetTarget Frame"] = "Marco del Objetivo del Objetivo del Objetivo"
@@ -351,24 +351,24 @@ L["This part of the installation process sets up your chat windows names, positi
 L["This part of the installation process sets up your World of Warcraft default options it is recommended you should do this step for everything to behave properly."] = "Esta parte de la instalación configura las opciones predeterminadas de World of Warcraft. Se recomienda hacer este paso para que todo funcione apropiadamente."
 L["This setting caused a conflicting anchor point, where '%s' would be attached to itself. Please check your anchor points. Setting '%s' to be attached to '%s'."] = "Esta opción causó un punto de fijación en conflicto, donde '%s' estaría adjunto a sí mismo. Por favor comprueba tus puntos de fijación. Opción '%s' a ser fijado a '%s'"
 L["This will change the layout of your unitframes and actionbars."] = "Ésto cambiará el diseño de los marcos de unidades y barras de acción."
-L["Threat Bar"] = true
-L["Time Alert Frame"] = true
+L["Threat Bar"] = "Barra de Amenaza"
+L["Time Alert Frame"] = "Marco de Alerta de Tiempo"
 L["To list all available ElvUI commands, type in chat /ehelp"] = "Para listar todos los comandos disponibles de ElvUI, escribe en el chat /ehelp"
 L["To quickly move around certain elements of the UI, type /emove"] = "Para desplazarse rápidamente por determinados elementos de la interfaz de usuario, escriba /emove"
 L["To setup chat colors, chat channels and chat font size, right-click the chat tab name."] = "Para configurar los colores del chat, los canales del chat y el tamaño de la fuente del chat, haz clic con el botón derecho del ratón en el nombre de la pestaña del chat."
 L["Toggle Bags"] = "Mostrar/Ocultar Bolsas"
 L["Toggle Chat Frame"] = "Mostrar/Ocultar Marco de Chat"
 L["Toggle Configuration"] = "Mostrar/Ocultar Configuración"
-L["Toggle Volume Stream"] = true
+L["Toggle Volume Stream"] = "Mostrar/Ocultar Flujo de Volumen"
 L["Tooltip"] = "Descripción Emergente"
 L["TopCenterWidget"] = true
-L["Torghast Choice Toggle"] = true
+L["Torghast Choice Toggle"] = "Mostrar/Ocultar Torghast"
 L["Total CPU:"] = "CPU Total:"
 L["Total: "] = "Total: "
-L["Totem Bar"] = true
-L["Totem Tracker"] = true
+L["Totem Bar"] = "Barra de Tótem"
+L["Totem Tracker"] = "Rastreador de Tótem"
 L["Trigger"] = "Disparador"
-L["UI Scale"] = true
+L["UI Scale"] = "Escala de IU"
 L["Unhittable:"] = "Imbatible:"
 L["Vehicle Seat Frame"] = "Marco del Asiento del Vehículo"
 L["VehicleLeaveButton"] = true
@@ -377,16 +377,16 @@ L["Vendor Grays"] = "Vender Objetos Grises"
 L["Vendored gray items for: %s"] = "Objetos grises vendidos por: %s"
 L["Vendoring Grays"] = "Vendiendo Grises"
 L["Voice Overlay"] = "Voz Superpuesta"
-L["Volume Streams"] = true
-L["Volume"] = true
+L["Volume Streams"] = "Flujo de Volumen"
+L["Volume"] = "Volumen"
 L["Welcome to ElvUI version %.2f!"] = "Bienvenido(a) a ElvUI versión %.2f!"
 L["whispers"] = "susurra"
 L["World Latency:"] = "Latencia Mundial:"
 L["World Protocol:"] = "Protocolo Mundial:"
-L["WoW Token:"] = true
-L["XP:"] = "XP:"
+L["WoW Token:"] = "Ficha de WoW:"
+L["XP:"] = "EXP:"
 L["yells"] = "grita"
-L["You are now finished with the installation process. If you are in need of technical support please join our Discord."] = true
+L["You are now finished with the installation process. If you are in need of technical support please join our Discord."] = "Ahora has terminado con el proceso de instalación. Si necesitas soporte técnico, por favor únete a nuestro Discord."
 L["You are using CPU Profiling. This causes decreased performance. Do you want to disable it or continue?"] = "Está utilizando el perfil de CPU CVar. Esto provoca una disminución del rendimiento. ¿Desea deshabilitarlo o continuar?"
 L["You can access the copy chat and chat menu functions by left/right clicking on the icon in the top right corner of the chat panel."] = "Puedes acceder a las funciones de copiar el chat y el menú del chat haciendo clic izquierdo/derecho en el icono de la esquina superior derecha del panel de chat."
 L["You can access the microbar by using middle mouse button on the minimap. You can also enable the MicroBar in the actionbar settings."] = "Puedes acceder a la microbarra utilizando el botón central del ratón en el minimapa. También puedes activar la microbarra en los ajustes de la barra de acción."
@@ -405,15 +405,15 @@ L["Your items have been repaired using guild bank funds for: "] = "Tus objetos h
 L["Your profile was successfully recieved by the player."] = "Tu perfil ha sido recibido exitosamente por el jugador."
 L["Zone Ability"] = "Habilidad de Zona"
 L["|cFFE30000Lua error recieved. You can view the error message when you exit combat."] = "|cFFE30000Error de Lua recibido. Podrás ver el error cuando salgas de combate."
-L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = true
+L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = "|cffFFFFFFControl + Clic Izquierdo:|r Cambiar Carga"
 L["|cffFFFFFFLeft Click:|r Change Talent Specialization"] = "|cffFFFFFFClic Izquierdo:|r Cambiar Especialización de Talentos"
-L["|cFFffffffLeft Click:|r Select Volume Stream"] = true
-L["|cFFffffffMiddle Click:|r Toggle Mute Master Stream"] = true
+L["|cFFffffffLeft Click:|r Select Volume Stream"] = "|cFFffffffClic Izquierdo:|r Seleccionar Flujo de Volumen"
+L["|cFFffffffMiddle Click:|r Toggle Mute Master Stream"] = "|cFFffffffClic Medio:|r Mostrar/Ocultar Flujo del Silenciador Maestro"
 L["|cffFFFFFFRight Click:|r Change Loot Specialization"] = "|cffFFFFFFClic Derecho:|r Cambiar Especialización de Botín"
-L["|cFFffffffRight Click:|r Toggle Volume Stream"] = true
-L["|cFFffffffShift + Left Click:|r Open System Audio Panel"] = true
+L["|cFFffffffRight Click:|r Toggle Volume Stream"] = "|cFFffffffClic Derecho:|r Mostrar/Ocultar Flujo de Volumen"
+L["|cFFffffffShift + Left Click:|r Open System Audio Panel"] = "|cFFffffffShift + Clic Izquierdo:|r Abrir Panel de Audio del Sistema"
 L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = "|cffFFFFFFShift + Clic Izquierdo:|r Mostrar Interfaz de Especialización de Talentos"
-L["|cFFffffffShift + Right Click:|r Select Output Audio Device"] = true
+L["|cFFffffffShift + Right Click:|r Select Output Audio Device"] = "|cFFffffffShift + Clic Derecho:|r Seleccionar Dispositivo de Salida de Audio"
 
 ----------------------------------
 L["DESC_MOVERCONFIG"] = [=[Fijadores desbloqueados. Muévelos ahora y haz clic en Bloquear cuando termines.
diff --git a/ElvUI/Locales/ptBR.lua b/ElvUI/Locales/ptBR.lua
index 35c9ebcfd6..b5c6dd75ea 100644
--- a/ElvUI/Locales/ptBR.lua
+++ b/ElvUI/Locales/ptBR.lua
@@ -4,32 +4,32 @@ local L = E.Libs.ACL:NewLocale('ElvUI', 'ptBR')
 
 L["Countdown"] = "Iniciar"
 L["Reset"] = "Reiniciar"
-L["ELVUI_DESC"] = ("*ElvUI|r |cFFffffffé um Addon completo de substituição da interface original do World of Warcraft.|r"):gsub('*', E.InfoColor)
-L["UPDATE_REQUEST"] = "Parece haver um problema com sua instalação. Por favor reinstale ElvUI."
-L[" |cff00ff00bound to |r"] = " |cff00ff00Ligado a |r"
-L["%s frame has a conflicting anchor point. Forcing the Buffs to be attached to the main unitframe."] = "O quadro %s está conflitando com outro ponto de fixação. Forçando os Buffs serem anexados ao Quadro de Unidade principal."
+L["ELVUI_DESC"] = ("*ElvUI|r |cFFffffffé um Addon de substituição completa da interface original do World of Warcraft.|r"):gsub('*', E.InfoColor)
+L["UPDATE_REQUEST"] = "Parece haver um problema com sua instalação. Por favor reinstale o ElvUI."
+L[" |cff00ff00bound to |r"] = " |cff00ff00vinculado a |r"
+L["%s frame has a conflicting anchor point. Forcing the Buffs to be attached to the main unitframe."] = "O quadro %s está conflitando com outro ponto de fixação. Forçando os Bônus a serem anexados ao Quadro de Unidade principal."
 L["%s is attempting to share his filters with you. Would you like to accept the request?"] = "%s está tentando compartilhar os filtros dele com você. Gostaria de aceitar o pedido?"
 L["%s is attempting to share the profile %s with you. Would you like to accept the request?"] = "%s está tentando compartilhar o perfil %s com você. Gostaria de aceitar o pedido?"
 L["%s: %s tried to call the protected function '%s'."] = "%s: %s tentou chamar a função protegida '%s'."
-L["(Ctrl & Shift Click) Toggle CPU Profiling"] = true
+L["(Ctrl & Shift Click) Toggle CPU Profiling"] = "(Ctrl & Shift Clique) Alternar Medição de Desempenho da CPU"
 L["(Hold Shift) Memory Usage"] = "(Segurar Shift) Memória em Uso"
 L["(Shift Click) Collect Garbage"] = "(Clique Shift) Coletar lixo"
-L["A raid marker feature is available by pressing Escape -> Keybinds. Scroll to the bottom -> ElvUI -> Raid Marker."] = true
+L["A raid marker feature is available by pressing Escape -> Keybinds. Scroll to the bottom -> ElvUI -> Raid Marker."] = "Um recurso de marcação de raíde está disponível em Esc -> Atalhos do Teclado. Role o texto para baixo -> ElvUI -> Raid Marker."
 L["A setting you have changed will change an option for this character only. This setting that you have changed will be uneffected by changing user profiles. Changing this setting requires that you reload your User Interface."] = "A definição que você alterou afetará apenas este personagem. Esta definição que você alterou não será afetada por mudanças de perfil. Alterar esta difinição requer que você recarregue a sua interface."
-L["ABOVE_THREAT_FORMAT"] = "%s: %.0f%% [%.0f%% above |cff%02x%02x%02x%s|r]"
-L["Accepting this will reset the UnitFrame settings for %s. Are you sure?"] = "Aceitar isso irá resetar suas configurações de Quadro de Unidade  para %s. Você tem certeza?"
+L["ABOVE_THREAT_FORMAT"] = "%s: %.0f%% [%.0f%% acima de |cff%02x%02x%02x%s|r]"
+L["Accepting this will reset the UnitFrame settings for %s. Are you sure?"] = "Aceitar isso irá resetar suas configurações de Quadro de Unidade para %s. Você tem certeza?"
 L["Accepting this will reset your Filter Priority lists for all auras on NamePlates. Are you sure?"] = "Aceitar isso irá resetar sua lista de Prioridade de Filtros para todas as auras nas Placas de Identificação. Você tem certeza?"
 L["Accepting this will reset your Filter Priority lists for all auras on UnitFrames. Are you sure?"] = "Aceitar isso irá resetar sua lista de Prioridade de Filtros para todas as auras nos Quadros de Unidades. Você tem certeza?"
-L["Active Output Audio Device"] = true
-L["AddOn Memory:"] = true
-L["Adjust the UI Scale to fit your screen."] = true
-L["Affix"] = true
+L["Active Output Audio Device"] = "Dispositivo de Saída de Aúdio Ativo"
+L["AddOn Memory:"] = "Memória do AddOn:"
+L["Adjust the UI Scale to fit your screen."] = "Adjuste a escala da interface para caber na sua tela."
+L["Affix"] = "Afixo"
 L["AFK"] = true
-L["All keybindings cleared for |cff00ff00%s|r."] = "Todos os atalhos livres para |cff00ff00%s|r."
+L["All keybindings cleared for |cff00ff00%s|r."] = "Todos os atalhos foram livrados para |cff00ff00%s|r."
 L["Alliance: "] = "Aliança: "
-L["Already Running.. Bailing Out!"] = "Já está executando... Cancelando a ordenação!"
+L["Already Running.. Bailing Out!"] = "Já está executando... Caindo fora!"
 L["Alternative Power"] = "Poder Alternativo"
-L["Ammo/Shard Counter"] = true
+L["Ammo/Shard Counter"] = "Contador de Munição/Fragmento"
 L["AP:"] = "PA:"
 L["Archeology Progress Bar"] = "Barra de Progressão de Arqueologia"
 L["Are you sure you want to apply this font to all ElvUI elements?"] = "Tem certeza que quer aplicar essa fonte para todos os elementos do ElvUI?"
@@ -42,8 +42,8 @@ L["Aura Bars"] = "Barras de Auras"
 L["Auras Set"] = "Auras Selecionadas"
 L["Auras"] = true
 L["Auto Scale"] = "Dimensionar automaticamente"
-L["AVD: "] = "AVD: "
-L["Avoidance Breakdown"] = "Separação de Anulação"
+L["AVD: "] = true
+L["Avoidance Breakdown"] = "Separação de Evasão"
 L["Azerite Bar"] = "Barra de Azerita"
 L["Bag Bar"] = "Barra das Bolsas"
 L["Bags (Grow Down)"] = "Bolsas (crescer para baixo)"
@@ -55,26 +55,26 @@ L["Bank (Grow Up)"] = "Banco (crescer para cima)"
 L["Bank"] = "Banco"
 L["Bar "] = "Barra "
 L["Bars"] = "Barras"
-L["Battleground datatexts temporarily hidden, to show type /bgstats"] = true
-L["Battleground datatexts will now show again if you are inside a battleground."] = "Os textos Informativos irão agora ser mostrados se estiver dentro de um Campo de Batalha."
+L["Battleground datatexts temporarily hidden, to show type /bgstats"] = "Textos Informativos de Campo de Batalha estão temporariamente escondidos, para mostrar digite /bgstats"
+L["Battleground datatexts will now show again if you are inside a battleground."] = "Os Textos Informativos irão agora ser mostrados se estiver dentro de um Campo de Batalha."
 L["BelowMinimapWidget"] = true
 L["Binding"] = "Ligações"
 L["BINDINGS_HELP"] = ("Hover your mouse over any *action|r, *micro|r, *macro|r, or *spellbook|r button to bind it. This also works for items in your *bag|r. Press the ^ESC|r key to ^clear|r the current bindings."):gsub('*', E.InfoColor):gsub('%^', E.InfoColor2)
 L["Binds Discarded"] = "Ligações Descartadas"
 L["Binds Saved"] = "Ligações Salvas"
-L["Blizzard Widgets"] = true
+L["Blizzard Widgets"] = "Widgets da Blizzard"
 L["BNet Frame"] = "Quadro do Bnet"
 L["BoE"] = true
 L["BoP"] = true
 L["Boss Button"] = "Botão de Chefe"
 L["Boss Frames"] = "Quadros dos Chefes"
-L["Boss"] = true
-L["BossBannerWidget"] = "Banner do Boss"
+L["Boss"] = "Chefe"
+L["BossBannerWidget"] = "Banner do Chefe"
 L["BoU"] = true
 L["Buffs"] = "Bônus"
-L["Building(s) Report:"] = "Relatório de Construções:"
+L["Building(s) Report:"] = "Construindo Relatório(s):"
 L["Calendar"] = "Calendário"
-L["Calling Quest(s) available."] = true
+L["Calling Quest(s) available."] = "Objetivo de Chamado disponível."
 L["Can't buy anymore slots!"] = "Não é possível comprar mais espaços!"
 L["Can't Roll"] = "Não pode rolar"
 L["Character: "] = "Personagem: "
@@ -83,7 +83,7 @@ L["Chat"] = "Bate-papo"
 L["Choose a theme layout you wish to use for your initial setup."] = "Escolha o tema de layout que deseje usar inicialmente."
 L["Class Bar"] = "Barra da Classe"
 L["Classic"] = "Clássico"
-L["Combat Indicator"] = true
+L["Combat Indicator"] = "Indicador de Combate"
 L["Combat"] = "Combate"
 L["Combat/Arena Time"] = "Tempo de Combate/Arena"
 L["Config Mode:"] = "Modo de configuração"
@@ -92,65 +92,65 @@ L["Continue"] = "Continuar"
 L["Coords"] = "Coordenadas"
 L["copperabbrev"] = "|cffeda55fc|r"
 L["Current Difficulties:"] = "Dificuldades atuais:"
-L["Current Level:"] = "Level atual:"
+L["Current Level:"] = "Nível atual:"
 L["CVars Set"] = "CVars configuradas"
 L["CVars"] = "CVars"
-L["Daily Reset"] = true
+L["Daily Reset"] = "Reinício Diário"
 L["Dark"] = "Escuro"
 L["Data From: %s"] = "Dados De: %s"
 L["Dead"] = "Morto"
-L["Debuffs"] = true
+L["Debuffs"] = "Penalidades"
 L["Deficit:"] = "Défice:"
 L["Delete gray items?"] = "Deletar itens cinzentos?"
 L["Deposit Reagents"] = "Depositar Reagentes"
 L["Disable Warning"] = "Desativar Aviso"
 L["Disable"] = "Desativar"
-L["Disabled"] = true
+L["Disabled"] = "Desabilitado"
 L["Disband Group"] = "Dissolver Grupo"
 L["Discard"] = "Descartar"
 L["Discord"] = true
 L["DND"] = "NP"
-L["Do you swear not to post in technical support about something not working without first disabling the addon/module combination first?"] = "Você jura não postar no suporte técnico sobre alguma coisa não funcionando sem antes desabilitar a combinação addon/módulo?"
-L["Don't forget to backup your WTF folder, all your profiles and settings are in there."] = true
+L["Do you swear not to post in technical support about something not working without first disabling the addon/module combination first?"] = "Você jura não postar no suporte técnico sobre alguma coisa não funcionando sem antes desabilitar a combinação de addon/módulo primeiro?"
+L["Don't forget to backup your WTF folder, all your profiles and settings are in there."] = "Não se esqueça de fazer um backup da sua pasta WTF, todos os perfis e configurações estão lá."
 L["Download"] = "Download"
 L["DPS"] = "DPS"
-L["Durability Frame"] = true
+L["Durability Frame"] = "Quadro de Durabilidade"
 L["Earned:"] = "Ganho:"
 L["Elite"] = true
-L["ElvUI has a dual spec feature which allows you to load different profiles based on your current spec on the fly. You can enable it in the profiles tab."] = true
+L["ElvUI has a dual spec feature which allows you to load different profiles based on your current spec on the fly. You can enable it in the profiles tab."] = "ElvUI tem um recurso de especialização dupla que permite que você carrege diferentes perfis baseando-se na spec atual. Você pode habilitar isto na aba de perfis."
 L["ElvUI Installation"] = "Instalação do ElvUI"
-L["ElvUI is five or more revisions out of date. You can download the newest version from tukui.org."] = "O ElvUI está rodando com cinco ou mais revisões desatualizadas. Você pode baixar a mais nova versão em tukui.org."
-L["ElvUI is out of date. You can download the newest version from tukui.org."] = "O ElvUI está desatualizado. Você pode baixar a mais nova versão em tukui.org."
+L["ElvUI is five or more revisions out of date. You can download the newest version from tukui.org."] = "ElvUI está rodando com cinco ou mais revisões desatualizadas. Você pode baixar a mais nova versão em tukui.org."
+L["ElvUI is out of date. You can download the newest version from tukui.org."] = "ElvUI está desatualizado. Você pode baixar a mais nova versão em tukui.org."
 L["ElvUI Plugin Installation"] = "Instalação de Plugin para ElvUI"
 L["Status"] = "Status"
-L["ElvUI Version:"] = true
+L["ElvUI Version:"] = "Versão do ElvUI:"
 L["Error resetting UnitFrame."] = "Erro ao resetar o Quadro de Unidade"
-L["EventToastWidget"] = true
+L["EventToastWidget"] = "Widget de Mensagem de Evento"
 L["Experience Bar"] = "Barra de Experiência"
 L["Experience"] = "Experiência"
 L["Filter download complete from %s, would you like to apply changes now?"] = "Baixa de filtros de %s completada, gostaria de aplicar as alterações agora?"
 L["Finished"] = "Terminado"
 L["Fishy Loot"] = "Saque de Peixes"
-L["Focus Aura Bars"] = true
+L["Focus Aura Bars"] = "Barras de Aura do Foco"
 L["Focus Castbar"] = "Barra de Lançamento do Foco"
 L["Focus Frame"] = "Quadro do Foco"
 L["FocusTarget Frame"] = "Quadro do Alvo do Foco"
 L["Frame"] = "Quadro"
 L["Friends List"] = "Lista de Amigos"
-L["From time to time you should compare your ElvUI version against the most recent version on our website."] = true
+L["From time to time you should compare your ElvUI version against the most recent version on our website."] = "De vez em quando você deve comparar sua versão do ElvUI com a disponível no nosso website."
 L["G"] = "G"
 L["Ghost"] = "Fantasma"
 L["GM Ticket Frame"] = "Quadro de Consulta com GM"
 L["Gold"] = "Ouro"
 L["goldabbrev"] = "|cffffd700g|r"
-L["Grays"] = true
+L["Grays"] = "Cinzas"
 L["Grid Size:"] = "Tamanho da Grade"
-L["Heal Power"] = true
+L["Heal Power"] = "Poder de Cura"
 L["Healer"] = "Curandeiro"
 L["Hold Control + Right Click:"] = "Segurar Control + Clique Direito:"
 L["Hold Shift + Drag:"] = "Segurar Shift + Arrastar:"
 L["Hold Shift + Right Click:"] = "Segurar Shift + Clique Direito"
-L["Hold Shift:"] = true
+L["Hold Shift:"] = "Segure Shift:"
 L["Home Latency:"] = "Latência de Casa:"
 L["Home Protocol:"] = "Protocolo de Casa:"
 L["Honor Bar"] = "Barra de honra"
@@ -162,22 +162,22 @@ L["HPS"] = "PVS"
 L["I Swear"] = "Eu Juro"
 L["I"] = true
 L["Icons Only"] = "Apenas Ícones"
-L["If you accidentally removed a default chat tab you can always re-run the chat part of the ElvUI installer."] = true
-L["If you are experiencing issues with ElvUI try disabling all your addons except ElvUI first."] = true
+L["If you accidentally removed a default chat tab you can always re-run the chat part of the ElvUI installer."] = "Se você removeu acidentalmente uma aba padrão do Bate-papo você sempre pode rodar a parte de Bate-papo do instalador do ElvUI."
+L["If you are experiencing issues with ElvUI try disabling all your addons except ElvUI first."] = "Se você estiver enfrentando problemas com o ElvUI  tente desabilitar todos os seus addons exceto o ElvUI."
 L["If you have an icon or aurabar that you don't want to display simply hold down shift and right click the icon for it to disapear."] = "Se você tiver um Ícone ou Barra de Auras que você não quer mostrar, segure Shift e clique com o botão direito para ela desaparecer."
 L["IL"] = "IL"
 L["Importance: |cFF33FF33Low|r"] = "Importância: |cFF33FF33Baixa|r"
 L["Importance: |cffD3CF00Medium|r"] = "Importância: |cffD3CF00Média|r"
 L["Importance: |cffFF3333High|r"] = "Importância: |cffFF3333Alta|r"
 L["In Progress"] = "Em Progresso"
-L["INCOMPATIBLE_ADDON"] = "%s is not compatible with %s.\nPlease select the addon/module to use."
+L["INCOMPATIBLE_ADDON"] = "%s não é compatível com %s.\nPor favor selecione o addon/módulo que deseja usar."
 L["Installation Complete"] = "Instalação Completa"
-L["Interrupted %s's |cff71d5ff|Hspell:%d:0|h[%s]|h|r!"] = "Interrompeu %s's |cff71d5ff|Hspell:%d:0|h[%s]|h|r!"
+L["Interrupted %s's |cff71d5ff|Hspell:%d:0|h[%s]|h|r!"] = "Interrompeu a |cff71d5ff|Hspell:%d:0|h[%s]|h|r de %s!"
 L["Invalid Target"] = "Alvo inválido"
-L["is looking for members"] = true
+L["is looking for members"] = "está procurando membros"
 L["It appears one of your AddOns have disabled the AddOn Blizzard_CompactRaidFrames. This can cause errors and other issues. The AddOn will now be re-enabled."] = "Parece que um dos seus AddOns desabilitou o Addon Blizzard_CompactRaidFrames. Isto pode causar erros e outros problemas. O AddOn será agora reabilitado"
-L["Item level: %.2f"] = true
-L["Item Level:"] = true
+L["Item level: %.2f"] = "Nível do Item: %.2f"
+L["Item Level:"] = "Nível de Item:"
 L["joined a group"] = "entrou em um grupo"
 L["Key"] = "Tecla"
 L["KEY_ALT"] = "A"
@@ -203,41 +203,41 @@ L["Layout Set"] = "Definições do Layout"
 L["Layout"] = "Layout"
 L["Left Chat"] = "Bate-papo esquerdo"
 L["Left Click:"] = "Clique Esquerdo:"
-L["Level %d"] = true
+L["Level %d"] = "Nível %d"
 L["Level"] = "Nível"
 L["List of installations in queue:"] = "Lista de instalações na fila:"
-L["Loadouts"] = true
-L["Location"] = true
+L["Loadouts"] = "Configuração de Especialização"
+L["Location"] = "Localização"
 L["Lock"] = "Travar"
 L["LOGIN_MSG"] = ("Bem-vindo ao *ElvUI|r versão *%s|r, digite */ec|r para acessar as configurações dentro do jogo. Se você precisa de suporte técnico nos contate em https://tukui.org ou se entre no Discord: https://discord.tukui.org"):gsub('*', E.InfoColor)
 L["LOGIN_MSG_HELP"] = ("Por favor use */ehelp|r para ver a lista de comandos do *ElvUI|r."):gsub('*', E.InfoColor)
-L["LOGIN_PTR"] = ("|cffff3333You are currently not running the PTR version of *ElvUI|r which may cause issues.|r ^Please download the PTR version from the following link.|r %s"):gsub('*', E.InfoColor):gsub('%^', E.InfoColor2)
+L["LOGIN_PTR"] = ("|cffff3333Atualmente você não está utilizando uma versão de PTR do *ElvUI|r o que pode causar problemas.|r ^Por favor baixe a versão de PTR no link a seguir.|r %s"):gsub('*', E.InfoColor):gsub('%^', E.InfoColor2)
 L["Loot / Alert Frames"] = "Quadro de Saque / Alerta"
 L["Loot Frame"] = "Quadro de Saque"
 L["Lord! It's a miracle! The download up and vanished like a fart in the wind! Try Again!"] = "Senhor! É um milagre! O Download sumiu como um peido no vento! Tente novamente!"
 L["Loss Control Icon"] = "Ícone de Perda de Controle"
-L["lvl"] = "nível"
+L["lvl"] = "nvl"
 L["MA Frames"] = "Quadro do Assistente Principal"
-L["Max Level"] = true
+L["Max Level"] = "Nível Máximo"
 L["Micro Bar"] = "Micro Barra"
-L["Minimap Cluster"] = true
+L["Minimap Cluster"] = "Aglomeramento do Minimapa"
 L["Minimap"] = "Minimapa"
-L["MirrorTimer"] = true
+L["MirrorTimer"] = "Barra de Tempo"
 L["Mission(s) Report:"] = "Relatório de Missões:"
 L["Mitigation By Level: "] = "Mitigação por nível"
-L["Mobile"] = true
-L["Mov. Speed"] = true
+L["Mobile"] = "Móvel"
+L["Mov. Speed"] = "Velocidade de Movimento"
 L["MT Frames"] = "Quadro do Tank Principal"
-L["Mythic+ Best Run:"] = true
-L["Mythic+ Score:"] = true
+L["Mythic+ Best Run:"] = "Melhor corrida de Nível Mítico"
+L["Mythic+ Score:"] = "Pontuação de Nível Mítico"
 L["Naval Mission(s) Report:"] = "Relatório das Missões Navais:"
-L["Need help? Join our Discord: https://discord.tukui.org"] = true
-L["New Profile will create a fresh profile for this character."] = true
-L["New Profile"] = true
+L["Need help? Join our Discord: https://discord.tukui.org"] = "Precisa de ajuda? Junte-se ao nosso Discord: https://discord.tukui.org"
+L["New Profile will create a fresh profile for this character."] = "Novo Perfil irá criar um perfil limpo para este personagem."
+L["New Profile"] = "Novo Perfil"
 L["No bindings set."] = "Sem atalhos definidos"
 L["No gray items to delete."] = "Nenhum item cinzento para destruir."
 L["No Guild"] = "Sem Guilda"
-L["No Loot"] = true
+L["No Loot"] = "Sem Saque"
 L["None"] = "Nenhum"
 L["Nudge"] = "Ajuste fino"
 L["O"] = "O"
@@ -246,174 +246,174 @@ L["Offline"] = "Desconectado"
 L["Oh lord, you have got ElvUI and Tukui both enabled at the same time. Select an addon to disable."] = "Oh senhor, você está com os addons ElvUI e Tuki ativos ao mesmo tempo. Selecione um para desativar."
 L["One or more of the changes you have made require a ReloadUI."] = "Uma ou mais das alterações que fez requerem que recarregue a IU."
 L["One or more of the changes you have made will effect all characters using this addon. You will have to reload the user interface to see the changes you have made."] = "Uma ou mais das alterações que fez afetará todos os personagens que usam este addon. Você terá que recarregar a interface para ver as alterações que fez."
-L["Output Audio Device"] = true
+L["Output Audio Device"] = "Dispositivo de Saída de Aúdio"
 L["P"] = "P"
-L["Paragon"] = true
+L["Paragon"] = "Paragão"
 L["Party Frames"] = "Quadros de Grupo"
 L["Pending"] = "Pendente"
-L["Pet Aura Bars"] = true
-L["Pet Bar"] = "Barra do Pet"
-L["Pet Castbar"] = "Barra de cast do Pet"
-L["Pet Experience Bar"] = true
-L["Pet Experience"] = true
-L["Pet Frame"] = "Quadro do Pet"
-L["PetTarget Frame"] = "Quadro de Alvo do Pet"
+L["Pet Aura Bars"] = "Barras de Aura do Mascote"
+L["Pet Bar"] = "Barra do Mascote"
+L["Pet Castbar"] = "Barra de lançamento do Mascote"
+L["Pet Experience Bar"] = "Barra de Experiência do Mascote"
+L["Pet Experience"] = "Experiência do Mascote"
+L["Pet Frame"] = "Quadro do Mascote"
+L["PetTarget Frame"] = "Quadro de Alvo do Mascote"
 L["PL"] = "PL"
-L["Player Aura Bars"] = true
-L["Player Buffs"] = "Buffs do Jogador"
-L["Player Castbar"] = "Barra de cast do Jogador"
-L["Player Debuffs"] = "Debuffs do Jogador"
+L["Player Aura Bars"] = "Barras de Aura do Jogador"
+L["Player Buffs"] = "Bônus do Jogador"
+L["Player Castbar"] = "Barra de lançamento do Jogador"
+L["Player Debuffs"] = "Penalidades do Jogador"
 L["Player Frame"] = "Quadro do Jogador"
 L["Player NamePlate"] = "Placa de Identificação do Jogador"
 L["Please click the button below so you can setup variables and ReloadUI."] = "Por favor, clique no botão abaixo para que possa configurar as variáveis e Recarregar a IU."
-L["Please click the button below to setup your CVars."] = "Por favor, clique no botão abaixo para configurar as suas Cvars."
-L["Please click the button below to setup your Profile Settings."] = true
+L["Please click the button below to setup your CVars."] = "Por favor, clique no botão abaixo para configurar as suas CVars."
+L["Please click the button below to setup your Profile Settings."] = "Por favor, clique no botão abaixo para configurar seu Perfil."
 L["Please press the continue button to go onto the next step."] = "Por favor, pressione o botão Continuar para passar à próxima etapa."
-L["PowerBarWidget"] = true
-L["Profile download complete from %s, but the profile %s already exists. Change the name or else it will overwrite the existing profile."] = "Baixa de perfil completada de %s, mas o perfil %s já existe. Altere o nome ou ele irá sobrescrever o perfil existente."
-L["Profile download complete from %s, would you like to load the profile %s now?"] = "Baixa de perfil completada de %s, gostaria de carregar o perfil %s agora?"
+L["PowerBarWidget"] = "Widget de Poder"
+L["Profile download complete from %s, but the profile %s already exists. Change the name or else it will overwrite the existing profile."] = "Download do perfil de %s completado, mas o perfil %s já existe. Altere o nome ou ele irá sobrescrever o perfil existente."
+L["Profile download complete from %s, would you like to load the profile %s now?"] = "Download do perfil de %s completado, gostaria de carregar o perfil %s agora?"
 L["Profile request sent. Waiting for response from player."] = "Pedido de perfil enviado. Aguardando a resposta do jogador."
-L["Profile Settings Setup"] = true
+L["Profile Settings Setup"] = "Configuração de Perfil"
 L["Profit:"] = "Lucro:"
 L["Purchase Bags"] = "Comprar Bolsas"
 L["Purchase"] = "Comprar"
-L["Quest Log XP:"] = true
-L["Quest Log"] = true
-L["Quest Objective Frame"] = true
-L["Quest Timer Frame"] = true
+L["Quest Log XP:"] = "Experiência do Registro de Missões:"
+L["Quest Log"] = "Registro de Missões"
+L["Quest Objective Frame"] = "Quadro de Missões"
+L["Quest Timer Frame"] = "Quadro de Tempo de Missão"
 L["R"] = "R"
-L["Raid %d Frames"] = true
+L["Raid %d Frames"] = "Quadros de Raíde %d"
 L["Raid Menu"] = "Menu de Raide"
-L["Raid Pet Frames"] = true
+L["Raid Pet Frames"] = "Quadros de Mascote de Raíde"
 L["Rare Elite"] = "Elite Raro"
-L["Rare"] = true
+L["Rare"] = "Raro"
 L["Reagent Bank"] = "Banco de Reagentes"
 L["Remaining:"] = "Restante:"
 L["Remove Bar %d Action Page"] = "Remover paginação de ação da barra %d."
 L["Reputation Bar"] = "Barra de Reputação"
 L["Request was denied by user."] = "Pedido negado pelo usuário."
-L["Reset Character Data: Hold Shift + Right Click"] = true
+L["Reset Character Data: Hold Shift + Right Click"] = "Resetar dados de Personagem: Segure Shift + Clique Direito"
 L["Reset Position"] = "Redefinir Posição"
-L["Reset Session Data: Hold Ctrl + Right Click"] = true
+L["Reset Session Data: Hold Ctrl + Right Click"] = "Resetar Dados da Seção: Segure Ctrl + Clique Direito"
 L["Rested:"] = "Descansado:"
 L["Right Chat"] = "Bate-papo direito"
-L["Right Click to Open Menu"] = true
+L["Right Click to Open Menu"] = "Clique Direito para Abrir o Menu"
 L["RL"] = "RL"
 L["RW"] = "AR"
 L["Save"] = "Salvar"
 L["Saved Dungeon(s)"] = "Masmorra(s) salva(s)"
 L["Saved Raid(s)"] = "Raide(s) Salva(s)"
 L["says"] = "diz"
-L["Select the type of aura system you want to use with ElvUI's unitframes. Set to Aura Bars to use both aura bars and icons, set to Icons Only to only see icons."] = "Selecione o tipo de sistema de auras para se usar com os quadros de unidade do ElvUI. Selecione Aura Bar % Ícones para usar os dois ou Ícones para ver apenas os ícones."
-L["Select Volume Stream"] = true
+L["Select the type of aura system you want to use with ElvUI's unitframes. Set to Aura Bars to use both aura bars and icons, set to Icons Only to only see icons."] = "Selecione o tipo de auras que você quer usar com os quadros de unidade do ElvUI. Selecione Barra de Aura % Ícones para usar os dois ou Ícones para ver apenas os ícones."
+L["Select Volume Stream"] = "Selecione o Volume do Canal"
 L["Server: "] = "Servidor: "
 L["Session:"] = "Sessão:"
 L["Setup Chat"] = "Configurar Bate-papo"
 L["Setup CVars"] = "Configurar CVars"
-L["Shared Profile will select the default profile."] = true
-L["Shared Profile"] = true
-L["Shift + Left Click to Toggle Bag"] = true
+L["Shared Profile will select the default profile."] = "Perfil Compartilhado irá selecionar o perfil padrão."
+L["Shared Profile"] = "Perfil Compartilhado"
+L["Shift + Left Click to Toggle Bag"] = "Shift + Clique Esquerdo para Alternar Bolsas"
 L["Show/Hide Reagents"] = "Mostrar/Esconder Reagentes"
 L["Shows a frame with needed info for support."] = "Mostra o quadro com informações necessárias para suporte."
 L["silverabbrev"] = "|cffc7c7cfs|r"
-L["Sort Bags"] = true
+L["Sort Bags"] = "Classificar Bolsas"
 L["SP"] = "PM"
 L["Spec"] = "Especialização"
-L["Spell Haste"] = true
-L["Spell Hit"] = true
-L["Spell Power"] = true
+L["Spell Haste"] = "Aceleração de Magia"
+L["Spell Hit"] = "Acerto de Magia"
+L["Spell Power"] = "Poder de Magia"
 L["Spent:"] = "Gasto:"
-L["Stack Items In Bags"] = true
-L["Stack Items In Bank"] = true
-L["Stack Items To Bags"] = true
-L["Stack Items To Bank"] = true
+L["Stack Items In Bags"] = "Empilhar Itens nas Bolsas"
+L["Stack Items In Bank"] = "Empilhar Itens nos Bancos"
+L["Stack Items To Bags"] = "Empilhar Itens para as Bolsas"
+L["Stack Items To Bank"] = "Empilhar Itens para os Bolsas"
 L["Stance Bar"] = "Barra de Postura"
 L["Steps"] = "Passos"
 L["Sticky Frames"] = "Quadros Pegadiços"
 L["System"] = "Sistema"
 L["Talent/Loot Specialization"] = "Especialização em Talentos/Saque"
-L["Target Aura Bars"] = true
+L["Target Aura Bars"] = "Barras de Aura do Alvo"
 L["Target Castbar"] = "Barra de lançamento do Alvo"
 L["Target Frame"] = "Quadro do Alvo"
-L["Target Mitigation"] = true
+L["Target Mitigation"] = "Mitigação do Alvo"
 L["Targeted By:"] = "Sendo Alvo de:"
 L["TargetTarget Frame"] = "Quadro do Alvo do Alvo"
 L["TargetTargetTarget Frame"] = "Quadro do Alvo do Alvo do Alvo"
 L["Temporary Move"] = "Mover Temporariamente"
 L["The chat windows function the same as Blizzard standard chat windows, you can right click the tabs and drag them around, rename, etc. Please click the button below to setup your chat windows."] = "As janelas de bate-papo funcionam da mesma forma das da Blizzard, você pode usar o botão direito nas guias para os arrastar, mudar o nome, etc. Por favor clique no botão abaixo para configurar as suas janelas de bate-papo"
-L["The in-game configuration menu can be accessed by typing the /ec command. Press the button below if you wish to skip the installation process."] = true
+L["The in-game configuration menu can be accessed by typing the /ec command. Press the button below if you wish to skip the installation process."] = "O menu de configuração pode ser acessado digitando o comando /ec. Pressione o botão abaixo se você deseja pular o processo de instalação."
 L["The profile you tried to import already exists. Choose a new name or accept to overwrite the existing profile."] = "O perfil que você tentou importar já existe. Escolha um novo nome ou aceite sobrescrever o perfil existente."
-L["The spell '%s' has been added to the '%s' unitframe aura filter."] = "O feitiço \"%s\" foi adicionado à Lista Negra dos filtros das auras de unidades."
+L["The spell '%s' has been added to the '%s' unitframe aura filter."] = "O feitiço '%s' foi adicionado ao filtro '%s' das auras de unidades."
 L["Theme Set"] = "Tema configurado"
 L["Theme Setup"] = "Configuração do Tema"
 L["This install process will help you learn some of the features in ElvUI has to offer and also prepare your user interface for usage."] = "Este processo de instalação vai mostrar-lhe algumas das opções que o ElvUI tem para oferecer e também vai preparar a sua interface para ser usada."
 L["This part of the installation process sets up your chat windows names, positions and colors."] = "Esta parte da instalação é para definir os nomes, posições e cores das suas janelas de bate-papo."
 L["This part of the installation process sets up your World of Warcraft default options it is recommended you should do this step for everything to behave properly."] = "Esta parte da instalação serve para definir as suas opcões padrão do WoW, é recomendado fazer isto para que tudo funcione corretamente."
 L["This setting caused a conflicting anchor point, where '%s' would be attached to itself. Please check your anchor points. Setting '%s' to be attached to '%s'."] = "Essa configuração causou um conflito com o ponto de fixação, onde '%s' iria ser anexado com ele mesmo. Por favor cheque seus pontos de fixações. Configuração '%s' a ser anexada a '%s'."
-L["This will change the layout of your unitframes and actionbars."] = "Isso irá mudar o leiaute dos seus Quadro de Unidades e Barras de Ações"
-L["Threat Bar"] = true
-L["Time Alert Frame"] = true
-L["To list all available ElvUI commands, type in chat /ehelp"] = true
-L["To quickly move around certain elements of the UI, type /emove"] = true
-L["To setup chat colors, chat channels and chat font size, right-click the chat tab name."] = true
+L["This will change the layout of your unitframes and actionbars."] = "Isso irá mudar a disposição dos seus Quadros de Unidades e Barras de Ações"
+L["Threat Bar"] = "Barra de Ameaça"
+L["Time Alert Frame"] = "Quadro de Alerta de Tempo"
+L["To list all available ElvUI commands, type in chat /ehelp"] = "Para listar todos os comandos do ElvUI, digite /ehelp no chat"
+L["To quickly move around certain elements of the UI, type /emove"] = "Para mover certos elementos da IU rapidamente, digite /emove"
+L["To setup chat colors, chat channels and chat font size, right-click the chat tab name."] = "Para configurar cores, canais e tamanho de fonte do bate-papo, clique com o botão direito no nome da aba do bate-papo."
 L["Toggle Bags"] = "Mostrar/Ocultar Bolsas"
-L["Toggle Chat Frame"] = "Mostrar/Ocultar Bat-papo"
+L["Toggle Chat Frame"] = "Mostrar/Ocultar Bate-papo"
 L["Toggle Configuration"] = "Mostrar/Ocultar Modo de Configuração"
-L["Toggle Volume Stream"] = true
-L["Tooltip"] = "Tooltip"
-L["TopCenterWidget"] = true
-L["Torghast Choice Toggle"] = true
+L["Toggle Volume Stream"] = "Mostrar/Ocultar Volume do Canal"
+L["Tooltip"] = "Dica"
+L["TopCenterWidget"] = "Widget Central"
+L["Torghast Choice Toggle"] = "Mostrar"
 L["Total CPU:"] = "CPU Total:"
 L["Total: "] = "Total: "
-L["Totem Bar"] = true
-L["Totem Tracker"] = true
+L["Totem Bar"] = "Barra de Totem"
+L["Totem Tracker"] = "Rastreador de Totem"
 L["Trigger"] = "Gatilho"
-L["UI Scale"] = true
+L["UI Scale"] = "Escala de IU"
 L["Unhittable:"] = "Inacertável"
 L["Vehicle Seat Frame"] = "Quadro de Assento de Veículo"
-L["VehicleLeaveButton"] = true
+L["VehicleLeaveButton"] = "Botão de Saída de Veículo"
 L["Vendor / Delete Grays"] = "Vendedor / Deletar Cinzentos"
 L["Vendor Grays"] = "Vender Itens Cinzentos"
 L["Vendored gray items for: %s"] = "Vendeu os itens cinzentos por: %s"
 L["Vendoring Grays"] = "Vender Cinzentos"
-L["Voice Overlay"] = true
-L["Volume Streams"] = true
+L["Voice Overlay"] = "Sobreposição de Voz"
+L["Volume Streams"] = "Volume de Canais"
 L["Volume"] = true
 L["Welcome to ElvUI version %.2f!"] = "Bem-vindo à versão %.2f do ElvUI!"
 L["whispers"] = "sussurra"
 L["World Latency:"] = "Latência do Mundo:"
 L["World Protocol:"] = "Procoloco do Mundo:"
-L["WoW Token:"] = true
+L["WoW Token:"] = "Ficha do WoW"
 L["XP:"] = "XP:"
 L["yells"] = "grita"
-L["You are now finished with the installation process. If you are in need of technical support please join our Discord."] = true
-L["You are using CPU Profiling. This causes decreased performance. Do you want to disable it or continue?"] = "Você está usando o modo CPU Profiling. Isto pode causar queda na perfomance. Deseja desabilitá-lo ou continuar?"
-L["You can access the copy chat and chat menu functions by left/right clicking on the icon in the top right corner of the chat panel."] = true
-L["You can access the microbar by using middle mouse button on the minimap. You can also enable the MicroBar in the actionbar settings."] = true
-L["You can always change fonts and colors of any element of ElvUI from the in-game configuration."] = "As cores e fontes do ElvUI podem ser mudadas em qualquer momento no modo de configuração demtro do jogo."
-L["You can enter the keybind mode by typing /kb"] = true
-L["You can now choose what layout you wish to use based on your combat role."] = "Pode agora escolher o layout que pretende usar baseado no seu papel."
-L["You can quickly change your displayed DataTexts by mousing over them while holding ALT."] = true
-L["You can see someones average item level inside the tooltip by holding shift and mousing over them."] = true
+L["You are now finished with the installation process. If you are in need of technical support please join our Discord."] = "Você terminou com o processo de instalação. Se você precisa de ajuda técnica por favor junte-se ao nosso Discord."
+L["You are using CPU Profiling. This causes decreased performance. Do you want to disable it or continue?"] = "Você está usando o modo de Medição de Desempenho da CPU. Isto pode causar queda na perfomance. Deseja desabilitá-lo ou continuar?"
+L["You can access the copy chat and chat menu functions by left/right clicking on the icon in the top right corner of the chat panel."] = "Você pode acessar funcções de cópia do bate-papo e menu quando você cliqua com o botão direito/esquerdo no ícone no canto superior direito do paínel de bate-papo"
+L["You can access the microbar by using middle mouse button on the minimap. You can also enable the MicroBar in the actionbar settings."] = "Você pode acessar a microbarra utilizando o botão do meio do mouse no minimapa. Você também pode habilitar a MicroBarra nas configurações de barras de ação"
+L["You can always change fonts and colors of any element of ElvUI from the in-game configuration."] = "Você sempre pode mudar as fontes e cores de quaisquer elementos do ElvUI através do painel de configuração."
+L["You can enter the keybind mode by typing /kb"] = "Você sempre pode entrar no modo de vínculo de teclas digitando /kb"
+L["You can now choose what layout you wish to use based on your combat role."] = "Pode agora escolher o layout que pretende usar baseado no seu papel no grupo."
+L["You can quickly change your displayed DataTexts by mousing over them while holding ALT."] = "Você pode mudar rapidamente os Textos Informativos quando você passa o mouse por cima deles enquanto segura ALT."
+L["You can see someones average item level inside the tooltip by holding shift and mousing over them."] = "Você pode ver o nível de item médio de alguém dentro da Dica se você segurar shift e passar o mouse por cima deles"
 L["You don't have enough money to repair."] = "Você não tem dinheiro suficiente para reparar."
 L["You don't have permission to mark targets."] = "Você não tem permissão para marcar alvos."
 L["You have imported settings which may require a UI reload to take effect. Reload now?"] = "Você importou configurações que podem requerer um reload na sua interface para surgir efeito. Dar reload agora?"
-L["You must be at a vendor."] = "Tem de estar num vendedor."
+L["You must be at a vendor."] = "Você tem que estar num vendedor."
 L["You must purchase a bank slot first!"] = "Você deve comprar um espaço no banco primeiro!"
 L["Your items have been repaired for: "] = "Seus itens foram reparadas por: "
 L["Your items have been repaired using guild bank funds for: "] = "Seus itens foram reparados usando fundos do banco da guilda por: "
 L["Your profile was successfully recieved by the player."] = "Seu perfil foi recebido com sucesso pelo jogador."
 L["Zone Ability"] = "Habilidade da Zona"
-L["|cFFE30000Lua error recieved. You can view the error message when you exit combat."] = "|cFFE30000Erro Lua recebido. Você pode ver a mensagem de erro quando sair de combate."
-L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = true
+L["|cFFE30000Lua error recieved. You can view the error message when you exit combat."] = "|cFFE30000Erro de Lua recebido. Você pode ver a mensagem de erro quando sair de combate."
+L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = "|cffFFFFFFControl + Clique Esquerdo:|r Mudar Configuração de Especialização"
 L["|cffFFFFFFLeft Click:|r Change Talent Specialization"] = "|cffFFFFFFClique Esquerdo:|r Alterar Especialização de Talento"
-L["|cFFffffffLeft Click:|r Select Volume Stream"] = true
-L["|cFFffffffMiddle Click:|r Toggle Mute Master Stream"] = true
+L["|cFFffffffLeft Click:|r Select Volume Stream"] = "|cFFffffffClique Esquerdo:|r Selecionar Volume de Canal"
+L["|cFFffffffMiddle Click:|r Toggle Mute Master Stream"] = "|cFFffffffClique do Meio:|r Alternar o Mute do Canal Principal"
 L["|cffFFFFFFRight Click:|r Change Loot Specialization"] = "|cffFFFFFFClique Direito:|r Alterar a Especialização de Saque"
-L["|cFFffffffRight Click:|r Toggle Volume Stream"] = true
-L["|cFFffffffShift + Left Click:|r Open System Audio Panel"] = true
+L["|cFFffffffRight Click:|r Toggle Volume Stream"] = "|cFFffffffClique Direito:|r Alternar Volume do Canal"
+L["|cFFffffffShift + Left Click:|r Open System Audio Panel"] = "|cFFffffffShift + Clique Esquerdo|r Abrir Painel de Aúdio do Sistema"
 L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = "|cffFFFFFFShift + Clique Esquerdo:|r Mostrar interface de especialização de talentos"
-L["|cFFffffffShift + Right Click:|r Select Output Audio Device"] = true
+L["|cFFffffffShift + Right Click:|r Select Output Audio Device"] = "|cFFffffffShift + Clique Direito:|r Selecionar o Dispositivo de Saída de Aúdio"
 
 ----------------------------------
 L["DESC_MOVERCONFIG"] = [=[Movedores destravados. Mova-os agora e clique Travar quando acabar.
diff --git a/ElvUI/Locales/zhCN.lua b/ElvUI/Locales/zhCN.lua
index 4125d57599..04aa9b10bd 100644
--- a/ElvUI/Locales/zhCN.lua
+++ b/ElvUI/Locales/zhCN.lua
@@ -108,7 +108,7 @@ L["Disable"] = "禁用"
 L["Disabled"] = "已禁用"
 L["Disband Group"] = "解散队伍"
 L["Discard"] = "取消"
-L["Discord"] = "Discord"
+L["Discord"] = true
 L["DND"] = "忙碌"
 L["Do you swear not to post in technical support about something not working without first disabling the addon/module combination first?"] = "你发誓在你没停用其他插件前不会到技术支持询问某些功能失效吗？"
 L["Don't forget to backup your WTF folder, all your profiles and settings are in there."] = "不要忘记备份您的 WTF 文件夹，您的所有配置文件和设置都在其中。"
diff --git a/ElvUI/Mainline/Modules/DataTexts/Crests.lua b/ElvUI/Mainline/Modules/DataTexts/Crests.lua
index d28ae949e4..f07c4c36e3 100644
--- a/ElvUI/Mainline/Modules/DataTexts/Crests.lua
+++ b/ElvUI/Mainline/Modules/DataTexts/Crests.lua
@@ -14,20 +14,20 @@ local crests = {
 		id = 2245,
 		color = _G.HEIRLOOM_BLUE_COLOR:GenerateHexColor()
 	},
-	{ -- Whelpling's Dreaming Crest
-		id = 2706,
+	{ -- Whelpling's Awakened Crest
+		id = 2806,
 		color = _G.UNCOMMON_GREEN_COLOR:GenerateHexColor()
 	},
-	{ -- Drake's Dreaming Crest
-		id = 2707,
+	{ -- Drake's Awakened Crest
+		id = 2807,
 		color = _G.RARE_BLUE_COLOR:GenerateHexColor()
 	},
-	{ -- Wyrm's Dreaming Crest
-		id = 2708,
+	{ -- Wyrm's Awakened Crest
+		id = 2809,
 		color = _G.EPIC_PURPLE_COLOR:GenerateHexColor()
 	},
-	{ -- Aspect's Dreaming Crest
-		id = 2709,
+	{ -- Aspect's Awakened Crest
+		id = 2812,
 		color = _G.LEGENDARY_ORANGE_COLOR:GenerateHexColor()
 	}
 }
diff --git a/ElvUI/Mainline/Modules/Skins/AddonManager.lua b/ElvUI/Mainline/Modules/Skins/AddonManager.lua
index 8f1df53623..bc0619b007 100644
--- a/ElvUI/Mainline/Modules/Skins/AddonManager.lua
+++ b/ElvUI/Mainline/Modules/Skins/AddonManager.lua
@@ -6,9 +6,7 @@ local unpack = unpack
 local hooksecurefunc = hooksecurefunc
 
 local UIDropDownMenu_GetSelectedValue = UIDropDownMenu_GetSelectedValue
-
 local GetAddOnInfo = C_AddOns and C_AddOns.GetAddOnInfo
-local GetAddOnEnableState = C_AddOns and C_AddOns.GetAddOnEnableState
 
 local function HandleButton(entry, addonIndex)
 	if not entry.isSkinned then
@@ -23,7 +21,7 @@ local function HandleButton(entry, addonIndex)
 	if character == true then
 		character = nil
 	else
-		checkall = GetAddOnEnableState(addonIndex)
+		checkall = E:GetAddOnEnableState(addonIndex)
 	end
 
 	entry.Title:SetFontObject('ElvUIFontNormal')
@@ -32,7 +30,7 @@ local function HandleButton(entry, addonIndex)
 	entry.Reload:SetTextColor(1.0, 0.3, 0.3)
 	entry.LoadAddonButton.Text:SetFontObject('ElvUIFontSmall')
 
-	local checkstate = GetAddOnEnableState(addonIndex, character)
+	local checkstate = E:GetAddOnEnableState(addonIndex, character)
 	local enabledForSome = not character and checkstate == 1
 	local enabled = checkstate > 0
 	local disabled = not enabled or enabledForSome
diff --git a/ElvUI/Mainline/Modules/Skins/Alerts.lua b/ElvUI/Mainline/Modules/Skins/Alerts.lua
index 08505c8f33..6d19a05f25 100644
--- a/ElvUI/Mainline/Modules/Skins/Alerts.lua
+++ b/ElvUI/Mainline/Modules/Skins/Alerts.lua
@@ -3,13 +3,14 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local next = next
+local hooksecurefunc = hooksecurefunc
 local unpack, select = unpack, select
 
 local CreateFrame = CreateFrame
-local GetItemInfo = GetItemInfo
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
 local SetLargeGuildTabardTextures = SetLargeGuildTabardTextures
+
 local ITEM_QUALITY_COLORS = ITEM_QUALITY_COLORS
-local hooksecurefunc = hooksecurefunc
 
 local function forceAlpha(self, alpha, forced)
 	if alpha ~= 1 and forced ~= true then
diff --git a/ElvUI/Mainline/Modules/Skins/Bags.lua b/ElvUI/Mainline/Modules/Skins/Bags.lua
index d5caa6e3f9..66105e464e 100644
--- a/ElvUI/Mainline/Modules/Skins/Bags.lua
+++ b/ElvUI/Mainline/Modules/Skins/Bags.lua
@@ -9,14 +9,14 @@ local select = select
 local unpack = unpack
 
 local CreateFrame = CreateFrame
-local GetItemInfo = GetItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local GetInventoryItemTexture = GetInventoryItemTexture
 local GetInventorySlotInfo = GetInventorySlotInfo
 local hooksecurefunc = hooksecurefunc
 
 local GetCVarBool = C_CVar.GetCVarBool
-local GetContainerItemCooldown = GetContainerItemCooldown or (C_Container and C_Container.GetContainerItemCooldown)
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+local GetContainerItemCooldown = (C_Container and C_Container.GetContainerItemCooldown) or GetContainerItemCooldown
 
 local ITEMQUALITY_POOR = Enum.ItemQuality.Poor
 local NUM_CONTAINER_FRAMES = NUM_CONTAINER_FRAMES
diff --git a/ElvUI/Mainline/Modules/Skins/BlackMarket.lua b/ElvUI/Mainline/Modules/Skins/BlackMarket.lua
index a8bd03135a..8b31fda7eb 100644
--- a/ElvUI/Mainline/Modules/Skins/BlackMarket.lua
+++ b/ElvUI/Mainline/Modules/Skins/BlackMarket.lua
@@ -3,10 +3,10 @@ local S = E:GetModule('Skins')
 
 local _G = _G
 local next = next
-
-local GetItemInfo = GetItemInfo
 local hooksecurefunc = hooksecurefunc
-local GetItemQualityColor = GetItemQualityColor
+
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local function SkinTab(tab)
 	tab.Left:SetAlpha(0)
diff --git a/ElvUI/Mainline/Modules/Skins/Character.lua b/ElvUI/Mainline/Modules/Skins/Character.lua
index b5be57ada6..0abc9e8217 100644
--- a/ElvUI/Mainline/Modules/Skins/Character.lua
+++ b/ElvUI/Mainline/Modules/Skins/Character.lua
@@ -18,6 +18,70 @@ local showInsetBackdrop = {
 	TokenFrame = true
 }
 
+local function TokenFrame_ScrollUpdate(frame)
+	for _, child in next, { frame.ScrollTarget:GetChildren() } do
+		if child.Highlight and not child.IsSkinned then
+			child.CategoryLeft:SetAlpha(0)
+			child.CategoryRight:SetAlpha(0)
+			child.CategoryMiddle:SetAlpha(0)
+			child.Stripe:SetAlpha(0.75)
+
+			child.Highlight:SetInside()
+			child.Highlight:SetColorTexture(1, 1, 1, .25)
+
+			child.Highlight.SetPoint = E.noop
+			child.Highlight.SetTexture = E.noop
+
+			S:HandleIcon(child.Icon, true)
+			child.Icon.backdrop:SetFrameLevel(child:GetFrameLevel())
+
+			if child.ExpandIcon then
+				child.ExpandIcon:CreateBackdrop('Transparent')
+				child.ExpandIcon.backdrop:SetInside(3, 3)
+			end
+
+			child.IsSkinned = true
+		end
+
+		child.Icon.backdrop:SetShown(not child.isHeader)
+		child.ExpandIcon.backdrop:SetShown(child.isHeader)
+		child.Stripe:SetShown(not child.isHeader)
+	end
+end
+
+local function EquipmentManagerPane_Update(frame)
+	for _, child in next, { frame.ScrollTarget:GetChildren() } do
+		if child.icon and not child.isSkinned then
+			child.BgTop:SetTexture(E.ClearTexture)
+			child.BgMiddle:SetTexture(E.ClearTexture)
+			child.BgBottom:SetTexture(E.ClearTexture)
+			S:HandleIcon(child.icon)
+			child.HighlightBar:SetColorTexture(1, 1, 1, .25)
+			child.HighlightBar:SetDrawLayer('BACKGROUND')
+			child.SelectedBar:SetColorTexture(0.8, 0.8, 0.8, .25)
+			child.SelectedBar:SetDrawLayer('BACKGROUND')
+
+			child.isSkinned = true
+		end
+	end
+end
+
+local function TitleManagerPane_Update(frame)
+	for _, child in next, { frame.ScrollTarget:GetChildren() } do
+		if not child.isSkinned then
+			child:DisableDrawLayer('BACKGROUND')
+			child.isSkinned = true
+		end
+	end
+end
+
+local function PaperDollItemSlotButtonUpdate(slot)
+	local highlight = slot:GetHighlightTexture()
+	highlight:SetTexture(E.Media.Textures.White8x8)
+	highlight:SetVertexColor(1, 1, 1, .25)
+	highlight:SetInside()
+end
+
 local function UpdateCharacterInset(name)
 	_G.CharacterFrameInset.backdrop:SetShown(showInsetBackdrop[name])
 end
@@ -234,13 +298,6 @@ function S:CharacterFrame()
 		end
 	end
 
-	hooksecurefunc('PaperDollItemSlotButton_Update', function(slot)
-		local highlight = slot:GetHighlightTexture()
-		highlight:SetTexture(E.Media.Textures.White8x8)
-		highlight:SetVertexColor(1, 1, 1, .25)
-		highlight:SetInside()
-	end)
-
 	--Give character frame model backdrop it's color back
 	for _, corner in pairs({'TopLeft','TopRight','BotLeft','BotRight'}) do
 		local bg = _G['CharacterModelFrameBackground'..corner]
@@ -304,36 +361,13 @@ function S:CharacterFrame()
 	S:HandleModelSceneControlButtons(_G.CharacterModelScene.ControlFrame)
 
 	--Titles
-	hooksecurefunc(_G.PaperDollFrame.TitleManagerPane.ScrollBox, 'Update', function(frame)
-		for _, child in next, { frame.ScrollTarget:GetChildren() } do
-			if not child.isSkinned then
-				child:DisableDrawLayer('BACKGROUND')
-				child.isSkinned = true
-			end
-		end
-	end)
+	hooksecurefunc(_G.PaperDollFrame.TitleManagerPane.ScrollBox, 'Update', TitleManagerPane_Update)
 
 	--Equipement Manager
+	hooksecurefunc(_G.PaperDollFrame.EquipmentManagerPane.ScrollBox, 'Update', EquipmentManagerPane_Update)
 	S:HandleButton(_G.PaperDollFrameEquipSet)
 	S:HandleButton(_G.PaperDollFrameSaveSet)
 
-	hooksecurefunc(_G.PaperDollFrame.EquipmentManagerPane.ScrollBox, 'Update', function(frame)
-		for _, child in next, { frame.ScrollTarget:GetChildren() } do
-			if child.icon and not child.isSkinned then
-				child.BgTop:SetTexture(E.ClearTexture)
-				child.BgMiddle:SetTexture(E.ClearTexture)
-				child.BgBottom:SetTexture(E.ClearTexture)
-				S:HandleIcon(child.icon)
-				child.HighlightBar:SetColorTexture(1, 1, 1, .25)
-				child.HighlightBar:SetDrawLayer('BACKGROUND')
-				child.SelectedBar:SetColorTexture(0.8, 0.8, 0.8, .25)
-				child.SelectedBar:SetDrawLayer('BACKGROUND')
-
-				child.isSkinned = true
-			end
-		end
-	end)
-
 	-- Icon selection frame
 	_G.GearManagerPopupFrame:HookScript('OnShow', function(frame)
 		if frame.isSkinned then return end -- set by HandleIconSelectionFrame
@@ -371,8 +405,6 @@ function S:CharacterFrame()
 	S:HandleCheckBox(_G.ReputationDetailInactiveCheckBox)
 	S:HandleButton(_G.ReputationDetailViewRenownButton)
 
-	hooksecurefunc(_G.ReputationFrame.ScrollBox, 'Update', UpdateFactionSkins)
-
 	-- Currency Frame
 	_G.TokenFramePopup:StripTextures()
 	_G.TokenFramePopup:SetTemplate('Transparent')
@@ -385,40 +417,10 @@ function S:CharacterFrame()
 		S:HandleCloseButton(_G.TokenFramePopup.CloseButton)
 	end
 
-	hooksecurefunc(_G.TokenFrame.ScrollBox, 'Update', function(frame)
-		for _, child in next, { frame.ScrollTarget:GetChildren() } do
-			if child.Highlight and not child.IsSkinned then
-				child.CategoryLeft:SetAlpha(0)
-				child.CategoryRight:SetAlpha(0)
-				child.CategoryMiddle:SetAlpha(0)
-				child.Stripe:SetAlpha(0.75)
-
-				child.Highlight:SetInside()
-				child.Highlight:SetColorTexture(1, 1, 1, .25)
-
-				child.Highlight.SetPoint = E.noop
-				child.Highlight.SetTexture = E.noop
-
-				S:HandleIcon(child.Icon, true)
-				child.Icon.backdrop:SetFrameLevel(child:GetFrameLevel())
-
-				if child.ExpandIcon then
-					child.ExpandIcon:CreateBackdrop('Transparent')
-					child.ExpandIcon.backdrop:SetInside(3, 3)
-				end
-
-				child.IsSkinned = true
-			end
-
-			child.Icon.backdrop:SetShown(not child.isHeader)
-			child.ExpandIcon.backdrop:SetShown(child.isHeader)
-			child.Stripe:SetShown(not child.isHeader)
-		end
-	end)
-
-	--Buttons used to toggle between equipment manager, titles, and character stats
+	hooksecurefunc(_G.ReputationFrame.ScrollBox, 'Update', UpdateFactionSkins)
+	hooksecurefunc(_G.TokenFrame.ScrollBox, 'Update', TokenFrame_ScrollUpdate)
 	hooksecurefunc('PaperDollFrame_UpdateSidebarTabs', FixSidebarTabCoords)
-
+	hooksecurefunc('PaperDollItemSlotButton_Update', PaperDollItemSlotButtonUpdate)
 	hooksecurefunc('CharacterFrame_ShowSubFrame', UpdateCharacterInset)
 end
 
diff --git a/ElvUI/Mainline/Modules/Skins/Collectables.lua b/ElvUI/Mainline/Modules/Skins/Collectables.lua
index 3160dda88c..7c615f94b8 100644
--- a/ElvUI/Mainline/Modules/Skins/Collectables.lua
+++ b/ElvUI/Mainline/Modules/Skins/Collectables.lua
@@ -3,20 +3,21 @@ local S = E:GetModule('Skins')
 local TT = E:GetModule('Tooltip')
 
 local _G = _G
-local strfind = strfind
 local next, unpack = next, unpack
 local ipairs, pairs = ipairs, pairs
+local hooksecurefunc = hooksecurefunc
+local strfind = strfind
 
 local CreateFrame = CreateFrame
-local GetItemInfo = GetItemInfo
 local PlayerHasToy = PlayerHasToy
-local hooksecurefunc = hooksecurefunc
-local BAG_ITEM_QUALITY_COLORS = BAG_ITEM_QUALITY_COLORS
-local GetItemQualityColor = GetItemQualityColor
+
 local C_Heirloom_PlayerHasHeirloom = C_Heirloom.PlayerHasHeirloom
 local C_TransmogCollection_GetSourceInfo = C_TransmogCollection.GetSourceInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
 
 local QUALITY_7_R, QUALITY_7_G, QUALITY_7_B = GetItemQualityColor(7)
+local BAG_ITEM_QUALITY_COLORS = BAG_ITEM_QUALITY_COLORS
 
 local function clearBackdrop(backdrop)
 	backdrop:SetBackdropColor(0, 0, 0, 0)
@@ -120,18 +121,23 @@ local function JournalScrollButtons(frame)
 
 	for _, bu in next, { frame.ScrollTarget:GetChildren() } do
 		if not bu.IsSkinned then
-			bu:StripTextures()
-			bu:CreateBackdrop('Transparent', nil, nil, true)
-			bu.backdrop:ClearAllPoints()
-			bu.backdrop:Point('TOPLEFT', bu, 0, -2)
-			bu.backdrop:Point('BOTTOMRIGHT', bu, 0, 2)
-
 			local icon = bu.icon or bu.Icon
+			local savedIconTexture = icon:GetTexture()
 			icon:Size(40)
 			icon:Point('LEFT', -43, 0)
 			icon:SetTexCoord(unpack(E.TexCoords))
 			icon:CreateBackdrop('Transparent', nil, nil, true)
 
+			local savedPetTypeTexture = bu.petTypeIcon and bu.petTypeIcon:GetTexture()
+			local savedFactionAtlas = bu.factionIcon and bu.factionIcon:GetAtlas()
+
+			bu:StripTextures()
+			bu:CreateBackdrop('Transparent', nil, nil, true)
+			bu.backdrop:ClearAllPoints()
+			bu.backdrop:Point('TOPLEFT', bu, 0, -2)
+			bu.backdrop:Point('BOTTOMRIGHT', bu, 0, 2)
+			icon:SetTexture(savedIconTexture) -- restore the texture
+
 			bu:HookScript('OnEnter', buttonOnEnter)
 			bu:HookScript('OnLeave', buttonOnLeave)
 
@@ -140,7 +146,8 @@ local function JournalScrollButtons(frame)
 				bu.ProgressBar:SetVertexColor(0.251, 0.753, 0.251, 1) -- 0.0118, 0.247, 0.00392
 			end
 
-			if frame:GetParent() == _G.WardrobeCollectionFrame.SetsCollectionFrame then
+			local parent = frame:GetParent()
+			if parent == _G.WardrobeCollectionFrame.SetsCollectionFrame then
 				bu.Favorite:SetAtlas('PetJournal-FavoritesIcon', true)
 				bu.Favorite:Point('TOPLEFT', bu.Icon, 'TOPLEFT', -8, 8)
 
@@ -150,8 +157,9 @@ local function JournalScrollButtons(frame)
 				hooksecurefunc(bu.selectedTexture, 'Show', selectedTextureShow)
 				hooksecurefunc(bu.selectedTexture, 'Hide', selectedTextureHide)
 
-				if frame:GetParent() == _G.PetJournal then
+				if parent == _G.PetJournal then
 					bu.petList = true
+					bu.petTypeIcon:SetTexture(savedPetTypeTexture)
 					bu.petTypeIcon:Point('TOPRIGHT', -1, -1)
 					bu.petTypeIcon:Point('BOTTOMRIGHT', -1, 1)
 
@@ -160,8 +168,9 @@ local function JournalScrollButtons(frame)
 					bu.dragButton.levelBG:SetTexture()
 
 					S:HandleIconBorder(bu.iconBorder, nil, petNameColor)
-				elseif frame:GetParent() == _G.MountJournal then
+				elseif parent == _G.MountJournal then
 					bu.mountList = true
+					bu.factionIcon:SetAtlas(savedFactionAtlas)
 					bu.factionIcon:SetDrawLayer('OVERLAY')
 					bu.factionIcon:Point('TOPRIGHT', -1, -1)
 					bu.factionIcon:Point('BOTTOMRIGHT', -1, 1)
@@ -183,6 +192,108 @@ local function JournalScrollButtons(frame)
 	end
 end
 
+local function ToySpellButtonUpdateButton(button)
+	if button.itemID and PlayerHasToy(button.itemID) then
+		local _, _, quality = GetItemInfo(button.itemID)
+		if quality then
+			local r, g, b = GetItemQualityColor(quality)
+			button.backdrop:SetBackdropBorderColor(r, g, b)
+		else
+			button.backdrop:SetBackdropBorderColor(0.9, 0.9, 0.9)
+		end
+	else
+		local r, g, b = unpack(E.media.bordercolor)
+		button.backdrop:SetBackdropBorderColor(r, g, b)
+	end
+end
+
+local function HeirloomsJournalUpdateButton(_, button)
+	if not button.IsSkinned then
+		S:HandleItemButton(button, true)
+
+		button.iconTextureUncollected:SetTexCoord(unpack(E.TexCoords))
+		button.iconTextureUncollected:SetInside(button)
+		button.iconTexture:SetDrawLayer('ARTWORK')
+		button.hover:SetAllPoints(button.iconTexture)
+		button.slotFrameCollected:SetAlpha(0)
+		button.slotFrameUncollected:SetAlpha(0)
+		button.special:SetJustifyH('RIGHT')
+		button.special:ClearAllPoints()
+
+		button.cooldown:SetAllPoints(button.iconTexture)
+		E:RegisterCooldown(button.cooldown)
+
+		button.IsSkinned = true
+	end
+
+	button.levelBackground:SetTexture()
+
+	button.name:Point('LEFT', button, 'RIGHT', 4, 8)
+	button.level:Point('TOPLEFT', button.levelBackground,'TOPLEFT', 25, 2)
+
+	if C_Heirloom_PlayerHasHeirloom(button.itemID) then
+		button.name:SetTextColor(0.9, 0.9, 0.9)
+		button.level:SetTextColor(0.9, 0.9, 0.9)
+		button.special:SetTextColor(1, .82, 0)
+		button.backdrop:SetBackdropBorderColor(QUALITY_7_R, QUALITY_7_G, QUALITY_7_B)
+	else
+		button.name:SetTextColor(0.4, 0.4, 0.4)
+		button.level:SetTextColor(0.4, 0.4, 0.4)
+		button.special:SetTextColor(0.4, 0.4, 0.4)
+		button.backdrop:SetBackdropBorderColor(unpack(E.media.bordercolor))
+	end
+end
+
+local function HeirloomsJournalLayoutCurrentPage()
+	local headers = _G.HeirloomsJournal.heirloomHeaderFrames
+	if headers and next(headers) then
+		for _, header in next, headers do
+			header:StripTextures()
+			header.text:FontTemplate(nil, 15, 'SHADOW')
+			header.text:SetTextColor(0.9, 0.9, 0.9)
+		end
+	end
+end
+
+local function SetsFrame_ScrollBoxUpdate(button)
+	for _, child in next, { button.ScrollTarget:GetChildren() } do
+		if not child.IsSkinned then
+			child.Background:Hide()
+			child.HighlightTexture:SetTexture(E.ClearTexture)
+			child.Icon:SetSize(42, 42)
+			S:HandleIcon(child.Icon)
+			child.IconCover:SetOutside(child.Icon)
+
+			child.SelectedTexture:SetDrawLayer('BACKGROUND')
+			child.SelectedTexture:SetColorTexture(1, 1, 1, .25)
+			child.SelectedTexture:ClearAllPoints()
+			child.SelectedTexture:Point('TOPLEFT', 4, -2)
+			child.SelectedTexture:Point('BOTTOMRIGHT', -1, 2)
+			child.SelectedTexture:CreateBackdrop('Transparent')
+
+			child.IsSkinned = true
+		end
+	end
+end
+
+local function SetsFrame_SetItemFrameQuality(_, itemFrame)
+	local icon = itemFrame.Icon
+	if not icon.backdrop then
+		icon:CreateBackdrop()
+		icon:SetTexCoord(unpack(E.TexCoords))
+		itemFrame.IconBorder:Hide()
+	end
+
+	if itemFrame.collected then
+		local quality = C_TransmogCollection_GetSourceInfo(itemFrame.sourceID).quality
+		local color = BAG_ITEM_QUALITY_COLORS[quality or 1]
+		icon.backdrop:SetBackdropBorderColor(color.r, color.g, color.b)
+	else
+		local r, g, b = unpack(E.media.bordercolor)
+		icon.backdrop:SetBackdropBorderColor(r, g, b)
+	end
+end
+
 local function SkinMountFrame()
 	S:HandleItemButton(_G.MountJournalSummonRandomFavoriteButton)
 	S:HandleButton(_G.MountJournalFilterButton)
@@ -375,19 +486,7 @@ local function SkinToyFrame()
 		E:RegisterCooldown(button.cooldown)
 	end
 
-	hooksecurefunc('ToySpellButton_UpdateButton', function(button)
-		if button.itemID and PlayerHasToy(button.itemID) then
-			local _, _, quality = GetItemInfo(button.itemID)
-			if quality then
-				local r, g, b = GetItemQualityColor(quality)
-				button.backdrop:SetBackdropBorderColor(r, g, b)
-			else
-				button.backdrop:SetBackdropBorderColor(0.9, 0.9, 0.9)
-			end
-		else
-			button.backdrop:SetBackdropBorderColor(unpack(E.media.bordercolor))
-		end
-	end)
+	hooksecurefunc('ToySpellButton_UpdateButton', ToySpellButtonUpdateButton)
 end
 
 local function SkinHeirloomFrame()
@@ -410,51 +509,8 @@ local function SkinHeirloomFrame()
 	HeirloomsJournal.progressBar:CreateBackdrop()
 	E:RegisterStatusBar(HeirloomsJournal.progressBar)
 
-	hooksecurefunc(HeirloomsJournal, 'UpdateButton', function(_, button)
-		if not button.IsSkinned then
-			S:HandleItemButton(button, true)
-
-			button.iconTextureUncollected:SetTexCoord(unpack(E.TexCoords))
-			button.iconTextureUncollected:SetInside(button)
-			button.iconTexture:SetDrawLayer('ARTWORK')
-			button.hover:SetAllPoints(button.iconTexture)
-			button.slotFrameCollected:SetAlpha(0)
-			button.slotFrameUncollected:SetAlpha(0)
-			button.special:SetJustifyH('RIGHT')
-			button.special:ClearAllPoints()
-
-			button.cooldown:SetAllPoints(button.iconTexture)
-			E:RegisterCooldown(button.cooldown)
-
-			button.IsSkinned = true
-		end
-
-		button.levelBackground:SetTexture()
-
-		button.name:Point('LEFT', button, 'RIGHT', 4, 8)
-		button.level:Point('TOPLEFT', button.levelBackground,'TOPLEFT', 25, 2)
-
-		if C_Heirloom_PlayerHasHeirloom(button.itemID) then
-			button.name:SetTextColor(0.9, 0.9, 0.9)
-			button.level:SetTextColor(0.9, 0.9, 0.9)
-			button.special:SetTextColor(1, .82, 0)
-			button.backdrop:SetBackdropBorderColor(QUALITY_7_R, QUALITY_7_G, QUALITY_7_B)
-		else
-			button.name:SetTextColor(0.4, 0.4, 0.4)
-			button.level:SetTextColor(0.4, 0.4, 0.4)
-			button.special:SetTextColor(0.4, 0.4, 0.4)
-			button.backdrop:SetBackdropBorderColor(unpack(E.media.bordercolor))
-		end
-	end)
-
-	hooksecurefunc(HeirloomsJournal, 'LayoutCurrentPage', function()
-		for i=1, #HeirloomsJournal.heirloomHeaderFrames do
-			local header = HeirloomsJournal.heirloomHeaderFrames[i]
-			header:StripTextures()
-			header.text:FontTemplate(nil, 15, 'SHADOW')
-			header.text:SetTextColor(0.9, 0.9, 0.9)
-		end
-	end)
+	hooksecurefunc(HeirloomsJournal, 'UpdateButton', HeirloomsJournalUpdateButton)
+	hooksecurefunc(HeirloomsJournal, 'LayoutCurrentPage', HeirloomsJournalLayoutCurrentPage)
 end
 
 local function SkinTransmogFrames()
@@ -559,26 +615,7 @@ local function SkinTransmogFrames()
 	SetsCollectionFrame.LeftInset:StripTextures()
 	S:HandleTrimScrollBar(SetsCollectionFrame.ListContainer.ScrollBar)
 
-	hooksecurefunc(SetsCollectionFrame.ListContainer.ScrollBox, 'Update', function(button)
-		for _, child in next, { button.ScrollTarget:GetChildren() } do
-			if not child.IsSkinned then
-				child.Background:Hide()
-				child.HighlightTexture:SetTexture(E.ClearTexture)
-				child.Icon:SetSize(42, 42)
-				S:HandleIcon(child.Icon)
-				child.IconCover:SetOutside(child.Icon)
-
-				child.SelectedTexture:SetDrawLayer('BACKGROUND')
-				child.SelectedTexture:SetColorTexture(1, 1, 1, .25)
-				child.SelectedTexture:ClearAllPoints()
-				child.SelectedTexture:Point('TOPLEFT', 4, -2)
-				child.SelectedTexture:Point('BOTTOMRIGHT', -1, 2)
-				child.SelectedTexture:CreateBackdrop('Transparent')
-
-				child.IsSkinned = true
-			end
-		end
-	end)
+	hooksecurefunc(SetsCollectionFrame.ListContainer.ScrollBox, 'Update', SetsFrame_ScrollBoxUpdate)
 
 	local DetailsFrame = SetsCollectionFrame.DetailsFrame
 	DetailsFrame.ModelFadeTexture:Hide()
@@ -587,22 +624,7 @@ local function SkinTransmogFrames()
 	DetailsFrame.LongName:FontTemplate(nil, 16)
 	S:HandleButton(DetailsFrame.VariantSetsButton)
 
-	hooksecurefunc(SetsCollectionFrame, 'SetItemFrameQuality', function(_, itemFrame)
-		local icon = itemFrame.Icon
-		if not icon.backdrop then
-			icon:CreateBackdrop()
-			icon:SetTexCoord(unpack(E.TexCoords))
-			itemFrame.IconBorder:Hide()
-		end
-
-		if itemFrame.collected then
-			local quality = C_TransmogCollection_GetSourceInfo(itemFrame.sourceID).quality
-			local color = BAG_ITEM_QUALITY_COLORS[quality or 1]
-			icon.backdrop:SetBackdropBorderColor(color.r, color.g, color.b)
-		else
-			icon.backdrop:SetBackdropBorderColor(unpack(E.media.bordercolor))
-		end
-	end)
+	hooksecurefunc(SetsCollectionFrame, 'SetItemFrameQuality', SetsFrame_SetItemFrameQuality)
 
 	_G.WardrobeSetsCollectionVariantSetsButton.Icon:SetTexture(E.Media.Textures.ArrowUp)
 	_G.WardrobeSetsCollectionVariantSetsButton.Icon:SetRotation(S.ArrowRotation.down)
diff --git a/ElvUI/Mainline/Modules/Skins/EncounterJournal.lua b/ElvUI/Mainline/Modules/Skins/EncounterJournal.lua
index 4fd392185f..274ceda2e2 100644
--- a/ElvUI/Mainline/Modules/Skins/EncounterJournal.lua
+++ b/ElvUI/Mainline/Modules/Skins/EncounterJournal.lua
@@ -2,16 +2,13 @@ local E, L, V, P, G = unpack(ElvUI)
 local S = E:GetModule('Skins')
 
 local _G = _G
-local unpack = unpack
-local select = select
-local ipairs = ipairs
-local next = next
-local rad = rad
+local unpack, select = unpack, select
+local ipairs, next, rad = ipairs, next, rad
+local hooksecurefunc = hooksecurefunc
 
 local CreateFrame = CreateFrame
-local GetItemInfo = GetItemInfo
-local hooksecurefunc = hooksecurefunc
-local GetItemQualityColor = GetItemQualityColor
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
 
 local lootQuality = {
 	['loottab-set-itemborder-white'] = nil, -- dont show white
@@ -381,6 +378,7 @@ function S:Blizzard_EncounterJournal()
 
 	if E.private.skins.parchmentRemoverEnable then
 		EJ.MonthlyActivitiesFrame.Bg:SetAlpha(0)
+		EJ.MonthlyActivitiesFrame.ThemeContainer:SetAlpha(0)
 		_G.EncounterJournalInstanceSelectBG:SetAlpha(0)
 
 		local suggestFrame = EJ.suggestFrame
diff --git a/ElvUI/Mainline/Modules/Skins/LFG.lua b/ElvUI/Mainline/Modules/Skins/LFG.lua
index c5409b4495..e07dfbd649 100644
--- a/ElvUI/Mainline/Modules/Skins/LFG.lua
+++ b/ElvUI/Mainline/Modules/Skins/LFG.lua
@@ -8,8 +8,8 @@ local min, select = min, select
 local unpack, ipairs, pairs = unpack, ipairs, pairs
 local hooksecurefunc = hooksecurefunc
 
-local GetItemInfo = GetItemInfo
 local UnitIsGroupLeader = UnitIsGroupLeader
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
 
 local C_ChallengeMode_GetAffixInfo = C_ChallengeMode.GetAffixInfo
 local C_LFGList_GetAvailableActivities = C_LFGList.GetAvailableActivities
diff --git a/ElvUI/Mainline/Modules/Skins/PVP.lua b/ElvUI/Mainline/Modules/Skins/PVP.lua
index d1d34d0bac..dc014541d7 100644
--- a/ElvUI/Mainline/Modules/Skins/PVP.lua
+++ b/ElvUI/Mainline/Modules/Skins/PVP.lua
@@ -4,11 +4,11 @@ local TT = E:GetModule('Tooltip')
 
 local _G = _G
 local ipairs, pairs, unpack, next = ipairs, pairs, unpack, next
-
-local GetItemInfo = GetItemInfo
-local GetItemQualityColor = GetItemQualityColor
 local hooksecurefunc = hooksecurefunc
 
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local GetItemQualityColor = (C_Item and C_Item.GetItemQualityColor) or GetItemQualityColor
+
 local ITEMQUALITY_ARTIFACT = Enum.ItemQuality.Artifact
 local CurrencyContainerUtil_GetCurrencyContainerInfo = CurrencyContainerUtil.GetCurrencyContainerInfo
 local C_CurrencyInfo_GetCurrencyInfo = C_CurrencyInfo.GetCurrencyInfo
diff --git a/ElvUI/Mainline/Modules/Skins/PerksProgram.lua b/ElvUI/Mainline/Modules/Skins/PerksProgram.lua
index dc9b29f3ed..5aa4fbfb5f 100644
--- a/ElvUI/Mainline/Modules/Skins/PerksProgram.lua
+++ b/ElvUI/Mainline/Modules/Skins/PerksProgram.lua
@@ -102,6 +102,11 @@ function S:Blizzard_PerksProgram()
 
 	local frame = _G.PerksProgramFrame
 	local products = frame.ProductsFrame
+
+	if E.private.skins.parchmentRemoverEnable then
+		frame.ThemeContainer:SetAlpha(0)
+	end
+
 	if products then
 		S:HandleButton(products.PerksProgramFilter.FilterDropDownButton)
 
diff --git a/ElvUI_Libraries/Core/LibRangeCheck-3.0/LibRangeCheck-3.0.lua b/ElvUI_Libraries/Core/LibRangeCheck-3.0/LibRangeCheck-3.0.lua
index aa7b235f2f..f3b74651d3 100644
--- a/ElvUI_Libraries/Core/LibRangeCheck-3.0/LibRangeCheck-3.0.lua
+++ b/ElvUI_Libraries/Core/LibRangeCheck-3.0/LibRangeCheck-3.0.lua
@@ -40,7 +40,7 @@ License: MIT
 -- @class file
 -- @name LibRangeCheck-3.0
 local MAJOR_VERSION = "LibRangeCheck-3.0-ElvUI"
-local MINOR_VERSION = 15 -- real minor version: 13
+local MINOR_VERSION = 16 -- real minor version: 13
 
 -- GLOBALS: LibStub, CreateFrame
 
@@ -65,9 +65,9 @@ local setmetatable = setmetatable
 
 local CheckInteractDistance = CheckInteractDistance
 local GetInventoryItemLink = GetInventoryItemLink
-local GetItemInfo = GetItemInfo
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
 local GetNumSpellTabs = GetNumSpellTabs
-local GetSpellBookItemInfo = GetSpellBookItemInfo
+local GetSpellBookItemName = GetSpellBookItemName
 local GetSpellInfo = GetSpellInfo
 local GetSpellTabInfo = GetSpellTabInfo
 local GetTime = GetTime
@@ -134,6 +134,7 @@ local InteractLists = {
 }
 
 local MeleeRange = 2
+local MatchSpellByID = {} -- specific matching to avoid incorrect index
 local FriendSpells, HarmSpells, ResSpells, PetSpells = {}, {}, {}, {}
 
 for _, n in ipairs({ "EVOKER", "DEATHKNIGHT", "DEMONHUNTER", "DRUID", "HUNTER", "SHAMAN", "MAGE", "PALADIN", "PRIEST", "WARLOCK", "WARRIOR", "MONK", "ROGUE" }) do
@@ -197,6 +198,8 @@ if not isRetail then
 end
 
 if isEraSOD then
+  MatchSpellByID[401417] = true -- Regeneration (Rune): Conflicts with Racial Passive on Trolls
+
   tinsert(FriendSpells.MAGE, 401417) -- Regeneration (40 yards)
   tinsert(FriendSpells.MAGE, 412510) -- Mass Regeneration (40 yards)
 end
@@ -654,15 +657,14 @@ local function getNumSpells()
 end
 
 -- return the spellIndex of the given spell by scanning the spellbook
-local allowSpellType = { SPELL = true, FUTURESPELL = true }
 local function findSpellIdx(spellName, sid)
   if not spellName or spellName == "" then
     return nil
   end
 
   for i = 1, getNumSpells() do
-    local spellType, id = GetSpellBookItemInfo(i, BOOKTYPE_SPELL)
-    if sid == id and allowSpellType[spellType] then
+    local name, _, id = GetSpellBookItemName(i, BOOKTYPE_SPELL)
+    if sid == id or (spellName == name and not MatchSpellByID[id]) then
       return i
     end
   end
diff --git a/ElvUI_Libraries/Core/oUF/elements/castbar.lua b/ElvUI_Libraries/Core/oUF/elements/castbar.lua
index d1d1b0c021..3a7963ebf9 100644
--- a/ElvUI_Libraries/Core/oUF/elements/castbar.lua
+++ b/ElvUI_Libraries/Core/oUF/elements/castbar.lua
@@ -184,7 +184,9 @@ local function UpdatePips(element, numStages)
 			pip:Show()
 
 			if(isHoriz) then
-				pip:RotateTextures(0)
+				if(pip.RotateTextures) then
+					pip:RotateTextures(0)
+				end
 
 				if(element:GetReverseFill()) then
 					pip:SetPoint('TOP', element, 'TOPRIGHT', -offset, 0)
@@ -194,7 +196,9 @@ local function UpdatePips(element, numStages)
 					pip:SetPoint('BOTTOM', element, 'BOTTOMLEFT', offset, 0)
 				end
 			else
-				pip:RotateTextures(1.5708)
+				if(pip.RotateTextures) then
+					pip:RotateTextures(1.5708)
+				end
 
 				if(element:GetReverseFill()) then
 					pip:SetPoint('LEFT', element, 'TOPLEFT', 0, -offset)
@@ -212,11 +216,25 @@ local function UpdatePips(element, numStages)
 	end
 end
 
+--[[ Override: Castbar:ShouldShow(unit)
+Handles check for which unit the castbar should show for.
+Defaults to the object unit.
+* self - the Castbar widget
+* unit - the unit for which the update has been triggered (string)
+--]]
+local function ShouldShow(element, unit)
+	return element.__owner.unit == unit
+end
+
+
 local function CastStart(self, real, unit, castGUID)
-	if self.unit ~= unit then return end
 	if oUF.isRetail and real == 'UNIT_SPELLCAST_START' and not castGUID then return end
 
 	local element = self.Castbar
+	if(not (element.ShouldShow or ShouldShow) (element, unit)) then
+		return
+	end
+
 	local name, text, texture, startTime, endTime, isTradeSkill, castID, notInterruptible, spellID = UnitCastingInfo(unit)
 
 	local numStages, _
@@ -328,9 +346,11 @@ local function CastStart(self, real, unit, castGUID)
 end
 
 local function CastUpdate(self, event, unit, castID, spellID)
-	if(self.unit ~= unit) then return end
-
 	local element = self.Castbar
+	if(not (element.ShouldShow or ShouldShow) (element, unit)) then
+		return
+	end
+
 	if(not element:IsShown() or ((unit == 'player' or oUF.isRetail) and (element.castID ~= castID)) or (oUF.isRetail and (element.spellID ~= spellID))) then
 		return
 	end
@@ -385,9 +405,11 @@ local function CastUpdate(self, event, unit, castID, spellID)
 end
 
 local function CastStop(self, event, unit, castID, spellID)
-	if(self.unit ~= unit) then return end
-
 	local element = self.Castbar
+	if(not (element.ShouldShow or ShouldShow) (element, unit)) then
+		return
+	end
+
 	if(not element:IsShown() or ((unit == 'player' or oUF.isRetail) and (element.castID ~= castID)) or (oUF.isRetail and (element.spellID ~= spellID))) then
 		return
 	end
@@ -415,9 +437,11 @@ local function CastStop(self, event, unit, castID, spellID)
 end
 
 local function CastFail(self, event, unit, castID, spellID)
-	if(self.unit ~= unit) then return end
-
 	local element = self.Castbar
+	if(not (element.ShouldShow or ShouldShow) (element, unit)) then
+		return
+	end
+
 	if(not element:IsShown() or ((unit == 'player' or oUF.isRetail) and (element.castID ~= castID)) or (oUF.isRetail and (element.spellID ~= spellID))) then
 		return
 	end
@@ -453,9 +477,11 @@ local function CastFail(self, event, unit, castID, spellID)
 end
 
 local function CastInterruptible(self, event, unit)
-	if(self.unit ~= unit) then return end
-
 	local element = self.Castbar
+	if(not (element.ShouldShow or ShouldShow) (element, unit)) then
+		return
+	end
+
 	if(not element:IsShown()) then return end
 
 	element.notInterruptible = event == 'UNIT_SPELLCAST_NOT_INTERRUPTIBLE'
diff --git a/ElvUI_Libraries/Core/oUF/elements/healthprediction.lua b/ElvUI_Libraries/Core/oUF/elements/healthprediction.lua
index 9f853a644b..847655cc49 100644
--- a/ElvUI_Libraries/Core/oUF/elements/healthprediction.lua
+++ b/ElvUI_Libraries/Core/oUF/elements/healthprediction.lua
@@ -108,6 +108,21 @@ local function Update(self, event, unit)
 	local otherIncomingHeal = 0
 	local hasOverHealAbsorb = false
 
+	-- Kludge to override value for heals not reported by WoW client (ref: https://github.com/Stanzilla/WoWUIBugs/issues/163)
+	-- There may be other bugs that this workaround does not catch, but this does fix Priest PoH
+	if(HealComm and not oUF.isRetail) then
+		local healAmount = HealComm:GetHealAmount(GUID, HealComm.CASTED_HEALS) or 0
+		if(healAmount > 0) then
+			if(myIncomingHeal == 0 and unit == 'player') then
+				myIncomingHeal = healAmount
+			end
+
+			if(allIncomingHeal == 0) then
+				allIncomingHeal = healAmount
+			end
+		end
+	end
+
 	if(healAbsorb > allIncomingHeal) then
 		healAbsorb = healAbsorb - allIncomingHeal
 		allIncomingHeal = 0
diff --git a/ElvUI_Libraries/Core/oUF/elements/tags.lua b/ElvUI_Libraries/Core/oUF/elements/tags.lua
index 60a6987d35..670f3d86bb 100644
--- a/ElvUI_Libraries/Core/oUF/elements/tags.lua
+++ b/ElvUI_Libraries/Core/oUF/elements/tags.lua
@@ -448,7 +448,7 @@ local tagStrings = {
 	end]],
 
 	['threatcolor'] = [[function(u)
-		return Hex(GetThreatStatusColor(UnitThreatSituation(u)))
+		return Hex(GetThreatStatusColor(UnitThreatSituation(u) or 0))
 	end]],
 }
 
diff --git a/ElvUI_Libraries/ElvUI_Libraries_Classic.toc b/ElvUI_Libraries/ElvUI_Libraries_Classic.toc
index 02ef374817..703d93fde3 100644
--- a/ElvUI_Libraries/ElvUI_Libraries_Classic.toc
+++ b/ElvUI_Libraries/ElvUI_Libraries_Classic.toc
@@ -2,7 +2,7 @@
 ## Notes: Libraries that power ElvUI
 ## Author: Elv, Simpy
 ## Version: @project-version@
-## Interface: 11501
+## Interface: 11502
 ## OptionalDeps: LibHealComm-4.0
 ## X-oUF: ElvUF
 
diff --git a/ElvUI_Options/Core/Bags.lua b/ElvUI_Options/Core/Bags.lua
index 147db471ab..d0ea820777 100644
--- a/ElvUI_Options/Core/Bags.lua
+++ b/ElvUI_Options/Core/Bags.lua
@@ -8,8 +8,8 @@ local format, strmatch = format, strmatch
 local tonumber = tonumber
 
 local GameTooltip = GameTooltip
-local GetItemInfo = GetItemInfo
-local SetInsertItemsLeftToRight = SetInsertItemsLeftToRight or (C_Container and C_Container.SetInsertItemsLeftToRight)
+local GetItemInfo = (C_Item and C_Item.GetItemInfo) or GetItemInfo
+local SetInsertItemsLeftToRight = (C_Container and C_Container.SetInsertItemsLeftToRight) or SetInsertItemsLeftToRight
 
 local Bags = ACH:Group(L["Bags"], nil, 2, 'tab', function(info) return E.db.bags[info[#info]] end, function(info, value) E.db.bags[info[#info]] = value end)
 E.Options.args.bags = Bags
diff --git a/ElvUI_Options/Core/Core.lua b/ElvUI_Options/Core/Core.lua
index c759984be7..08781ae66f 100644
--- a/ElvUI_Options/Core/Core.lua
+++ b/ElvUI_Options/Core/Core.lua
@@ -4,7 +4,6 @@ local MC = E:GetModule('ModuleCopy')
 local D = E:GetModule('Distributor')
 local S = E:GetModule('Skins')
 
-local GetAddOnMetadata = (C_AddOns and C_AddOns.GetAddOnMetadata) or GetAddOnMetadata
 -- GLOBALS: ElvDB
 
 local ACH = E.Libs.ACH
@@ -312,7 +311,11 @@ E.Options.args.profiles.args.private.order = 2
 
 E.Libs.AceConfig:RegisterOptionsTable('ElvProfiles', E.Options.args.profiles.args.profile)
 
+<<<<<<< HEAD
 if E.Retail or E.Cata then
+=======
+if E.Retail or E.Wrath or E.ClassicSOD then
+>>>>>>> upstream/main
 	E.Libs.DualSpec:EnhanceOptions(E.Options.args.profiles.args.profile, E.data)
 end
 
diff --git a/ElvUI_Options/Core/StyleFilters.lua b/ElvUI_Options/Core/StyleFilters.lua
index aaf91f36de..9829c86147 100644
--- a/ElvUI_Options/Core/StyleFilters.lua
+++ b/ElvUI_Options/Core/StyleFilters.lua
@@ -634,7 +634,7 @@ StyleFilters.triggers.args.location = ACH:Group(L["Location"], nil, 30, nil, fun
 StyleFilters.triggers.args.location.args.map = ACH:Group('', nil, 1)
 StyleFilters.triggers.args.location.args.map.inline = true
 StyleFilters.triggers.args.location.args.map.args.mapIDEnabled = ACH:Toggle(L["Use Map ID or Name"], L["If enabled, the style filter will only activate when you are in one of the maps specified in Map ID."], 1, nil, nil, 200)
-StyleFilters.triggers.args.location.args.map.args.mapIDs = ACH:Input(L["Add Map ID"], nil, 2, nil, nil, nil, function(_, value) local triggers = GetFilter(true) triggers.location.mapIDs[value] = true NP:ConfigureAll() end, function () local triggers = GetFilter(true) return not triggers.location.mapIDEnabled end, nil, function(_, value) local triggers = GetFilter(true) return not (strmatch(value, '^[%s%p]-$') or triggers.location.mapIDs[value]) end)
+StyleFilters.triggers.args.location.args.map.args.mapIDs = ACH:Input(L["Add Map ID"], nil, 2, nil, nil, nil, function(_, value) local triggers = GetFilter(true) triggers.location.mapIDs[value] = true NP:ConfigureAll() end, function() local triggers = GetFilter(true) return not triggers.location.mapIDEnabled end, nil, function(_, value) local triggers = GetFilter(true) return not (strmatch(value, '^[%s%p]-$') or triggers.location.mapIDs[value]) end)
 StyleFilters.triggers.args.location.args.map.args.removeMapID = ACH:Select(L["Remove Map ID"], nil, 3, removeLocationList, nil, nil, nil, function(_, value) local triggers = GetFilter(true) triggers.location.mapIDs[value] = nil NP:ConfigureAll() end, function() local triggers = GetFilter(true) local ids = triggers.location.mapIDs return not (triggers.location.mapIDEnabled and ids and next(ids)) end)
 
 StyleFilters.triggers.args.location.args.instance = ACH:Group('', nil, 2)
@@ -646,13 +646,13 @@ StyleFilters.triggers.args.location.args.instance.args.removeInstanceID = ACH:Se
 StyleFilters.triggers.args.location.args.zoneName = ACH:Group('', nil, 3)
 StyleFilters.triggers.args.location.args.zoneName.inline = true
 StyleFilters.triggers.args.location.args.zoneName.args.zoneNamesEnabled = ACH:Toggle(L["Use Zone Names"], L["If enabled, the style filter will only activate when you are in one of the zones specified in Add Zone Name."], 1, nil, nil, 200)
-StyleFilters.triggers.args.location.args.zoneName.args.zoneNames = ACH:Input(L["Add Zone Name"], nil, 2, nil, nil, nil, function(_, value) local triggers = GetFilter(true) triggers.location.zoneNames[value] = true NP:ConfigureAll() end, function () local triggers = GetFilter(true) return not triggers.location.zoneNamesEnabled end, nil, function(_, value) local triggers = GetFilter(true) return not (strmatch(value, '^[%s%p]-$') or triggers.location.zoneNames[value]) end)
+StyleFilters.triggers.args.location.args.zoneName.args.zoneNames = ACH:Input(L["Add Zone Name"], nil, 2, nil, nil, nil, function(_, value) local triggers = GetFilter(true) triggers.location.zoneNames[value] = true NP:ConfigureAll() end, function() local triggers = GetFilter(true) return not triggers.location.zoneNamesEnabled end, nil, function(_, value) local triggers = GetFilter(true) return not (strmatch(value, '^[%s%p]-$') or triggers.location.zoneNames[value]) end)
 StyleFilters.triggers.args.location.args.zoneName.args.removeZoneName = ACH:Select(L["Remove Zone Name"], nil, 3, removeLocationList, nil, nil, nil, function(_, value) local triggers = GetFilter(true) triggers.location.zoneNames[value] = nil NP:ConfigureAll() end, function() local triggers = GetFilter(true) local zone = triggers.location.zoneNames return not (triggers.location.zoneNamesEnabled and zone and next(zone)) end)
 
 StyleFilters.triggers.args.location.args.subZoneName = ACH:Group('', nil, 4)
 StyleFilters.triggers.args.location.args.subZoneName.inline = true
 StyleFilters.triggers.args.location.args.subZoneName.args.subZoneNamesEnabled = ACH:Toggle(L["Use Subzone Names"], L["If enabled, the style filter will only activate when you are in one of the subzones specified in Add Subzone Name."], 1, nil, nil, 200)
-StyleFilters.triggers.args.location.args.subZoneName.args.subZoneNames = ACH:Input(L["Add Subzone Name"], nil, 2, nil, nil, nil, function(_, value) local triggers = GetFilter(true) triggers.location.subZoneNames[value] = true NP:ConfigureAll() end, function () local triggers = GetFilter(true) return not triggers.location.subZoneNamesEnabled end)
+StyleFilters.triggers.args.location.args.subZoneName.args.subZoneNames = ACH:Input(L["Add Subzone Name"], nil, 2, nil, nil, nil, function(_, value) local triggers = GetFilter(true) triggers.location.subZoneNames[value] = true NP:ConfigureAll() end, function() local triggers = GetFilter(true) return not triggers.location.subZoneNamesEnabled end)
 StyleFilters.triggers.args.location.args.subZoneName.args.removeSubZoneName = ACH:Select(L["Remove Subzone Name"], nil, 3, removeLocationList, nil, nil, nil, function(_, value) local triggers = GetFilter(true) triggers.location.subZoneNames[value] = nil NP:ConfigureAll() end, function() local triggers = GetFilter(true) local zone = triggers.location.subZoneNames return not (triggers.location.subZoneNamesEnabled and zone and next(zone)) end)
 
 StyleFilters.triggers.args.location.args.btns = ACH:Group(L["Add Current"], nil, 5)
diff --git a/ElvUI_Options/Core/UnitFrames.lua b/ElvUI_Options/Core/UnitFrames.lua
index 94aff17a00..74d859e640 100644
--- a/ElvUI_Options/Core/UnitFrames.lua
+++ b/ElvUI_Options/Core/UnitFrames.lua
@@ -15,6 +15,11 @@ local CopyTable = CopyTable
 local NUM_CLASSES = #CLASS_SORT_ORDER
 local MAX_BOSS_FRAMES = 8
 
+local petTypes = {
+	pet = true,
+	raidpet = true
+}
+
 local orientationValues = {
 	LEFT = L["Left"],
 	MIDDLE = L["Middle"],
@@ -266,10 +271,10 @@ local function doApplyToAll(db, info, value)
 end
 
 local function BuffIndicator_ApplyToAll(info, value, profile, pet)
-	if profile then
-		return doApplyToAll(E.db.unitframe.filters.aurawatch, info, value)
-	elseif pet then
+	if pet then
 		return doApplyToAll(E.global.unitframe.aurawatch.PET, info, value)
+	elseif profile then
+		return doApplyToAll(E.db.unitframe.filters.aurawatch, info, value)
 	else
 		return doApplyToAll(E.global.unitframe.aurawatch[E.myclass], info, value)
 	end
@@ -280,9 +285,10 @@ local function GetOptionsTable_AuraWatch(updateFunc, groupName, numGroup, subGro
 	config.args.enable = ACH:Toggle(L["Enable"], nil, 1)
 
 	config.args.generalGroup = ACH:Group(' ', nil, 2)
-	config.args.generalGroup.args.profileSpecific = ACH:Toggle(L["Profile Specific"], L["Use the profile specific filter Aura Indicator (Profile) instead of the global filter Aura Indicator."], 1)
+	config.args.generalGroup.args.configureButton = ACH:Execute(L["Configure Auras"], nil, 1, function() local configString = format('Aura Indicator (%s)', (petTypes[groupName] and E.db.unitframe.units[groupName].buffIndicator.petSpecific and 'Pet') or (E.db.unitframe.units[groupName].buffIndicator.profileSpecific and 'Profile') or 'Class') C:SetToFilterConfig(configString) end)
 	config.args.generalGroup.args.size = ACH:Range(L["Size"], nil, 2, { min = 6, max = 48, step = 1 })
-	config.args.generalGroup.args.configureButton = ACH:Execute(L["Configure Auras"], nil, 3, function() local configString = format('Aura Indicator (%s)', groupName == 'pet' and 'Pet' or E.db.unitframe.units[groupName].buffIndicator.profileSpecific and 'Profile' or 'Class') C:SetToFilterConfig(configString) end)
+	config.args.generalGroup.args.profileSpecific = ACH:Toggle(L["Profile Specific"], L["Use the profile specific filter Aura Indicator (Profile) instead of the global filter Aura Indicator."], 3)
+	config.args.generalGroup.args.petSpecific = ACH:Toggle(L["Pet Specific"], L["Use the profile specific filter Aura Indicator (Pet) instead of the global filter Aura Indicator."], 4, nil, nil, nil, nil, nil, nil, function() return not petTypes[groupName] end)
 	config.args.generalGroup.inline = true
 
 	config.args.countGroup = ACH:Group(L["Count Text"], nil, 15)
@@ -295,7 +301,7 @@ local function GetOptionsTable_AuraWatch(updateFunc, groupName, numGroup, subGro
 		config.get = function(info) return E.db.unitframe.units[groupName][subGroup].buffIndicator[info[#info]] end
 		config.set = function(info, value) E.db.unitframe.units[groupName][subGroup].buffIndicator[info[#info]] = value updateFunc(UF, groupName, numGroup) end
 	else
-		config.args.applyToAll = ACH:Group(L["Apply To All"], nil, 50, nil, function(info) return BuffIndicator_ApplyToAll(info, nil, E.db.unitframe.units[groupName].buffIndicator.profileSpecific, groupName == 'pet') end, function(info, value) BuffIndicator_ApplyToAll(info, value, E.db.unitframe.units[groupName].buffIndicator.profileSpecific, groupName == 'pet') updateFunc(UF, groupName, numGroup) end)
+		config.args.applyToAll = ACH:Group(L["Apply To All"], nil, 50, nil, function(info) return BuffIndicator_ApplyToAll(info, nil, E.db.unitframe.units[groupName].buffIndicator.profileSpecific, petTypes[groupName] and E.db.unitframe.units[groupName].buffIndicator.petSpecific) end, function(info, value) BuffIndicator_ApplyToAll(info, value, E.db.unitframe.units[groupName].buffIndicator.profileSpecific, petTypes[groupName] and E.db.unitframe.units[groupName].buffIndicator.petSpecific) updateFunc(UF, groupName, numGroup) end)
 		config.args.applyToAll.inline = true
 		config.args.applyToAll.args.header = ACH:Description(L["|cffFF3333Warning:|r Changing options in this section will apply to all Aura Indicator auras. To change only one Aura, please click \"Configure Auras\" and change that specific Auras settings. If \"Profile Specific\" is selected it will apply to that filter set."], 1)
 		config.args.applyToAll.args.style = ACH:Select(L["Style"], nil, 2, { timerOnly = L["Timer Only"], coloredIcon = L["Colored Icon"], texturedIcon = L["Textured Icon"] })
@@ -669,7 +675,7 @@ local function GetOptionsTable_Health(isGroupFrame, updateFunc, groupName, numUn
 		config.args.orientation = ACH:Select(L["Statusbar Fill Orientation"], L["Direction the health bar moves when gaining/losing health."], 9, { HORIZONTAL = L["Horizontal"], VERTICAL = L["Vertical"] })
 	end
 
-	if groupName == 'pet' or groupName == 'raidpet' then
+	if petTypes[groupName] then
 		config.args.colorPetByUnitClass = ACH:Toggle(L["Color by Unit Class"], nil, 2)
 
 		if groupName == 'pet' and E.myclass == 'HUNTER' then
@@ -954,29 +960,35 @@ local function GetOptionsTable_ClassBar(updateFunc, groupName, numUnits)
 end
 
 local function GetOptionsTable_GeneralGroup(updateFunc, groupName, numUnits)
-	local config = ACH:Group(L["General"], nil, 1)
+	local config = ACH:Group(L["General"], nil, 1, 'tab')
 	config.args.orientation = ACH:Select(L["Frame Orientation"], L["Set the orientation of the UnitFrame."], 1, orientationValues)
-	config.args.disableMouseoverGlow = ACH:Toggle(L["Block Mouseover Glow"], L["Forces Mouseover Glow to be disabled for these frames"], 2)
-	config.args.disableTargetGlow = ACH:Toggle(L["Block Target Glow"], L["Forces Target Glow to be disabled for these frames"], 3)
-	config.args.disableFocusGlow = ACH:Toggle(L["Block Focus Glow"], L["Forces Focus Glow to be disabled for these frames"], 4)
+	config.args.disableMouseoverGlow = ACH:Toggle(L["Block Mouseover Glow"], L["Forces Mouseover Glow to be disabled for these frames"], 3)
+	config.args.disableTargetGlow = ACH:Toggle(L["Block Target Glow"], L["Forces Target Glow to be disabled for these frames"], 4)
+	config.args.disableFocusGlow = ACH:Toggle(L["Block Focus Glow"], L["Forces Focus Glow to be disabled for these frames"], 5)
 
 	if groupName ~= 'tank' and groupName ~= 'assist' then
-		config.args.hideonnpc = ACH:Toggle(L["Text Toggle On NPC"], L["Power text will be hidden on NPC targets, in addition the name text will be repositioned to the power texts anchor point."], 5, nil, nil, nil, function() return E.db.unitframe.units[groupName].power.hideonnpc end, function(_, value) E.db.unitframe.units[groupName].power.hideonnpc = value updateFunc(UF, groupName, numUnits) end)
+		config.args.hideonnpc = ACH:Toggle(L["Text Toggle On NPC"], L["Power text will be hidden on NPC targets, in addition the name text will be repositioned to the power texts anchor point."], 6, nil, nil, nil, function() return E.db.unitframe.units[groupName].power.hideonnpc end, function(_, value) E.db.unitframe.units[groupName].power.hideonnpc = value updateFunc(UF, groupName, numUnits) end)
 	end
 
 	if groupName ~= 'party' and groupName ~= 'assist' and groupName ~= 'tank' and not strmatch(groupName, '^raid') then
-		config.args.smartAuraPosition = ACH:Select(L["Smart Aura Position"], L["Will show Buffs in the Debuff position when there are no Debuffs active, or vice versa."], 6, C.Values.SmartAuraPositions)
+		config.args.smartAuraPosition = ACH:Select(L["Smart Aura Position"], L["Will show Buffs in the Debuff position when there are no Debuffs active, or vice versa."], 2, C.Values.SmartAuraPositions)
 	end
 
 	if groupName == 'arena' then
-		config.args.pvpSpecIcon = ACH:Toggle(L["Spec Icon"], L["Display icon on arena frame indicating the units talent specialization or the units faction if inside a battleground."], 5, nil, nil, nil, nil, nil, function() return E.db.unitframe.units[groupName].orientation == 'MIDDLE' end)
+		config.args.pvpSpecIcon = ACH:Toggle(L["Spec Icon"], L["Display icon on arena frame indicating the units talent specialization or the units faction if inside a battleground."], 6, nil, nil, nil, nil, nil, function() return E.db.unitframe.units[groupName].orientation == 'MIDDLE' end)
 	else
-		config.args.threatStyle = ACH:Select(L["Threat Display Mode"], nil, 7, threatValues)
+		config.args.threatGroup = ACH:Group(L["Threat"], nil, 50)
+		config.args.threatGroup.args.threatStyle = ACH:Select(L["Display Mode"], nil, 1, threatValues)
+		config.args.threatGroup.args.threatPrimary = ACH:Toggle(L["Primary Unit"], L["Requires the unit to be the primary target to display."], 2)
+		config.args.threatGroup.inline = true
+
+		if groupName == 'target' or groupName == 'focus' then
+			config.args.threatGroup.args.threatPlayer = ACH:Toggle(L["My Threat"], L["Threat similar to Blizzard, which displays your threat from the unit."], 3)
+		end
 	end
 
-	config.args.positionsGroup = ACH:Group(L["Size and Positions"], nil, 100, nil, nil, function(info, value) E.db.unitframe.units[groupName][info[#info]] = value updateFunc(UF, groupName, numUnits) end)
-	config.args.positionsGroup.inline = true
-	config.args.positionsGroup.args.width = ACH:Range(L["Width"], nil, 1, { min = 40, max = 1000, step = 1 })
+	config.args.positionsGroup = ACH:Group(L["Size and Positions"], nil, 200, nil, nil, function(info, value) E.db.unitframe.units[groupName][info[#info]] = value updateFunc(UF, groupName, numUnits) end)
+	config.args.positionsGroup.args.width = ACH:Range(L["Width"], nil, 1, { min = 15, max = 1000, step = 1 })
 	config.args.positionsGroup.args.height = ACH:Range(L["Height"], nil, 2, { min = 5, max = 500, step = 1 })
 
 	if groupName == 'party' or strmatch(groupName, '^raid') then
@@ -987,14 +999,12 @@ local function GetOptionsTable_GeneralGroup(updateFunc, groupName, numUnits)
 		config.args.positionsGroup.args.verticalSpacing = ACH:Range(L["Vertical Spacing"], nil, 10, spacingNormal)
 		config.args.positionsGroup.args.groupSpacing = ACH:Range(L["Group Spacing"], L["Additional spacing between each individual group."], 11, spacingNormal, nil, nil, nil, nil, groupName == 'party')
 
-		config.args.visibilityGroup = ACH:Group(L["Visibility"], nil, 200, nil, nil, function(info, value) E.db.unitframe.units[groupName][info[#info]] = value updateFunc(UF, groupName, numUnits) end)
-		config.args.visibilityGroup.inline = true
+		config.args.visibilityGroup = ACH:Group(L["Visibility"], nil, 100, nil, nil, function(info, value) E.db.unitframe.units[groupName][info[#info]] = value updateFunc(UF, groupName, numUnits) end)
 		config.args.visibilityGroup.args.showPlayer = ACH:Toggle(L["Display Player"], L["When true, the header includes the player when not in a raid."], 0)
 		config.args.visibilityGroup.args.defaults = ACH:Execute(L["Restore Defaults"], function() return P.unitframe.units[groupName].visibility end, 1, function() E.db.unitframe.units[groupName].visibility = P.unitframe.units[groupName].visibility updateFunc(UF, groupName, numUnits) end, nil, true)
 		config.args.visibilityGroup.args.visibility = ACH:Input(L["Visibility"], L["VISIBILITY_DESC"], 2, nil, 'full')
 
 		config.args.sortingGroup = ACH:Group(L["Grouping & Sorting"], nil, 300, nil, nil, function(info, value) E.db.unitframe.units[groupName][info[#info]] = value updateFunc(UF, groupName, numUnits) end)
-		config.args.sortingGroup.inline = true
 		config.args.sortingGroup.args.raidWideSorting = ACH:Toggle(L["Raid-Wide Sorting"], L["Enabling this allows raid-wide sorting however you will not be able to distinguish between groups."], 1, nil, nil, nil, nil, nil, nil, groupName == 'party')
 		config.args.sortingGroup.args.invertGroupingOrder = ACH:Toggle(L["Invert Grouping Order"], L["Enabling this inverts the grouping order when the raid is not full, this will reverse the direction it starts from."], 2, nil, nil, nil, nil, nil, nil, function() return not E.db.unitframe.units[groupName].raidWideSorting end)
 		config.args.sortingGroup.args.startFromCenter = ACH:Toggle(L["Start Near Center"], L["The initial group will start near the center and grow out."], 3, nil, nil, nil, nil, nil, nil, function() return groupName ~= 'party' and not E.db.unitframe.units[groupName].raidWideSorting end)
@@ -1002,19 +1012,20 @@ local function GetOptionsTable_GeneralGroup(updateFunc, groupName, numUnits)
 		config.args.sortingGroup.args.sortDir = ACH:Select(L["Sort Direction"], nil, 5, { ASC = L["Ascending"], DESC = L["Descending"] })
 		config.args.sortingGroup.args.sortMethod = ACH:Select(L["Sort Method"], nil, 6, { NAME = L["Name"], INDEX = L["Index"] }, nil, nil, nil, nil, nil, function() return E.db.unitframe.units[groupName].groupBy == 'INDEX' or E.db.unitframe.units[groupName].groupBy == 'NAME' end)
 
-		config.args.sortingGroup.args.roleSetup = ACH:Group(L["Role Order"], nil, 7, nil, nil, nil, nil, function() return E.db.unitframe.units[groupName].groupBy ~= 'ROLE' end)
-		config.args.sortingGroup.args.roleSetup.inline = true
+		config.args.sortingGroup.args.roleSetup = ACH:Group(L["Role Order"], nil, 400, nil, nil, nil, nil, function() return E.db.unitframe.units[groupName].groupBy ~= 'ROLE' end)
 		config.args.sortingGroup.args.roleSetup.args.ROLE1 = ACH:Select(' ', nil, 1, roles)
 		config.args.sortingGroup.args.roleSetup.args.ROLE2 = ACH:Select(' ', nil, 2, roles)
 		config.args.sortingGroup.args.roleSetup.args.ROLE3 = ACH:Select(' ', nil, 3, roles)
+		config.args.sortingGroup.args.roleSetup.inline = true
 
-		config.args.sortingGroup.args.classSetup = ACH:Group(L["Class Order"], nil, 7, nil, nil, nil, nil, function() return E.db.unitframe.units[groupName].groupBy ~= 'CLASS' end)
+		config.args.sortingGroup.args.classSetup = ACH:Group(L["Class Order"], nil, 500, nil, nil, nil, nil, function() return E.db.unitframe.units[groupName].groupBy ~= 'CLASS' end)
 		config.args.sortingGroup.args.classSetup.inline = true
 
 		for i = 1, NUM_CLASSES do
 			config.args.sortingGroup.args.classSetup.args['CLASS'..i] = ACH:Select(' ', nil, i, classTable)
 		end
 	else
+		config.args.positionsGroup.inline = true -- inline for others
 		config.args.positionsGroup.args.width.set = function(info, value) if E.db.unitframe.units[groupName].castbar and E.db.unitframe.units[groupName].castbar.width == E.db.unitframe.units[groupName][info[#info]] then E.db.unitframe.units[groupName].castbar.width = value end E.db.unitframe.units[groupName][info[#info]] = value updateFunc(UF, groupName, numUnits) end
 
 		if groupName == 'boss' or groupName == 'arena' then
@@ -1423,7 +1434,10 @@ local function GetUnitSettings(unitType, updateFunc, numUnits)
 			group.args.anchorPoint = ACH:Select(L["Position"], nil, 5, C.Values.AllPoints)
 			group.args.xOffset = ACH:Range(L["X-Offset"], nil, 6, { min = -500, max = 500, step = 1 })
 			group.args.yOffset = ACH:Range(L["Y-Offset"], nil, 7, { min = -500, max = 500, step = 1 })
-			group.args.threatStyle = ACH:Select(L["Threat Display Mode"], nil, 8, threatValues)
+
+			group.args.threatGroup = ACH:Group(L["Threat"], nil, 20)
+			group.args.threatGroup.args.threatStyle = ACH:Select(L["Display Mode"], nil, 1, threatValues)
+			group.args.threatGroup.args.threatPrimary = ACH:Toggle(L["Primary Unit"], L["Requires the unit to be the primary target to display."], 2)
 
 			for subElement in pairs(defaults[element]) do
 				if subElement == 'colorPetByUnitClass' then
diff --git a/ElvUI_Options/ElvUI_Options_Classic.toc b/ElvUI_Options/ElvUI_Options_Classic.toc
index 9663afbab0..005fcdfaa1 100644
--- a/ElvUI_Options/ElvUI_Options_Classic.toc
+++ b/ElvUI_Options/ElvUI_Options_Classic.toc
@@ -2,7 +2,7 @@
 ## Notes: Powers the configuration window.|n|cffff3333Does not store any profile data.|r
 ## Author: Elv, Simpy
 ## Version: @project-version@
-## Interface: 11501
+## Interface: 11502
 ## RequiredDeps: ElvUI
 ## LoadOnDemand: 1
 
diff --git a/ElvUI_Options/Locales/deDE.lua b/ElvUI_Options/Locales/deDE.lua
index 90d1eb1ec9..b74a5c68fd 100644
--- a/ElvUI_Options/Locales/deDE.lua
+++ b/ElvUI_Options/Locales/deDE.lua
@@ -16,6 +16,10 @@ L["LEFT"] = "Links"
 L["RIGHT"] = "Rechts"
 L["TOP"] = "Oben"
 
+L["Primary Unit"] = true
+L["Requires the unit to be the primary target to display."] = true
+L["Pet Specific"] = true
+L["Use the profile specific filter Aura Indicator (Pet) instead of the global filter Aura Indicator."] = true
 L["%s and then %s"] = "%s und dann %s"
 L["24-Hour Time"] = "24-Stunden Format"
 L["2D"] = "2D"
@@ -1702,7 +1706,7 @@ L["This will pin the voice buttons to the chat's tab panel. Unchecking it will c
 L["This will reset the contents of this filter back to default. Any spell you have added to this filter will be removed."] = "Dieses wird den Inhalt des Filters auf Standard zurücksetzen. Jeder Zauber den du zum Filter hinzugefügt hast wird gelöscht."
 L["This works like a macro, you can run different situations to get the actionbar to page differently.\n Example: '[combat] 2;'"] = "Dies funktioniert wie ein Makro. Sie können verschiedene Situationen ausführen, um die Aktionsleiste unterschiedlich anzuzeigen.\n Beispiel: '[combat] 2;'"
 L["This works like a macro, you can run different situations to get the actionbar to show/hide differently.\n Example: '[combat] show;hide'"] = "Dieses funktioniert wie ein Makro, du kannst verschiedene Situationen verwenden um die Aktionsleiste zu zeigen/verstecken.\n Beispiel: '[combat] show;hide'"
-L["Threat Display Mode"] = "Bedrohungs Anzeigemodus"
+L["Display Mode"] = "Anzeigemodus"
 L["Threat"] = "Bedrohung"
 L["Threshold (in minutes) before text is shown in the HH:MM format. Set to -1 to never change to this format."] = "Schwellenwert (in Minuten) bevor der Text in MM:SS Format angezeigt wird. Setze auf -1 um niemals das Format zu ändern."
 L["Threshold (in seconds) before text is shown in the MM:SS format. Set to -1 to never change to this format."] = "Schwellenwert (in Sekunden) bevor der Text in MM:SS Format angezeigt wird. Setze auf -1 um niemals das Format zu ändern."
diff --git a/ElvUI_Options/Locales/enUS.lua b/ElvUI_Options/Locales/enUS.lua
index 894ff4fd65..dadee9c08c 100644
--- a/ElvUI_Options/Locales/enUS.lua
+++ b/ElvUI_Options/Locales/enUS.lua
@@ -16,6 +16,10 @@ L["LEFT"] = true
 L["RIGHT"] = true
 L["TOP"] = true
 
+L["Primary Unit"] = true
+L["Requires the unit to be the primary target to display."] = true
+L["Pet Specific"] = true
+L["Use the profile specific filter Aura Indicator (Pet) instead of the global filter Aura Indicator."] = true
 L["%s and then %s"] = true
 L["24-Hour Time"] = true
 L["2D"] = true
@@ -1702,7 +1706,7 @@ L["This will pin the voice buttons to the chat's tab panel. Unchecking it will c
 L["This will reset the contents of this filter back to default. Any spell you have added to this filter will be removed."] = true
 L["This works like a macro, you can run different situations to get the actionbar to page differently.\n Example: '[combat] 2;'"] = true
 L["This works like a macro, you can run different situations to get the actionbar to show/hide differently.\n Example: '[combat] show;hide'"] = true
-L["Threat Display Mode"] = true
+L["Display Mode"] = true
 L["Threat"] = true
 L["Threshold (in minutes) before text is shown in the HH:MM format. Set to -1 to never change to this format."] = true
 L["Threshold (in seconds) before text is shown in the MM:SS format. Set to -1 to never change to this format."] = true
diff --git a/ElvUI_Options/Locales/esMX.lua b/ElvUI_Options/Locales/esMX.lua
index 897d07436f..85da177639 100644
--- a/ElvUI_Options/Locales/esMX.lua
+++ b/ElvUI_Options/Locales/esMX.lua
@@ -16,6 +16,10 @@ L["LEFT"] = true
 L["RIGHT"] = true
 L["TOP"] = true
 
+L["Primary Unit"] = "Unidad primaria"
+L["Requires the unit to be the primary target to display."] = "Requiere que la unidad sea el objetivo principal a mostrar."
+L["Pet Specific"] = "Específico para Mascotas"
+L["Use the profile specific filter Aura Indicator (Pet) instead of the global filter Aura Indicator."] = "Utilice el filtro específico del perfil Indicador de Aura (Mascota) en lugar del filtro global Indicador de Aura."
 L["%s and then %s"] = "%s y entonces %s"
 L["24-Hour Time"] = "Tiempo de 24 horas"
 L["2D"] = "2D"
@@ -524,7 +528,7 @@ L["Display messages from Guild and Whisper on AFK screen.\nThis chat can be drag
 L["Display minimap panels below the minimap, used for datatexts."] = "Muestra los paneles del minimapa debajo del minimapa, usado para los textos de datos."
 L["Display player titles."] = "Mostrar los títulos de los jugadores"
 L["Display Player"] = "Mostrar Jugador"
-L["Display Style"] = true
+L["Display Style"] = "Estilo de visualización"
 L["Display Target"] = "Mostrar Objetivo"
 L["Display Target's Aura Duration, when there is no CD displaying."] = true
 L["Display Text"] = "Mostrar Texto"
@@ -537,8 +541,8 @@ L["Display the target of current cast."] = true
 L["Display the unit name who interrupted a spell on the castbar. You should increase the Time to Hold to show properly."] = true
 L["Display the unit role in the tooltip."] = true
 L["Display tick marks on the castbar for channelled spells. This will adjust automatically for spells like Drain Soul and add additional ticks based on haste."] = "Muestra las marcas de cada tick en la barra de lanzamiento para los hechizos canalizados. Esto se ajustará automáticamente con base en el hechizo y la celeridad."
-L["Display Types"] = true
-L["Displayed Currency"] = true
+L["Display Types"] = "Tipos de visualización"
+L["Displayed Currency"] = "Moneda mostrada"
 L["Displays a detailed report of every item sold when enabled."] = true
 L["Displays item info on center of item."] = true
 L["Displays item level on equippable items."] = true
@@ -1294,7 +1298,7 @@ L["PROFESSIONS_CRAFTING"] = "Fabricación"
 L["PROFESSIONS_FISHING"] = "Pesca"
 L["Profile imported successfully!"] = true
 L["Profile Name"] = true
-L["Profile Specific"] = true
+L["Profile Specific"] = "Perfil Específico"
 L["Profile"] = "Perfile"
 L["Profiles"] = "Perfiles"
 L["Progress Bar"] = true
@@ -1703,7 +1707,7 @@ L["This will pin the voice buttons to the chat's tab panel. Unchecking it will c
 L["This will reset the contents of this filter back to default. Any spell you have added to this filter will be removed."] = true
 L["This works like a macro, you can run different situations to get the actionbar to page differently.\n Example: '[combat] 2;'"] = true
 L["This works like a macro, you can run different situations to get the actionbar to show/hide differently.\n Example: '[combat] show;hide'"] = true
-L["Threat Display Mode"] = "Modo de Despliegue de Amenaza"
+L["Display Mode"] = "Modo de Visualización"
 L["Threat"] = "Amenaza"
 L["Threshold (in minutes) before text is shown in the HH:MM format. Set to -1 to never change to this format."] = true
 L["Threshold (in seconds) before text is shown in the MM:SS format. Set to -1 to never change to this format."] = true
@@ -1809,7 +1813,7 @@ L["Use Shift+LeftClick to toggle between friendly or enemy or normal state. Norm
 L["Use Static Position"] = true
 L["Use Subzone Names"] = true
 L["Use the custom backdrop color instead of a multiple of the main color."] = true
-L["Use the profile specific filter Aura Indicator (Profile) instead of the global filter Aura Indicator."] = true
+L["Use the profile specific filter Aura Indicator (Profile) instead of the global filter Aura Indicator."] = "Utilice el filtro específico del perfil Indicador de Aura (Perfil) en lugar del filtro global Indicador de Aura."
 L["Use thin borders on certain nameplate elements."] = true
 L["Use thin borders on certain unitframe elements."] = true
 L["Use this backdrop color for units that are dead or ghosts."] = true
diff --git a/ElvUI_Options/Locales/frFR.lua b/ElvUI_Options/Locales/frFR.lua
index a0fddda268..220202d924 100644
--- a/ElvUI_Options/Locales/frFR.lua
+++ b/ElvUI_Options/Locales/frFR.lua
@@ -16,6 +16,10 @@ L["LEFT"] = "GAUCHE"
 L["RIGHT"] = "DROITE"
 L["TOP"] = "HAUT"
 
+L["Primary Unit"] = true
+L["Requires the unit to be the primary target to display."] = true
+L["Pet Specific"] = true
+L["Use the profile specific filter Aura Indicator (Pet) instead of the global filter Aura Indicator."] = true
 L["%s and then %s"] = "%s et alors %s"
 L["24-Hour Time"] = "Mode 24 Heures"
 L["2D"] = true
@@ -1700,7 +1704,7 @@ L["This will pin the voice buttons to the chat's tab panel. Unchecking it will c
 L["This will reset the contents of this filter back to default. Any spell you have added to this filter will be removed."] = "Cela réinitialisera le contenu de ce filtre aux valeurs par défaut. Tous les sorts que vous avez ajoutés à ce filtre seront supprimés."
 L["This works like a macro, you can run different situations to get the actionbar to page differently.\n Example: '[combat] 2;'"] = "Ceci fonctionne comme une macro, vous pouvez exécuter différentes situations pour faire défiler la barre d'action différemment.\n Exemple : '[combat] 2;'"
 L["This works like a macro, you can run different situations to get the actionbar to show/hide differently.\n Example: '[combat] show;hide'"] = "Ceci fonctionne comme une macro, vous pouvez exécuter différentes situations pour faire afficher/masquer la barre d'action différemment.\n Exemple : '[combat] show;hide'"
-L["Threat Display Mode"] = "Affichage du Mode de Menace."
+L["Display Mode"] = "Mode d'affichage"
 L["Threat"] = "Menace"
 L["Threshold (in minutes) before text is shown in the HH:MM format. Set to -1 to never change to this format."] = "Seuil (en minutes) avant que le texte s'affiche au format HH:MM. Mettez -1 pour ne jamais changer ce format."
 L["Threshold (in seconds) before text is shown in the MM:SS format. Set to -1 to never change to this format."] = "Seuil (en secondes) avant que le texte s'affiche au format MM:SS. Mettez -1 pour ne jamais changer ce format."
diff --git a/ElvUI_Options/Locales/itIT.lua b/ElvUI_Options/Locales/itIT.lua
index 099adf926a..54dff4a31a 100644
--- a/ElvUI_Options/Locales/itIT.lua
+++ b/ElvUI_Options/Locales/itIT.lua
@@ -16,6 +16,10 @@ L["LEFT"] = true
 L["RIGHT"] = true
 L["TOP"] = true
 
+L["Primary Unit"] = true
+L["Requires the unit to be the primary target to display."] = true
+L["Pet Specific"] = true
+L["Use the profile specific filter Aura Indicator (Pet) instead of the global filter Aura Indicator."] = true
 L["%s and then %s"] = true
 L["24-Hour Time"] = true
 L["2D"] = true
@@ -1702,7 +1706,7 @@ L["This will pin the voice buttons to the chat's tab panel. Unchecking it will c
 L["This will reset the contents of this filter back to default. Any spell you have added to this filter will be removed."] = true
 L["This works like a macro, you can run different situations to get the actionbar to page differently.\n Example: '[combat] 2;'"] = true
 L["This works like a macro, you can run different situations to get the actionbar to show/hide differently.\n Example: '[combat] show;hide'"] = true
-L["Threat Display Mode"] = "Modalità Visualizzazione Minaccia"
+L["Display Mode"] = "Modalità Visualizzazione"
 L["Threat"] = "Minaccia"
 L["Threshold (in minutes) before text is shown in the HH:MM format. Set to -1 to never change to this format."] = true
 L["Threshold (in seconds) before text is shown in the MM:SS format. Set to -1 to never change to this format."] = true
diff --git a/ElvUI_Options/Locales/koKR.lua b/ElvUI_Options/Locales/koKR.lua
index ce4566eff7..e0f79d7ede 100644
--- a/ElvUI_Options/Locales/koKR.lua
+++ b/ElvUI_Options/Locales/koKR.lua
@@ -16,6 +16,10 @@ L["LEFT"] = "왼쪽"
 L["RIGHT"] = "오른쪽"
 L["TOP"] = "위쪽"
 
+L["Primary Unit"] = true
+L["Requires the unit to be the primary target to display."] = true
+L["Pet Specific"] = true
+L["Use the profile specific filter Aura Indicator (Pet) instead of the global filter Aura Indicator."] = true
 L["%s and then %s"] = "%s 이후 %s"
 L["24-Hour Time"] = "24시제로 표시"
 L["2D"] = "이미지"
@@ -1726,7 +1730,7 @@ L["This will pin the voice buttons to the chat's tab panel. Unchecking it will c
 L["This will reset the contents of this filter back to default. Any spell you have added to this filter will be removed."] = "필터의 내용이 기본값으로 재설정 됩니다. 이 필터에 추가한 모든 주문은 제거됩니다."
 L["This works like a macro, you can run different situations to get the actionbar to page differently.\n Example: '[combat] 2;'"] = "이것은 매크로처럼 작동합니다. 다양한 상황을 실행하여 작업 표시줄을 다르게 페이지에 표시할 수 있습니다.\n 예: '[combat] 2;'"
 L["This works like a macro, you can run different situations to get the actionbar to show/hide differently.\n Example: '[combat] show;hide'"] = "이것은 매크로처럼 작동하여 상황(일반/전투 등)에 따라 작업 표시줄을 다르게 표시하거나 숨길 수 있습니다.\n예: '[combat] show;hide'"
-L["Threat Display Mode"] = "어그로획득 표시방법"
+L["Display Mode"] = "표시방법"
 L["Threat"] = "위협(어그로)"
 L["Threshold (in minutes) before text is shown in the HH:MM format. Set to -1 to never change to this format."] = "시:분 형식으로 보이기 시작하는 시간값(분)입니다. 이 형식으로 변경하지 않으려면 -1로 설정하십시오."
 L["Threshold (in seconds) before text is shown in the MM:SS format. Set to -1 to never change to this format."] = "분:초 형식으로 보이기 시작하는 시간값(초)입니다. 이 형식으로 변경하지 않으려면 -1로 설정하십시오."
diff --git a/ElvUI_Options/Locales/ptBR.lua b/ElvUI_Options/Locales/ptBR.lua
index 67daf875fc..014414d375 100644
--- a/ElvUI_Options/Locales/ptBR.lua
+++ b/ElvUI_Options/Locales/ptBR.lua
@@ -7,42 +7,46 @@ L["SHIFT"] = true
 L["NONE"] = true
 L["GROUP"] = true
 
-L["BOTTOM"] = true
-L["BOTTOMLEFT"] = true
-L["BOTTOMRIGHT"] = true
-L["TOPLEFT"] = true
-L["TOPRIGHT"] = true
-L["LEFT"] = true
-L["RIGHT"] = true
-L["TOP"] = true
+L["BOTTOM"] = "Abaixo"
+L["BOTTOMLEFT"] = "Canto Inferior Esquerdo"
+L["BOTTOMRIGHT"] = "Canto Inferior Direito"
+L["TOPLEFT"] = "Canto Superior Esquerdo"
+L["TOPRIGHT"] = "Canto Superior Direito"
+L["LEFT"] = "Esquerda"
+L["RIGHT"] = "Direita"
+L["TOP"] = "Acima"
 
+L["Primary Unit"] = "Unidade Primária"
+L["Requires the unit to be the primary target to display."] = "Requer que a unidade seja o alvo primario para ser exibido."
+L["Pet Specific"] = "Especifico para Mascote"
+L["Use the profile specific filter Aura Indicator (Pet) instead of the global filter Aura Indicator."] = "Use o filtro especifico de perfil Aura Indicator (Pet) ao invés do filtro global Aura Indicator."
 L["%s and then %s"] = "%s e depois %s"
 L["24-Hour Time"] = "24 horas"
 L["2D"] = "2D"
 L["3D"] = "3D"
-L["Abbreviate Name"] = true
-L["Above Chat (Inside)"] = true
+L["Abbreviate Name"] = "Abreviar Nome"
+L["Above Chat (Inside)"] = "Acima do Bate-papo (Dentro)"
 L["Above Chat"] = "Acima do Bate-papo"
 L["Above"] = "Acima"
-L["Absorb Style"] = true
+L["Absorb Style"] = "Estilo de Absorção"
 L["Absorbs"] = "Absorções"
 L["Accept Invites"] = "Aceitar Convites"
 L["ACHIEVEMENTS"] = "Conquistas"
-L["Action Button Glow"] = true
+L["Action Button Glow"] = "Brilho do Botão de Ação"
 L["Action Paging"] = "Paginação da Barra de Ação"
 L["ActionBars"] = "Barras de Ações"
 L["Actions"] = "Ações"
 L["Add / Remove"] = "Adicionar / Remover"
-L["Add a Item Name or ID to the list."] = true
+L["Add a Item Name or ID to the list."] = "Adicionar o Nome do Item ou ID para a lista."
 L["Add a Name or NPC ID to the list."] = "Adicionar um Nome ou ID do NPC para a lista."
 L["Add a spell to the filter."] = "Adicionar um feitiço ao filtro."
-L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true
+L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = "Adicione um Item arrastando-o, shift+clique esquerdo, ou digitando o ID de Item neste campo."
 L["Add Currency by ID"] = "Adicionar ID de Moeda"
-L["Add Currency"] = true
+L["Add Currency"] = "Adicionar Moeda"
 L["Add Current"] = "Adicionar Atual"
 L["Add Instance ID"] = "Adicionar ID da Instância"
-L["Add Item Name or ID"] = true
-L["Add Item"] = true
+L["Add Item Name or ID"] = "Adicionar Nome de Item ou ID"
+L["Add Item"] = "Adicionar Item"
 L["Add Map ID"] = "Adicionar ID do Mapa"
 L["Add Name or NPC ID"] = "Adicionar Nome ou ID do NPC"
 L["Add Regular Filter"] = "Adicionar Filtro Comum"
@@ -50,51 +54,51 @@ L["Add Special Filter"] = "Adicionar Filtro Especial"
 L["Add Spell ID or Name"] = "Adicionar ID do Feitiço ou Nome"
 L["Add SpellID"] = "Adicionar ID do Feitiço"
 L["Add Subzone Name"] = "Adicionar Nome de Subzona"
-L["Add Texture"] = true
+L["Add Texture"] = "Adicionar Textura"
 L["Add Zone Name"] = "Adicionar Nome de Zona"
-L["Add"] = true
+L["Add"] = "Adicionar"
 L["Added Instance ID: %s"] = "Adicionado ID da Instância: %s"
 L["Added Map ID: %s"] = "Adicionado ID do Mapa: %s"
 L["Added Subzone Name: %s"] = "Adicionado ID da Subzona: %s"
 L["Added Zone Name: %s"] = "Adicionado ID da Zona: %s"
 L["Additional Power Prediction Color"] = "Cor da Predição de Poder"
-L["Additional Power"] = true
+L["Additional Power"] = "Poder Adicional"
 L["Additional spacing between each individual group."] = "Espaço adicional entre cada grupo individual"
-L["Additive Blend"] = true
+L["Additive Blend"] = "Mistura Aditiva"
 L["AddOn Manager"] = "Gerenciador de AddOn"
 L["Adds an arrow infront of the chat lines to copy the entire line."] = "Adiciona uma seta à frente as linhas do bate-papo para copiar a linha inteira."
-L["Adjust the height of your left chat panel."] = true
+L["Adjust the height of your left chat panel."] = "Ajuste a altura do seu painel esquerdo de bate-papo."
 L["Adjust the height of your right chat panel."] = "Ajuste a altura do seu painel direito de bate-papo."
-L["Adjust the scale of the minimap and also the pins. Eg: Quests, Resource nodes, Group members"] = true
+L["Adjust the scale of the minimap and also the pins. Eg: Quests, Resource nodes, Group members"] = "Ajuste a escala do minimapa e também os pinos. Ex: Missões, Nódulos de Recuros, Membros do Grupo"
 L["Adjust the size of the minimap."] = "Ajustar o tamanho do minimapa."
 L["Adjust the width of the bag frame."] = "Ajusta a largura do quadro das bolsas."
 L["Adjust the width of the bank frame."] = "Ajusta a largura do quadro do banco."
-L["Adjust the width of your left chat panel."] = true
+L["Adjust the width of your left chat panel."] = "Ajuste a largura do seu painel esquerdo de bate-papo."
 L["Adjust the width of your right chat panel."] = "Ajuste a largura do seu painel direito de bate-papo."
 L["ADVENTURE_MAP_TITLE"] = "Mapa de Patrulha"
 L["Alert Frames"] = "Alertas"
 L["Alerts"] = "Alertas"
-L["Alive"] = true
-L["Alliance"] = true
+L["Alive"] = "Vivo"
+L["Alliance"] = "Aliança"
 L["Allied Races"] = "Raças Aliadas"
 L["Allow Masque to handle the skinning of this element."] = "Permitir o Masque gerenciar as skins deste elemento."
 L["Allow newly learned spells to be automatically placed on an empty actionbar slot."] = "Permitir novos feitiços serem adicionados automaticamentes em uma Barra de Ações com slot vazio"
-L["Allow Sharing"] = true
+L["Allow Sharing"] = "Permitir Compartilhamento"
 L["Allows you to tie a stack count to an aura when you add it to the list, which allows the trigger to act when an aura reaches X number of stacks."] = "Permite você vincular uma contagem de stacks com uma aura quando você a adiciona para uma lista, no qual permite o gatilho agir quando uma aura chegar a um número X de stacks."
-L["Alpha channel is taken from the color option."] = true
-L["Alpha Fading"] = true
-L["Alpha Key"] = true
+L["Alpha channel is taken from the color option."] = "Canal de Transparência é obtido da opção de cor."
+L["Alpha Fading"] = "Desvanecimento de Transparência"
+L["Alpha Key"] = "Chave de Transparência"
 L["Alpha"] = "Transparência"
 L["ALT_KEY_TEXT"] = "ALT"
 L["Always Display"] = "Exibir sempre"
 L["Always Show Player"] = "Sempre Mostrar Jogador"
 L["Always Show Realm"] = "Sempre Mostrar Reino"
 L["Anchor Point"] = "Ponto de Fixação"
-L["Anchor"] = true
-L["Anima Diversion"] = true
+L["Anchor"] = "Âncora"
+L["Anima Diversion"] = "Desvio de Anima"
 L["Announce Interrupts"] = "Anunciar Interrupções"
 L["Announce when you interrupt a spell to the specified chat channel."] = "Anunciar quando interromper um feitiço para o canal de bate-papo especificado."
-L["Another Players Pet"] = true
+L["Another Players Pet"] = "Mascote de Outros Jogadores"
 L["Any"] = "Qualquer"
 L["Applies the font and font size settings throughout the entire user interface. Note: Some font size settings will be skipped due to them having a smaller font size by default."] = "Aplica as configurações de fonte e tamanho de fonte para toda a interface do usuário. Nota: Algumas configurações de fontes serão puladas por terem uma fonte menor por padrão."
 L["Apply Font To All"] = "Aplicar Fonte para Todos"
@@ -102,7 +106,7 @@ L["Apply this filter if a buff has remaining time greater than this. Set to zero
 L["Apply this filter if a buff has remaining time less than this. Set to zero to disable."] = "Aplicar este Filtro caso um buff tenha um tempo restante menor do que isto. Coloque zero para desabilitar"
 L["Apply this filter if a debuff has remaining time greater than this. Set to zero to disable."] = "Aplicar este Filtro caso um debuff tenha um tempo restante maior do que isto. Coloque zero para desabilitar"
 L["Apply this filter if a debuff has remaining time less than this. Set to zero to disable."] = "Aplicar este Filtro caso um debuff tenha um tempo restante menor do que isto. Coloque zero para desabilitar"
-L["Apply To All"] = true
+L["Apply To All"] = "Aplicar a Todos"
 L["Archaeology Frame"] = "Arqueologia"
 L["Are you sure you want to reset ActionBars settings?"] = "Tem certeza que deseja resetar as configurações das Barra de Ações?"
 L["Are you sure you want to reset Auras settings?"] = "Tem certeza que deseja resetar as configurações das Auras?"
@@ -115,32 +119,32 @@ L["Are you sure you want to reset General settings?"] = "Tem certeza que deseja
 L["Are you sure you want to reset NamePlates settings?"] = "Tem certeza que deseja resetar as configurações das Placas de Informação?"
 L["Are you sure you want to reset Tooltip settings?"] = "Tem certeza que deseja resetar as configurações do Tooltip?"
 L["Are you sure you want to reset UnitFrames settings?"] = "Tem certeza que deseja resetar as configurações dos Quadros Informativos?"
-L["Arena Registrar"] = true
-L["Arrow Scale"] = true
-L["Arrow Spacing"] = true
-L["Arrow Texture"] = true
+L["Arena Registrar"] = "Registrador de Arena"
+L["Arrow Scale"] = "Escala da Flecha"
+L["Arrow Spacing"] = "Espaçamento da Flecha"
+L["Arrow Texture"] = "Textura da Flecha"
 L["Ascending or Descending order."] = "Ordem crescente ou decrescente."
 L["Ascending"] = "Ascendente"
-L["Assigned Icon"] = true
-L["Assist Frames"] = true
+L["Assigned Icon"] = "Ícone Atribuido"
+L["Assist Frames"] = "Quadros de Assistentes"
 L["Assist"] = "Assistente"
 L["At what point should the text be displayed. Set to -1 to disable."] = "Em qual ponto o texto deve ser mostrado. Defina como -1 para desabilitar."
 L["Attach Text To"] = "Anexar Texto ao"
 L["Attach To"] = "Anexar ao"
 L["Attempt to create URL links inside the chat."] = "Tentar criar links URL dentro do bate-papo."
 L["Attempt to support eyefinity/nvidia surround."] = "Tentar suportar surround do eyefinity/nvidia"
-L["Attempts to center UI elements in a 16:9 format for ultrawide monitors"] = true
-L["Auction House"] = true
+L["Attempts to center UI elements in a 16:9 format for ultrawide monitors"] = "Tenta centralizar elementos da IA em um formato 16:9 para monitores ultrawide"
+L["Auction House"] = "Casa de Leilões"
 L["AUCTIONS"] = "Leilões"
 L["Aura Filters"] = "Filtro de Auras"
-L["Aura Highlight"] = true
-L["Aura Indicator"] = true
+L["Aura Highlight"] = "Destaque de Aura"
+L["Aura Indicator"] = "Indicador de Aura"
 L["Auto Add New Spells"] = "Auto-adicionar novos feitiços"
 L["Auto Hide"] = "Auto-esconder"
 L["Auto Repair"] = "Reparar automaticamente"
-L["Auto Self Cast"] = true
-L["Auto Toggle"] = true
-L["Auto Track Reputation"] = true
+L["Auto Self Cast"] = "Autolançar em si"
+L["Auto Toggle"] = "Auto Ativar/Desativar"
+L["Auto Track Reputation"] = "Auto Rastrear Reputação"
 L["Auto-Close Pet Battle Log"] = "Auto-fechar Log da Batalha de Pets"
 L["Auto-Hide"] = "Auto-Esconder"
 L["Automatic"] = "Automático"
@@ -149,25 +153,25 @@ L["Automatically hide the objective frame during boss fights while you are runni
 L["Automatically hide the objective frame during boss or arena fights."] = "Automaticamente esconder o quadro de objetivo durante uma luta de boss ou arena"
 L["Automatically repair using the following method when visiting a merchant."] = "Reparar automaticamente usando o seguinte método ao visitar um vendedor."
 L["Automatically vendor gray items when visiting a vendor."] = "Vender itens cinzentos automaticamente quando visitar um vendedor"
-L["Automation"] = true
+L["Automation"] = "Automação"
 L["Available Tags"] = "Tags disponíveis"
-L["Azerite Essence"] = true
-L["Azerite"] = true
+L["Azerite Essence"] = "Essência de Azerita"
+L["Azerite"] = "Azerita"
 L["AZERITE_RESPEC_TITLE"] = "Reforjador de Azerita"
 L["Backdrop color of transparent frames"] = "Cor de fundo de Painéis transparentes"
 L["Backdrop Color"] = "Cor de fundo"
-L["Backdrop Faded"] = true
-L["Backdrop Settings"] = true
+L["Backdrop Faded"] = "Fundo Desvanecido"
+L["Backdrop Settings"] = "Configurações do Fundo"
 L["Backdrop Spacing"] = "Espaço do fundo"
-L["Backdrop Transparency"] = true
+L["Backdrop Transparency"] = "Transparência do Fundo"
 L["Backdrop"] = "Fundo"
-L["Background Glow"] = "Brilho do background"
-L["Backpack Only"] = true
+L["Background Glow"] = "Brilho do Fundo"
+L["Backpack Only"] = "Apenas a Mochila"
 L["Bad Color"] = "Cor ruim"
 L["Bad Scale"] = "Escala ruim"
-L["Bad Transition Color"] = "Cor ruim de transição"
-L["Bad Transition"] = true
-L["Bad"] = "Mau"
+L["Bad Transition Color"] = "Cor Ruim de Transição"
+L["Bad Transition"] = "Transição Ruim"
+L["Bad"] = "Ruim"
 L["Bag %d"] = "Bolsa %d"
 L["Bag Assignment"] = "Atribuição da Bolsa"
 L["Bag Spacing"] = "Espaçamentos da Bolsas"
@@ -183,112 +187,111 @@ L["Bank Only"] = "Apenas Banco"
 L["BALANCE_ENERGY_LUNAR"] = "Energia Lunar"
 L["BALANCE_ENERGY_SOLAR"] = "Energia Solar"
 L["Bar %s is used for stance or forms.\nYou will have to adjust paging to use this bar.\nAre you sure?"] = "A barra %s é usada para estâncias ou formas.\nVocê terá que ajustar a paginação para ver esta barra.\nTem certeza?"
-L["Bar %s is used for stance or forms.\nYou will have to adjust paging to use this bar.\nAre you sure?"] = true
 L["Bar Direction"] = "Direção da Barra"
-L["Bar Settings"] = true
+L["Bar Settings"] = "Configurações da Barra"
 L["BARBERSHOP"] = "Barbearia"
 L["Bars will transition smoothly."] = "Barras terão transição suave."
-L["Battlefield"] = true
+L["Battlefield"] = "Campo de Batalha"
 L["BATTLEFIELDS"] = "Campos de Batalha"
 L["Battleground Friendly"] = "Amigável no Campo de Batalha"
 L["Battleground Texts"] = "Textos do Campo de Batalha"
-L["Battlegrounds"] = true
+L["Battlegrounds"] = "Campos de Batalha"
 L["Begin a new row or column after this many auras."] = "Começar uma nova coluna ou linha depois dessa quantia de auras."
-L["Below Chat (Inside)"] = true
+L["Below Chat (Inside)"] = "Abaixo do Bate-papo (Dentro)"
 L["Below Chat"] = "Abaixo do Bate-papo"
 L["Below"] = "Abaixo"
 L["BG Map"] = "Mapa do CB"
-L["Bind on Equip/Use Text"] = true
+L["Bind on Equip/Use Text"] = "Texto de Vincular quando Equipado/Usado"
 L["BINDING_HEADER_RAID_TARGET"] = "Marcadores de Alvo"
 L["BINDING_HEADER_VOICE_CHAT"] = "Voz"
 L["BLACK_MARKET_AUCTION_HOUSE"] = "Casa de Leilões do Mercado Negro"
-L["Blacklist"] = "Lista negra"
-L["Blank Texture"] = true
-L["Blend Mode"] = true
-L["Blend"] = true
-L["Blizzard CVars"] = true
+L["Blacklist"] = "Lista de Bloqueamento"
+L["Blank Texture"] = "Textura Vazia"
+L["Blend Mode"] = "Modo de Mesclagem"
+L["Blend"] = "Mesclagem"
+L["Blizzard CVars"] = "CVars da Blizzard"
 L["Blizzard Style"] = "Estilo Blizzard"
 L["Blizzard"] = true
 L["BlizzUI Improvements"] = "Melhorias do BlizzUI"
 L["Block Combat Click"] = "Bloquear Clique no Combate"
 L["Block Combat Hover"] = "Bloquear Passar Cursor no Combate"
-L["Block Focus Glow"] = true
+L["Block Focus Glow"] = "Bloquear Brilho do Foco"
 L["Block Mouseover Glow"] = "Bloquear brilho ao passar o mouse sobre"
-L["Block Target Glow"] = "Bloquear brilho do alvo"
+L["Block Target Glow"] = "Bloquear Brilho do Alvo"
 L["Blocks all click events while in combat."] = "Bloquear todos os eventos com cliques enquanto em um combate."
 L["Blocks datatext tooltip from showing in combat."] = "Bloquear todos os Textos Informativos na Tooltip durante um combate."
 L["Bonus Reward Position"] = "Posição da Recompensa Bônus"
 L["Border Color"] = "Cor da borda"
 L["Border Glow"] = "Brilho de borda"
-L["Border Options"] = true
+L["Border Options"] = "Opções da Borda"
 L["Border"] = "Borda"
-L["Borders By Dispel"] = true
-L["Borders By Type"] = true
+L["Borders By Dispel"] = "Bordas por Dissipabilidade"
+L["Borders By Type"] = "Bordas por Tipo"
 L["Borders"] = "Bordas"
-L["Boss Mod Auras"] = true
-L["Both users will need this option enabled."] = true
+L["Boss Mod Auras"] = "Auras de Boss Mods"
+L["Both users will need this option enabled."] = "Ambos os usários tem que ter esta opção habilitada."
 L["Both"] = "Ambos"
 L["Bottom Left"] = "Painel inferior-esquerdo"
 L["Bottom Panel"] = "Painel Inferior"
 L["Bottom Right"] = "Painel inferior-direito"
 L["Bottom to Top"] = "De baixo para cima"
 L["Bottom"] = "Inferior"
-L["BUFFOPTIONS_LABEL"] = "Bônus e Debuffs"
-L["Buffs on Debuffs"] = true
-L["Button Flash"] = true
-L["Button Height"] = true
-L["Button Settings"] = true
-L["Button Size"] = "Tamanho do botão"
-L["Button Spacing"] = "Espaçamento do botão"
-L["Button Width"] = true
+L["BUFFOPTIONS_LABEL"] = "Bônus e Penalidades"
+L["Buffs on Debuffs"] = "Bônus em Penalidades"
+L["Button Flash"] = "Brilho do Botão"
+L["Button Height"] = "Altura do Botão"
+L["Button Settings"] = "Configurações do Botão"
+L["Button Size"] = "Tamanho do Botão"
+L["Button Spacing"] = "Espaçamento do Botão"
+L["Button Width"] = "Largura do Botão"
 L["Buttons Per Row"] = "Botões por linha"
 L["Buttons"] = "Botões"
 L["By Type"] = "Por tipo"
 L["Calendar Frame"] = "Calendário"
 L["Camera Distance Scale"] = "Escala de distância da câmera"
-L["Camera Spin"] = true
-L["Camera"] = true
-L["Can Attack"] = true
-L["Can Not Attack"] = true
-L["Cart / Flag / Orb / Assassin Bounty"] = "Cart / Bandeira / Orbe / Recompensa de Assassino"
+L["Camera Spin"] = "Giro da Câmera"
+L["Camera"] = "Câmera"
+L["Can Attack"] = "Pode Atacar"
+L["Can Not Attack"] = "Não pode Atacar"
+L["Cart / Flag / Orb / Assassin Bounty"] = "Carrinho / Bandeira / Orbe / Recompensa de Assassino"
 L["Cast Bar"] = "Barra de Lançamento"
 L["Cast Time Format"] = "Formato do Tempo de Lançamento"
-L["Casted by Player Only"] = true
+L["Casted by Player Only"] = "Lançado apenas por Jogador"
 L["Casting"] = "Lançando"
 L["Center"] = "Centro"
 L["CHALLENGE_MODE"] = "Modo Desafio"
 L["Change settings for the display of the location text that is on the minimap."] = "Alterar as configurações de exibição do texto de localização que está no minimapa."
 L["Change the alpha level of the frame."] = "Mudar o nível de transparência do quadro."
-L["Change the width and controls how big of an area on the screen will accept clicks to target unit."] = true
-L["Changelog"] = true
-L["Channel Alerts"] = true
+L["Change the width and controls how big of an area on the screen will accept clicks to target unit."] = "Mudar a largura e controla o quão grande a área na tela será para aceitar cliques na unidade"
+L["Changelog"] = "Mudanças"
+L["Channel Alerts"] = "Alertas de Canal"
 L["Channel Time Format"] = "Formato de tempo ao canalizar"
-L["Channel"] = true
+L["Channel"] = "Canal"
 L["CHANNELS"] = "Canais"
 L["Character Frame"] = "Personagem"
 L["Charge Cooldown Text"] = "Texto de Recarga de Cargas"
-L["Charge Draw Swipe"] = true
-L["Charged Combo Point"] = true
-L["Charging Rune Color"] = true
+L["Charge Draw Swipe"] = "Desenho de Deslize de Recarga"
+L["Charged Combo Point"] = "Ponto de Combo Carregado"
+L["Charging Rune Color"] = "Cor de Runa quando Carregando"
 L["Chat Bubble Names"] = "Nomes na Bolha de Bate-papo"
 L["Chat Bubbles Style"] = "Estilo dos Balões de Fala"
 L["Chat Bubbles"] = "Bolha de bate-papo"
 L["Chat EditBox Position"] = "Posição da caixa de edição do bate-papo"
 L["Chat Output"] = "Saída do Chat"
-L["Chat Panels"] = true
+L["Chat Panels"] = "Painéis de Bate-Papo"
 L["CHAT_MSG_EMOTE"] = "Expressão"
-L["Check Focus Cast"] = true
-L["Check Mouseover Cast"] = true
-L["Check Self Cast"] = true
+L["Check Focus Cast"] = "Checar Lançamento do Foco"
+L["Check Mouseover Cast"] = "Checar Lançamento do Mouse Passando"
+L["Check Self Cast"] = "Checar Autolançamento"
 L["Check these to only have the filter active in certain difficulties. If none are checked, it is active in all difficulties."] = "Cheque estes para ter o filtro apenas ativo em certas dificuldades. Se nenhum estiver checados, ficará ativo em todas as dificuldades."
-L["CheckBox Skin"] = true
+L["CheckBox Skin"] = "Modificação da Caixa de Seleção"
 L["CHI_POWER"] = "Chi"
 L["Choose Export Format"] = "Escolher Formato de exportação"
 L["Choose UIPARENT to prevent it from hiding with the unitframe."] = "Escolha UIParent para evitá-lo de esconder com o Quadro de Jogador"
 L["Choose What To Export"] = "Escolha o que exportar"
 L["Choose when you want the tooltip to show in combat. If a modifier is chosen, then you need to hold that down to show the tooltip."] = "Escolha quando você quiser que o Tooltip apareça em combate. Se um modificador for escolhido, então você precisará segurá-lo para que o Tooltip apareça."
 L["Choose when you want the tooltip to show. If a modifier is chosen, then you need to hold that down to show the tooltip."] = "Escolha quando você quiser que o Tooltip apareça. Se um modificador for escolhido, então você precisará segurá-lo para que o Tooltip apareça."
-L["Chromie Time Frame"] = true
+L["Chromie Time Frame"] = "Quadro do Tempo de Chromie"
 L["Clamp nameplates to the top of the screen when outside of view."] = "Empilhar Placas de identificação no topo da tela quando fora de vista"
 L["Clamp Nameplates"] = "Empilhar Placas de identificação"
 L["Class Backdrop"] = "Fundo por classe"
@@ -296,37 +299,37 @@ L["Class Castbars"] = "Barras de Lançamento da Classe"
 L["Class Color Mentions"] = "Menções de Cor de Classe"
 L["Class Color Override"] = "Sobrescrever Cor da Classe"
 L["Class Color Source"] = "Origem da Cor da Classe"
-L["Class Color"] = true
+L["Class Color"] = "Cor de Classe"
 L["Class Health"] = "Vida por Classe"
-L["Class Icon"] = true
-L["Class Order"] = true
+L["Class Icon"] = "Ícone de Classe"
+L["Class Order"] = "Ordem de Classe"
 L["Class Power"] = "Poder por classe"
 L["Class Resources"] = "Recursos de Classe"
 L["CLASS"] = "Classe"
 L["Classification"] = "Classificação"
-L["Clean Button"] = true
+L["Clean Button"] = "Botão Limpo"
 L["Clear Filter"] = "Limpar Filtro"
 L["Clear Search On Close"] = "Limpar Buscar ao Fechar"
 L["Click Through"] = "Clicar através"
 L["Clickable Height"] = "Altura Clicável"
 L["Clickable Size"] = "Tamanho Clicável"
 L["Clickable Width / Width"] = "Altura / Altura clicável"
-L["Cluster Backdrop"] = true
+L["Cluster Backdrop"] = "Agrupamento de Fundo"
 L["Coding:"] = "Codificação:"
 L["COLLECTIONS"] = "Coleções"
 L["Color all buffs that reduce the unit's incoming damage."] = "Colorir todos os bônus que reduzem o dano recebido pela unidade."
-L["Color aurabar debuffs by type."] = "Colorir Debuffs da barra de auras por tipo."
-L["Color Backdrop"] = true
-L["Color by Happiness"] = true
-L["Color By Spec"] = true
-L["Color by Unit Class"] = true
+L["Color aurabar debuffs by type."] = "Colorir Penalidades da barra de auras por tipo."
+L["Color Backdrop"] = "Colorir Fundo"
+L["Color by Happiness"] = "Colorir por Felicidade"
+L["Color By Spec"] = "Colorir por Especialização"
+L["Color by Unit Class"] = "Colorir por Classe da Unidade"
 L["Color by Value"] = "Colorir por Valor"
-L["Color castbar by the class of the unit's class."] = true
-L["Color castbar by the reaction of the unit to the player."] = true
+L["Color castbar by the class of the unit's class."] = "Colorir Barra de Lançamento pela classe da unidade."
+L["Color castbar by the reaction of the unit to the player."] = "Colorir Barra de Lançamento pela reação da unidade ao jogador."
 L["Color castbars by the class of player units."] = "Colorir Barra de Lançamento de unidades jogadoras"
 L["Color castbars by the reaction type of non-player units."] = "Colorir Barra de Lançamentos pelo tipo de reação de unidades não-jogadoras"
-L["Color Debuffs"] = true
-L["Color Enchants"] = true
+L["Color Debuffs"] = "Colorir Penalidades"
+L["Color Enchants"] = "Colorir Encantos"
 L["Color Gradient"] = "Gradiente de Cor"
 L["Color health by amount remaining."] = "Colorir a vida pela quantidade restante."
 L["Color health by classcolor or reaction."] = "Colorir a vida pela Cor da classe ou reação."
@@ -337,51 +340,51 @@ L["Color of the actionbutton when not usable."] = "Cor da Tecla de Ação quando
 L["Color of the actionbutton when out of power (Mana, Rage, Focus, Holy Power)."] = "Cor do botão de ação quando sem poder (Mana, Raiva, Foco, Poder Sagrado)."
 L["Color of the actionbutton when out of range."] = "Cor do botão de ação quando fora de alcance."
 L["Color of the actionbutton when usable."] = "Cor Tecla de Ação quando utilizável"
-L["Color of the Targets Aura time when expiring."] = true
-L["Color of the Targets Aura time."] = true
+L["Color of the Targets Aura time when expiring."] = "Cor da Aura do Alvo quando o tempo estiver acabando."
+L["Color of the Targets Aura time."] = "Cor do Tempo da Aura do Alvo"
 L["Color Override"] = "Sobrescrever Cor"
-L["Color Picker"] = true
+L["Color Picker"] = "Escolhedor de Cores"
 L["Color power by classcolor or reaction."] = "Colorir Poder pela Cor da classe ou reação."
 L["Color power by color selection."] = "Colorir Poder pela seleção de Cor"
-L["Color score based on Blizzards API."] = true
-L["Color Score"] = true
+L["Color score based on Blizzards API."] = "Colorir pontuação baseando na API da Blizzard."
+L["Color Score"] = "Colorir Pontuação"
 L["Color some texts use."] = "Cores que alguns textos usam."
 L["Color the health backdrop by class or reaction."] = "Colorir o fundo da vida pela Cor da classe ou reação."
 L["Color the unit healthbar if there is a debuff that can be dispelled by you."] = "Cor da barra de vida se existir um Debuff que você possa dissipar."
-L["Color tooltip border based on Item Quality."] = true
+L["Color tooltip border based on Item Quality."] = "Colorir borda da dica baseando na Qualidade do Item."
 L["Color Turtle Buffs"] = "Colorir bônus de Tartaruga"
-L["Color when at half of the Low Health Threshold"] = true
-L["Color when at Low Health Threshold"] = true
+L["Color when at half of the Low Health Threshold"] = "Colorir quando estiver na metade do Limite Baixo de Saúde"
+L["Color when at Low Health Threshold"] = "Colorir quando estiver no Limite Baixo de Saúde"
 L["Color when the text is about to expire."] = "Colorir do texto quando está quase a expirar."
 L["Color when the text is in the days format."] = "Colorir do texto quando está em formato de dias."
 L["Color when the text is in the hours format."] = "Colorir do texto quando está em formato de horas."
 L["Color when the text is in the minutes format."] = "Colorir do texto quando está em formato de minutos."
 L["Color when the text is in the seconds format."] = "Colorir do texto quando está em formato de segundos."
-L["Color when the text is using a modified timer rate."] = true
+L["Color when the text is using a modified timer rate."] = "Colorir quando o texto estiver usando uma taxa de modificação de tempo."
 L["COLOR"] = "Cor"
 L["Colored Icon"] = "Ícone Colorido"
 L["Coloring (Specific)"] = "Coloração (Específica)"
 L["Coloring"] = "Coloração"
-L["Colorize Selected Text"] = true
+L["Colorize Selected Text"] = "Colorir o Texto Selecionado"
 L["Colors the border according to the Quality of the Item."] = "Colorir as bordas de acordo com a Qualidade o Item."
 L["Colors the border according to the type of items assigned to the bag."] = "Colorir as bordas de acordo com o tipo de item assinalado para a bolsa."
 L["Colors"] = "Cores"
-L["Combat Font"] = true
+L["Combat Font"] = "Fonte de Combate"
 L["Combat Icon"] = "Ícone de Combate"
 L["Combat Override Key"] = "Botão de Sobrescrever Combate"
-L["Combat Repeat"] = true
+L["Combat Repeat"] = "Repetir Combate"
 L["COMBO_POINTS"] = "|4Ponto:Pontos; de Combo"
 L["COMMUNITIES"] = "Comunidades"
 L["Comparison Font Size"] = "Comparação de Tamanho de Fonte"
-L["Completed Quests Only"] = true
+L["Completed Quests Only"] = "Apenas Objetivos Completados"
 L["Completely hide the voice buttons."] = "Esconder completamente os botões de voz"
-L["Condensed (Spaced)"] = true
+L["Condensed (Spaced)"] = "Condensado (Espacionado)"
 L["Condensed"] = "Condensados"
-L["Conditions"] = true
+L["Conditions"] = "Condições"
 L["Configure Auras"] = "Configurar Auras"
-L["Connected"] = true
-L["Conscious"] = true
-L["Content"] = true
+L["Connected"] = "Conectado"
+L["Conscious"] = "Consciente"
+L["Content"] = "Contente"
 L["Contribution"] = "Contribuição"
 L["Control enemy nameplates toggling on or off when in combat."] = "Controla a Placa de identificação Inimiga mostrando/ocultando quando em combate."
 L["Control friendly nameplates toggling on or off when in combat."] = "Controla a Placa de identificação Aliada mostrando/ocultando quando em combate."
@@ -394,18 +397,18 @@ L["Cooldown Text"] = "Texto do Tempo de Recarga"
 L["Cooldowns"] = "Tempos de Recarga"
 L["Copy Chat Lines"] = "Copiar Linhas do Bate-papo"
 L["Copy From"] = "Copiar de"
-L["Copy Primary Texture"] = true
+L["Copy Primary Texture"] = "Copiar Textura Primária"
 L["Copy settings from %s. This will overwrite %s profile.\n\n Are you sure?"] = "Copiar configurações de %s. Isso irá sobrescrever o perfil %s.\n\n Tem certeza?"
 L["Copy settings from another unit."] = "Copiar configurações de outra unidade."
 L["Copy settings from"] = "Copiar configurações de"
 L["Core |cff1784d1ElvUI|r options."] = "Opções do núcleo do |cff1784d1ElvUI|r"
-L["Cosmetic"] = true
-L["Count Text"] = true
-L["Covenant Preview"] = true
-L["Covenant Renown"] = true
-L["Covenant Sanctum"] = true
-L["Craft"] = true
-L["Create a filter, once created a filter can be set inside the buffs/debuffs section of each unit."] = "Criar um filtro, uma vez criado o filtro pode ser definido dentro da seção dos bônus/Debuffs de cada unidade."
+L["Cosmetic"] = "Cosmético"
+L["Count Text"] = "Texto de Contagem"
+L["Covenant Preview"] = "Prévia de Pacto"
+L["Covenant Renown"] = "Renome do Pacto"
+L["Covenant Sanctum"] = "Santuário do Pacto"
+L["Craft"] = "Criar"
+L["Create a filter, once created a filter can be set inside the buffs/debuffs section of each unit."] = "Criar um filtro, uma vez criado o filtro pode ser definido dentro da seção dos bônus/penalidades de cada unidade."
 L["Create Custom Text"] = "Criar Texto Customizado"
 L["Create Filter"] = "Criar Filtro"
 L["Creature Type"] = "Tipo de Criatura"
@@ -423,84 +426,84 @@ L["Current Level"] = "Level Atual"
 L["Current Mount"] = "Montaria Atual"
 L["Current"] = "Atual"
 L["Curse Effect"] = "Efeito de maldição"
-L["Cursor Anchor Offset X"] = true
-L["Cursor Anchor Offset Y"] = true
-L["Cursor Anchor Type"] = true
-L["Cursor Anchor"] = true
+L["Cursor Anchor Offset X"] = "Deslocamento X da Âncora do Cursor"
+L["Cursor Anchor Offset Y"] = "Deslocamento Y da Âncora do Cursor"
+L["Cursor Anchor Type"] = "Tipo de Âncora do Cursor"
+L["Cursor Anchor"] = "Âncora do Cursor"
 L["CURSOR"] = true
 L["CURSOR_LEFT"] = "Esquerdo do cursor"
 L["CURSOR_RIGHT"] = "Direito do cursor"
-L["Custom Backdrop"] = true
+L["Custom Backdrop"] = "Fundo Customizado"
 L["Custom Color"] = "Cor Customizada"
 L["Custom Currency"] = "Moeda Customizada"
-L["Custom Dead Backdrop"] = true
+L["Custom Dead Backdrop"] = "Fundo Customizado de Morto"
 L["Custom Faction Colors"] = "Cor de Facções Customizadas"
-L["Custom Font"] = true
-L["Custom Glow"] = true
-L["Custom Label"] = true
-L["Custom Name"] = true
+L["Custom Font"] = "Fonte Customizada"
+L["Custom Glow"] = "Brilho Customizado"
+L["Custom Label"] = "Rótulo Customizado"
+L["Custom Name"] = "Nome Customizado"
 L["Custom Power Prediction Color"] = "Cor de Predição de Poder Customizada"
-L["Custom StatusBar"] = true
+L["Custom StatusBar"] = "Barra de Estado Customizada"
 L["Custom Texts"] = "Textos Personalizados"
 L["Custom Texture"] = "Textura Customizada"
 L["Custom Timestamp Color"] = "Cor de data/hora customizadas"
 L["CUSTOM"] = "Personalizado"
-L["Customization"] = true
-L["Cutaway Bars"] = true
+L["Customization"] = "Customização"
+L["Cutaway Bars"] = "Barras Cortadas"
 L["DAMAGER"] = "Dano"
 L["Darken Inactive"] = "Escurecer Inativos"
 L["DataBars"] = "Barra de Dados"
 L["Datatext Panel (Left)"] = "Painel de Textos Informativos (Esquerdo)"
 L["Datatext Panel (Right)"] = "Painel de Textos Informativos (Direito)"
-L["DataText Panels"] = true
+L["DataText Panels"] = "Painéis de Textos Informativos"
 L["DataTexts"] = "Textos Informativos"
 L["Days"] = "Dias"
-L["Dead or Ghost"] = true
+L["Dead or Ghost"] = "Morto ou Fantasma"
 L["DEATH_RECAP_TITLE"] = "Recapitular morte"
-L["Debuff Highlighting"] = "Destacar debuffs"
-L["Debuffs on Buffs"] = true
+L["Debuff Highlighting"] = "Destacar Penalidades"
+L["Debuffs on Buffs"] = "Penalidades em Bônus"
 L["Debug Tools"] = "Ferramentas de Depuração"
-L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them."
+L["DEBUG_DESC"] = "Desabilitar todos os addons (incluindo Plugins) exceto o ElvUI. Durante esta mesma seção, isto pode ser clicado para reativá-los."
 L["Decimal Length"] = "Tamanho do Decimal"
 L["Decode Text"] = "Decodificar Texto"
-L["Decode"] = true
+L["Decode"] = "Decodificar"
 L["Default Color"] = "Cor Padrão"
 L["Default Font"] = "Fonte Padrão"
 L["Default Settings"] = "Configurações Padrões"
 L["DEFAULT"] = "Padrão"
 L["Defines how the group is sorted."] = "Define como o grupo é organizado"
 L["Defines the sort order of the selected sort method."] = "Define a ordem de organização do método escolhido"
-L["Delay Alpha"] = true
+L["Delay Alpha"] = "Atraso de Transparência"
 L["Delete a created filter, you cannot delete pre-existing filters, only custom ones."] = "Excluir um filtro criado, você não pode excluir filtros pré-existentes, apenas aqueles personalizados."
 L["Delete Filter"] = "Apagar Filtro"
 L["Delete"] = "Excluir"
 L["Desaturate Cooldowns"] = "Desaturar Tempo de Recarga"
 L["Desaturate Icon"] = "Desaturar Ícones"
-L["Desaturate Junk"] = true
+L["Desaturate Junk"] = "Desaturar Lixo"
 L["Desaturate Voice Icons"] = "Desaturar Ícones de Voz"
-L["Desaturate"] = true
+L["Desaturate"] = "Desaturar"
 L["Desaturated Icon"] = "Ícones Desaturados"
 L["Descending"] = "Descendente"
 L["Detach From Frame"] = "Destacar do Quadro"
 L["Detached Width"] = "Largura quando Destacado"
-L["Development Version"] = true
+L["Development Version"] = "Versão de Desenvolvimento"
 L["Direction the bag sorting will use to allocate the items."] = "Direção que o organizador de bolsas irá usar para distribuir os itens."
 L["Direction the bar moves on gains/losses"] = "Direção que a barra move em ganhas/perdas"
 L["Direction the health bar moves when gaining/losing health."] = "Direção em que a barra da vida se move quando se ganha/perde vida."
-L["Disable Blizzard Skins"] = true
-L["Disable Cluster"] = true
-L["Disable Sort"] = true
+L["Disable Blizzard Skins"] = "Desabilitar Modificações Blizzard"
+L["Disable Cluster"] = "Desabilitar Agrupamento"
+L["Disable Sort"] = "Desabilitar Classificação"
 L["Disable Tutorial Buttons"] = "Desabilitar Botões de Tutorial"
 L["Disabled Blizzard Frames"] = "Quadros da Blizzard desabilitados"
 L["Disabled Blizzard"] = "Blizzard desabilitados"
 L["Disables the tutorial button found on some frames."] = "Desabilita o botão de tutorial achados em alguns quadros."
 L["Disconnected"] = "Desconectado"
 L["Disease Effect"] = "Efeito de doença"
-L["Display a healer icon over known healers inside battlegrounds or arenas."] = "Mostra um ícone de Curandeiro sobre curandeiros conhecidosem campos de batalha ou arenas."
+L["Display a healer icon over known healers inside battlegrounds or arenas."] = "Mostra um ícone de Curandeiro sobre curandeiros conhecidos em campos de batalha ou arenas."
 L["Display a panel across the bottom of the screen. This is for cosmetic only."] = "Mostra um painel na parte inferior da tela. Apenas para efeito cosmético."
 L["Display a panel across the top of the screen. This is for cosmetic only."] = "Mostra um painel na parte superior da tela. Apenas para efeito cosmético."
 L["Display a spark texture at the end of the castbar statusbar to help show the differance between castbar and backdrop."] = "Exibir uma textura de faísca no fim da Barra de Lançamento para ajudar a diferenciar a barra de cast e o fundo."
-L["Display a tank icon over known tanks inside battlegrounds or arenas."] = true
+L["Display a tank icon over known tanks inside battlegrounds or arenas."] = "Exibir um ícone de tanque sobre os tanques dentro de campos de batalha ou arenas."
 L["Display battleground messages in the middle of the screen."] = "Mostra mensagens do campo de batalha no meio da tela."
 L["Display bind names on action buttons."] = "Exibir atalhos nos botões de ação."
 L["Display Character Info"] = "Mostrar Informações do Personagem"
@@ -515,34 +518,34 @@ L["Display icon on arena frame indicating the units talent specialization or the
 L["Display In Main Tooltip"] = "Mostrar no Tooltip Principal"
 L["Display Inspect Info"] = "Mostar Informações de Inspeção"
 L["Display Interrupt Source"] = "Mostrar Fonte da Interrupção"
-L["Display Item Info"] = true
+L["Display Item Info"] = "Mostrar Informações do Item"
 L["Display Item Level"] = "Mostrar Item Level"
 L["Display LFG Icons in group chat."] = "Mostrar Ícones LFG em grupos de bate-papo"
 L["Display macro names on action buttons."] = "Exibir nomes das macros nos botões de ação."
-L["Display Mana"] = true
-L["Display messages from Guild and Whisper on AFK screen.\nThis chat can be dragged around (position will be saved)."] = true
+L["Display Mana"] = "Mostrar Mana"
+L["Display messages from Guild and Whisper on AFK screen.\nThis chat can be dragged around (position will be saved)."] = "Mostrar mensagens da Guilda e Sussurros na tela de AFK.\nEste bate-papo pode ser movimentado (a posição será salva)."
 L["Display minimap panels below the minimap, used for datatexts."] = "Exibir painéis abaixo do minimapa, usados para textos informativos."
 L["Display player titles."] = "Mostrar títulos dos jogadores."
 L["Display Player"] = "Exibir Jogador"
 L["Display Style"] = "Mostrar Estilo"
 L["Display Target"] = "Mostrar Alvo"
-L["Display Target's Aura Duration, when there is no CD displaying."] = true
+L["Display Target's Aura Duration, when there is no CD displaying."] = "Mostrar a Duração da Aura do Alvo, quando não há uma recarga sendo mostrada."
 L["Display Text"] = "Mostrar Texto"
 L["Display the castbar icon inside the castbar."] = "Mostrar o Ícone da Barra de Lançamento dentro da Barra de Lançamento."
-L["Display the current Mythic+ Dungeon Score."] = true
+L["Display the current Mythic+ Dungeon Score."] = "Mostra a Pontuação Atual das Masmorras Míticas+"
 L["Display the hyperlink tooltip while hovering over a hyperlink."] = "Exibir a tooltip de um hyperlink quando pairar por cima deste."
-L["Display the item level and current specialization of the unit on modifier press."] = true
+L["Display the item level and current specialization of the unit on modifier press."] = "Mostra o nível do item e especialização atual da unidade quando um modificador for pressionado."
 L["Display the name of the unit on the chat bubble. This will not work if backdrop is disabled or when you are in an instance."] = "Mostrar o nome da unidade na bolha do chat. Isso não irá funcionar se o fundo estiver desabilitado ou você estiver em uma instância."
-L["Display the target of current cast."] = true
+L["Display the target of current cast."] = "Mostra o alvo do lançamento atual."
 L["Display the unit name who interrupted a spell on the castbar. You should increase the Time to Hold to show properly."] = "Mostrar o nome da unidade que interrompeu um feitiço na barra de feitiços. Você deve aumentar o Tempo de Mostra para aparecer apropriadamente."
 L["Display the unit role in the tooltip."] = "Mostrar o papel/função da unidade no tooltip."
 L["Display tick marks on the castbar for channelled spells. This will adjust automatically for spells like Drain Soul and add additional ticks based on haste."] = "Exibir marcas na barra de cast para feitiços canalizados. Isto irá se ajustar automaticamente para feitiços como Drenar Alma e adicionará ticks baseado na Aceleração."
-L["Display Types"] = true
+L["Display Types"] = "Mostrar Tipos"
 L["Displayed Currency"] = "Moeda mostrada"
 L["Displays a detailed report of every item sold when enabled."] = "Mostra um relatório detalhado de cada item vendido quando habilitado."
-L["Displays item info on center of item."] = true
+L["Displays item info on center of item."] = "Mostra informação do item no centro do item."
 L["Displays item level on equippable items."] = "Mostra o item level de itens equipáveis."
-L["Displays the gender of players."] = true
+L["Displays the gender of players."] = "Mostra o gênero dos jogadores."
 L["Don't display auras that are longer than this duration (in seconds). Set to zero to disable."] = "Não mostrar auras que são maiores que esta duração (em segundos). Coloque zero para desabilitar."
 L["Don't display auras that are shorter than this duration (in seconds). Set to zero to disable."] = "Não mostrar auras que são menores que esta duração (em segundos). Coloque zero para desabilitar."
 L["Donations:"] = "Doações:"
@@ -554,16 +557,16 @@ L["Durability Scale"] = "Escala de Durabilidade"
 L["Duration Enable"] = "Habilitar Duração"
 L["Duration Text"] = "Texto de Duração"
 L["Duration"] = "Duração"
-L["Editbox History"] = true
-L["Editor Manager"] = true
+L["Editbox History"] = "Histórico do Campo de Edição"
+L["Editor Manager"] = "Gerenciador de Edição"
 L["Elite Icon"] = "Ícone de Elite"
 L["ELVUI_CREDITS"] = "Gostaria de agradecer especialmente às seguintes pessoas por me ajudarem a manter este addon, quer testando, codificando, ou através de doações. Em relação às doações, esta lista contém apenas o nome das pessoas que me contataram através de mensagem privada nos forums, se o seu nome está em falta e gostaria de o ver adicionado, por favor contate-me por mensagem privada."
-L["Emote"] = true
+L["Emote"] = "Expressão"
 L["Emotion Icons"] = "Ícones Emotivos"
-L["Empower Stages"] = true
+L["Empower Stages"] = "Estágios Potencializados"
 L["Enable + Adjust Movers"] = "Habilitar + Ajustar Movedores"
 L["Enable a sound if you select a unit."] = "Habilitar um som se você selecionar uma unidade."
-L["Enable Blizzard Skins"] = true
+L["Enable Blizzard Skins"] = "Habilitar Modificações Blizzard"
 L["Enable the use of separate size options for the right chat panel."] = "Habilitar o uso de opções de tamanho separadas para o painel direito de bate-papo."
 L["Enable to hear sound if you receive a resurrect."] = "Habilitar para escutar um som quando receber um reviver."
 L["Enable"] = "Ativar"
@@ -571,11 +574,11 @@ L["Enable/Disable the all-in-one bag."] = "Ativar/Desativar a Bolsa tudo-em-um."
 L["Enable/Disable the loot frame."] = "Ativar/Desativar painel de saques."
 L["Enable/Disable the loot roll frame."] = "Ativar/Desativar painel de disputa de saques"
 L["Enable/Disable the minimap. |cffFF3333Warning: This will prevent you from seeing the minimap datatexts.|r"] = "Habilitar/Desabilitar o minimapa. |cffFF3333Perigo: Isso irá prevení-lo de ver os Textos Informativos do minimapa.|r"
-L["Enable/Disable the on-screen zone text when you change zones."] = true
-L["Enable/Disable the World Map Enhancements."] = true
-L["Enabled"] = true
-L["Enables the ElvUI Raid Control panel."] = "Habilita o painel de Controle de Raid do ElvUI."
-L["Enables the five-second-rule ticks for Mana classes and Energy ticks for Rogues and Druids."] = true
+L["Enable/Disable the on-screen zone text when you change zones."] = "Habilitar/Desabilitar o texto de zona na tela quando você muda de zona."
+L["Enable/Disable the World Map Enhancements."] = "Habilitar/Desabilitar as Melhorias do Mapa"
+L["Enabled"] = "Habilitar"
+L["Enables the ElvUI Raid Control panel."] = "Habilita o painel de Controle de Raíde do ElvUI."
+L["Enables the five-second-rule ticks for Mana classes and Energy ticks for Rogues and Druids."] = "Habilitar a regra de cinco segundos para classes com Mana e Energia como Ladinos e Druídas"
 L["Enabling this allows raid-wide sorting however you will not be able to distinguish between groups."] = "Habilitar isso irá permitir a organização pela largura da raid porém você não conseguirá distinguir os grupos."
 L["Enabling this inverts the grouping order when the raid is not full, this will reverse the direction it starts from."] = "Habilitar isso irá inverter a ordem dos grupos quando um Raid não está cheia, isso irá reverter a direção que uma raid começa."
 L["Enabling this will check your health amount."] = "Habilitar isso irá checar sua quantidade de vida"
@@ -586,64 +589,64 @@ L["Enemy Aura Type"] = "Tipo de Aura do Inimigo"
 L["Enemy Combat Toggle"] = "Mostrar/Esconder combate inimigo"
 L["Enemy"] = "Inimigo"
 L["ENEMY_NPC"] = "NPC Inimigo"
-L["ENEMY_PLAYER"] = "Player Inimigo"
+L["ENEMY_PLAYER"] = "Jogador Inimigo"
 L["ENERGY"] = "Energia"
-L["Energy/Mana Regen Tick"] = true
+L["Energy/Mana Regen Tick"] = "Marco de Tempo de Regeneração de Energia/Mana"
 L["Engineering"] = "Engenharia"
 L["Enhanced PVP Messages"] = "Melhorias nas mensagens PVP"
-L["Equipped Item"] = true
-L["Equipped"] = true
+L["Equipped Item"] = "Item Equipado"
+L["Equipped"] = "Equipado"
 L["Error decoding data. Import string may be corrupted!"] = "Erro ao decodificar os dados. A string de importação pode estar corrompida!"
 L["Error exporting profile!"] = "Erro ao exportar perfil!"
-L["Event Log"] = true
+L["Event Log"] = "Registros de Eventos"
 L["Exclude Name"] = "Excluir Nome"
 L["Excluded names will not be class colored."] = "Nomes excluídos não serão coloridos por classe"
 L["Excluded Names"] = "Nomes Exclúidos"
-L["Expansion Button"] = true
-L["Expansion Landing Page"] = true
+L["Expansion Button"] = "Botão de Expansão"
+L["Expansion Landing Page"] = "Página de Lançamento de Expansão"
 L["Expiring"] = "Expirando"
 L["Export Now"] = "Exportar Agora"
 L["Export Profile"] = "Exportar Perfis"
-L["Export"] = true
+L["Export"] = "Exportar"
 L["Exported"] = "Exportado"
-L["Extra Buttons"] = true
-L["Fade Chat Toggles"] = true
+L["Extra Buttons"] = "Botões Extra"
+L["Fade Chat Toggles"] = "Alternar Desvanecimento dos botões de bate-papo"
 L["Fade Duration"] = "Duração de Desvanecimento"
 L["Fade Out Delay"] = "Delay de Desvanecimento"
-L["Fade out the tooltip when it disappers, instant otherwise. Cursor anchored tooltips are unaffected."] = true
+L["Fade out the tooltip when it disappers, instant otherwise. Cursor anchored tooltips are unaffected."] = "Desvanecer a dica quando ela desaparecer, será instântanea caso contrário. Dicas ancoras ao Cursor não são afetadas."
 L["Fade Out"] = "Desvanecimento"
 L["Fade Tabs No Backdrop"] = "Desvanecer Abas (sem backdrop)"
 L["Fade the chat text when there is no activity."] = "Desvanece o texto do bate-papo quando não há atividade."
 L["Fade Threshold"] = "Limiar para Desvanecer"
 L["Fade Undocked Tabs"] = "Desvanecer abas desanexadas"
-L["Faded Charging Rune"] = true
-L["Fader"] = true
-L["Fades the buttons that toggle chat windows when that window has been toggled off."] = true
-L["Fades the text on chat tabs that are docked in a panel where the backdrop is disabled."] = true
-L["Fades the text on chat tabs that are not docked at the left or right chat panel."] = true
+L["Faded Charging Rune"] = "Desvanecer Runa em Carregamento"
+L["Fader"] = "Desvanecimento"
+L["Fades the buttons that toggle chat windows when that window has been toggled off."] = "Desvanece os botões que habilitam/desabilitam as janelas de bate-papo quando essa janela for desabilitada."
+L["Fades the text on chat tabs that are docked in a panel where the backdrop is disabled."] = "Desvanece o textos das abas de bate-papo que estão ancoradas em um painel onde o fundo está desabilitado."
+L["Fades the text on chat tabs that are not docked at the left or right chat panel."] = "Desvanece o texto das abas de bate-papo que não estão ancoradas ao painel esquerdo ou direito."
 L["Fill"] = "Preencher"
 L["Filled"] = "Preenchido"
-L["Filter Modifiers"] = true
+L["Filter Modifiers"] = "Filtrar Modificadores"
 L["Filter Priority"] = "Prioridade do Filtro"
 L["Filter Search"] = "Buscar Filtro"
 L["Filter Type"] = "Tipo de filtro"
 L["Filters Page"] = "Página de Filtros"
 L["Filters"] = "Filtros"
-L["Flash Client Icon"] = true
-L["Flash Invites"] = true
-L["Flash Threshold"] = true
-L["Flash"] = true
+L["Flash Client Icon"] = "Piscar Ícone do Cliente"
+L["Flash Invites"] = "Piscar Convites"
+L["Flash Threshold"] = "Limiar para Pisco"
+L["Flash"] = "Pisco"
 L["FLIGHT_MAP"] = "Mapa de voo"
-L["Fluid Buffs on Debuffs"] = true
-L["Fluid Debuffs on Buffs"] = true
-L["Flyout Button Size"] = true
-L["Flyout Direction"] = true
-L["Focus Cast Key"] = true
+L["Fluid Buffs on Debuffs"] = "Bônus Fluidos em Penalidades"
+L["Fluid Debuffs on Buffs"] = "Penalidades Fluidas em Bônus"
+L["Flyout Button Size"] = "Tamanho de Botões Suspensos"
+L["Flyout Direction"] = "Direção de Botão Suspenso"
+L["Focus Cast Key"] = "Tecla para lançamento em Foco"
 L["FOCUS"] = "Concentração"
 L["Focus"] = "Foco"
-L["Focused Glow"] = true
+L["Focused Glow"] = "Brilho Focado"
 L["FocusTarget"] = "Focar Alvo"
-L["Font Group"] = true
+L["Font Group"] = "Grupo de Fonte"
 L["Font Outline"] = "Contorno da Fonte"
 L["Font Size"] = "Tamanho da fonte"
 L["Font"] = "Fonte"
@@ -653,7 +656,7 @@ L["Force Off"] = "Forçado Desligado"
 L["Force On"] = "Forçado Ligado"
 L["Force Reaction Color"] = "Forçar Cor de Reação"
 L["Force the frames to show, they will act as if they are the player frame."] = "Forçar os quadros a aparecerem. Eles irão se comportar como se fossem o quadro do jogador."
-L["Forces Focus Glow to be disabled for these frames"] = true
+L["Forces Focus Glow to be disabled for these frames"] = "Força o Brilho de Foco a ser desabilitado para estes quadros"
 L["Forces Mouseover Glow to be disabled for these frames"] = "Força o Brilho ao Pairar o Mouse ser desabilitado para estes quadros."
 L["Forces reaction color instead of class color on units controlled by players."] = "Força cor de reação em vez de cor de classe para unidades controladas por jogadores."
 L["Forces Target Glow to be disabled for these frames"] = "Força o Brilho de Alvo ser desabilitado para estes quadros."
@@ -662,7 +665,7 @@ L["Frame Glow"] = "Brilho de Quadro"
 L["Frame Level"] = "Quadro de Level"
 L["Frame Orientation"] = "Orientação do Quadro"
 L["Frame Strata"] = "Camada do Quadro"
-L["Free/Total"] = true
+L["Free/Total"] = "Livre/Total"
 L["Friend"] = "Amigo"
 L["Friendly Aura Type"] = "Tipo de Aura para Aliado"
 L["Friendly Combat Toggle"] = "Mostrar/Ocultar combate amigável"
@@ -670,29 +673,29 @@ L["Friendly"] = "Aliado"
 L["FRIENDLY_NPC"] = "NPC Aliado"
 L["FRIENDLY_PLAYER"] = "Player Aliado"
 L["Friends"] = "Amigos"
-L["From Me"] = true
-L["From Pet"] = true
-L["Full Bar"] = true
-L["Full Overlay"] = true
-L["Full Time"] = true
+L["From Me"] = "De mim"
+L["From Pet"] = "De meu mascote"
+L["Full Bar"] = "Barra Preenchida"
+L["Full Overlay"] = "Sobreposição Preenchida"
+L["Full Time"] = "Tempo Cheio"
 L["Full"] = "Cheio"
 L["FURY"] = "Fúria"
-L["Gaining Threat"] = true
+L["Gaining Threat"] = "Ganhando Ameaça"
 L["GARRISON_LOCATION_TOOLTIP"] = "Guarnição"
 L["Gems"] = "Gemas"
-L["Gender"] = true
+L["Gender"] = "Genêro"
 L["General"] = "Geral"
-L["Generic Trait"] = true
+L["Generic Trait"] = "Traço Genérico"
 L["Global (Account Settings)"] = "Global (configurações da conta)"
 L["Global Fade Transparency"] = "Transparência de desvanecimento global"
 L["Global"] = true
 L["Glow"] = "Brilhar"
-L["GM Chat"] = true
+L["GM Chat"] = "Bate-papo com GM"
 L["Gold Format"] = "Formato do Gold"
 L["Good Color"] = "Cor boa"
 L["Good Scale"] = "Escala boa"
 L["Good Transition Color"] = "Cor de transição boa"
-L["Good Transition"] = true
+L["Good Transition"] = "Boa Transição"
 L["Good"] = "Bom"
 L["Gossip Frame"] = "Quadro de Fofoca"
 L["Group By"] = "Agrupar por"
@@ -700,35 +703,35 @@ L["Group Spacing"] = "Espaçamento de grupo"
 L["Group Units"] = "Unidades de Grupo"
 L["Grouping & Sorting"] = "Agrupamento & Ordenação"
 L["Groups Per Row/Column"] = "Grupos por Linha/Coluna"
-L["Groups will be maxed as Mythic to 4, Other Raids to 6, and PVP / World to 8."] = true
+L["Groups will be maxed as Mythic to 4, Other Raids to 6, and PVP / World to 8."] = "Grupos serão no máximo: 4 em Mítico, outras Raídes 6, e PVP / Mundo 8."
 L["Growth direction from the first unitframe."] = "Direção de crescimento a partir do primeiro quado de unidade."
 L["Growth Direction"] = "Direção de crescimento"
 L["Growth X-Direction"] = "Direção do Crescimento (Eixo-X)"
 L["Growth Y-Direction"] = "Direção do Crescimento (Eixo-Y)"
-L["Growth"] = true
+L["Growth"] = "Crescimento"
 L["Guardians"] = "Guardiões"
-L["Guide Frame"] = true
+L["Guide Frame"] = "Quadro de Guia"
 L["Guide:"] = "Guia:"
 L["Guild Bank"] = "Banco da guilda"
 L["Guild Control Frame"] = "Controle da Guilda"
 L["Guild Ranks"] = "Posto na Guilda"
 L["Guild Registrar"] = "Registrar Guilda"
 L["Guild"] = "Guilda"
-L["Half Bar"] = true
-L["Happy"] = true
-L["Has Aura"] = true
-L["Has No Stealable"] = true
-L["Has NPC Title"] = true
-L["Has Stealable"] = true
-L["Headers"] = true
+L["Half Bar"] = "Meia Barra"
+L["Happy"] = "Feliz"
+L["Has Aura"] = "Tem Aura"
+L["Has No Stealable"] = "Não tem Roubável"
+L["Has NPC Title"] = "Tem Título de NPC"
+L["Has Stealable"] = "Tem Roubável"
+L["Headers"] = "Cabeçalhos"
 L["Heal Absorbs"] = "Absorções de Cura"
 L["Heal Prediction"] = "Curas por vir"
 L["Healer Icon"] = "Ícone de Curador"
-L["Health Backdrop Multiplier"] = true
+L["Health Backdrop Multiplier"] = "Multiplicador de Fundo da Vida"
 L["Health Backdrop"] = "Fundo da Vida"
 L["Health Bar"] = "Barra de Vida"
 L["Health Border"] = "Borda da Vida"
-L["Health Breakpoint"] = true
+L["Health Breakpoint"] = "Ponto de parada da Vida"
 L["Health By Value"] = "Vida por Valor"
 L["Health Color"] = "Cor da Vida"
 L["Health Threshold"] = "Limiar da Vida"
@@ -736,51 +739,51 @@ L["Health"] = "Vida"
 L["Height Multiplier"] = "Multiplicador de Altura"
 L["Height of the objective tracker. Increase size to be able to see more objectives."] = "Altura do rastreador de objetivos. Aumente o tamanho para poder ver mais objetivos."
 L["Height"] = "Altura"
-L["Help Frame"] = "Ajuda"
-L["Help"] = true
+L["Help Frame"] = "Quadro de Ajuda"
+L["Help"] = "Ajuda"
 L["Herbalism"] = "Herbalismo"
-L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true
+L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Aqui você pode adicionar items que você quer excluir da classificação. Para remover um item apenas clique no seu nome na lista."
 L["HH:MM Threshold"] = "Limiar da HH:MM"
 L["HH:MM"] = true
 L["Hide At Max Level"] = "Esconder quando level máximo"
 L["Hide Below Max Level"] = "Esconder abaixo do level máximo"
 L["Hide Both"] = "Esconder Ambos"
-L["Hide by Application"] = true
-L["Hide by Status"] = true
+L["Hide by Application"] = "Esconder por Aplicação"
+L["Hide by Status"] = "Esconder por Estado"
 L["Hide Castbar text. Useful if your power height is very low or if you use power offset."] = "Esconder texto na barra de cast. Útil quando a altura do seu Poder é muito pequena ou se você usa deslocamento de Poder."
-L["Hide Channels"] = true
-L["Hide Chat Toggles"] = true
-L["Hide Cooldown Bling"] = true
-L["Hide Copy Button"] = true
+L["Hide Channels"] = "Esconder Canais"
+L["Hide Chat Toggles"] = "Esconder Alternadores de Bate-papo"
+L["Hide Cooldown Bling"] = "Esconder Brilho da Recarga"
+L["Hide Copy Button"] = "Esconder Botão de Cópia"
 L["Hide Delay"] = "Esconder Delay"
 L["Hide Error Text"] = "Esconder Texto de Erro"
 L["Hide Frame"] = "Esconder Quadro"
-L["Hide Icon"] = true
+L["Hide Icon"] = "Esconder Ícone"
 L["Hide In Combat"] = "Esconder em Combate"
-L["Hide In Keystone"] = true
+L["Hide In Keystone"] = "Esconder em Chave Mítica+"
 L["Hide In Vehicle"] = "Esconder quado em veículo"
-L["Hide Out of Combat"] = true
+L["Hide Out of Combat"] = "Esconder Fora de Combate"
 L["Hide Outside PvP"] = "Esconder fora do PvP"
 L["Hide specific sections in the datatext tooltip."] = "Esconder seção específica nos tooltip dos textos informativos"
 L["Hide Spell Name"] = "Esconder nome do feitiço"
 L["Hide Text"] = "Esconder texto"
-L["Hide the channel names in chat."] = true
+L["Hide the channel names in chat."] = "Esconder os nomes dos canais de bate-papo"
 L["Hide Time"] = "Esconder horário"
 L["Hide Voice Buttons"] = "Esconder botões de voz"
 L["Hide When Empty"] = "Esconder quando vazio"
-L["Hide Zone Text"] = true
+L["Hide Zone Text"] = "Esconder o Texto de Zona"
 L["Hide"] = "Esconder"
-L["Hides the bling animation on buttons at the end of the global cooldown."] = true
+L["Hides the bling animation on buttons at the end of the global cooldown."] = "Esconder a animação nos botões no fim de um tempo de recarga global."
 L["Hides the red error text at the top of the screen while in combat."] = "Esconde o texto de erro vermelho do topo da tela quando em combate."
-L["High"] = true
-L["Highlight Color Style"] = true
-L["History Size"] = true
-L["History"] = true
+L["High"] = "Alto"
+L["Highlight Color Style"] = "Estilo da Cor de Destaque"
+L["History Size"] = "Tamanho do Histórico"
+L["History"] = "Histórico"
 L["HOLY_POWER"] = "Poder Sagrado"
-L["Home Latency"] = true
+L["Home Latency"] = "Latência de Casa"
 L["Honor"] = "Honra"
 L["Horde / Alliance / Honor Info"] = "Horda / Aliança / Informação de Honra"
-L["Horde"] = true
+L["Horde"] = "Horda"
 L["Horizontal Spacing"] = "Espaçamento Horizontal"
 L["Horizontal"] = "Horizontal"
 L["Hostile"] = "Hostil"
@@ -788,16 +791,16 @@ L["Hours"] = "Horas"
 L["Hover Highlight"] = "Destaque ao pairar"
 L["Hover"] = "Pairar"
 L["How far away the portrait is from the camera."] = "Quão longe o retrato está da camera."
-L["How long the cutaway health will take to fade out."] = true
-L["How long the cutaway power will take to fade out."] = true
-L["How many seconds the castbar should stay visible after the cast failed or was interrupted."] = true
-L["How much time before the cutaway health starts to fade."] = true
-L["How much time before the cutaway power starts to fade."] = true
+L["How long the cutaway health will take to fade out."] = "Quanto tempo a vida cortada levará para desvanecer."
+L["How long the cutaway power will take to fade out."] = "Quando tempo o poder cortado levará para desvanecer."
+L["How many seconds the castbar should stay visible after the cast failed or was interrupted."] = "Quantos segundos a barra de lançamento deve continuar visível depois de um lançamento falhar ou ser interrompido."
+L["How much time before the cutaway health starts to fade."] = "Quanto tempo antes da vida cortada começar a desvanecer."
+L["How much time before the cutaway power starts to fade."] = "Quanto tempo antes do poder cortado começar a desvanecer."
 L["Hyperlink Hover"] = "Pairar no hyperlink"
-L["Icon Height"] = true
+L["Icon Height"] = "Altura do Ícone"
 L["Icon Inside Castbar"] = "Ícone dentro da Barra de Cast"
 L["Icon Size"] = "Tamanho do Ícone"
-L["Icon Width"] = true
+L["Icon Width"] = "Largura do Ícone"
 L["Icon"] = "Ícone"
 L["Icon: BOTTOM"] = "Ícone: ABAIXO"
 L["Icon: BOTTOMLEFT"] = "Ícone: ABAIXO-ESQUERDA"
@@ -812,10 +815,10 @@ L["Icons and Text"] = "Texto e Ícones"
 L["If enabled then it checks if auras are missing instead of being present on the unit."] = "Se habilitado então irá checar se a aura está faltando ao invés de estar presente na unidade."
 L["If enabled then it will require all auras to activate the filter. Otherwise it will only require any one of the auras to activate it."] = "Se habilitado então irá requerer todas as auras para ativar o filtro. Caso contrário irá apenas requerer qualquer uma das auras para ativá-lo."
 L["If enabled then it will require all cooldowns to activate the filter. Otherwise it will only require any one of the cooldowns to activate it."] = "Se habilitado então irá requerer todos os tempo de recarga para ativar o filtro. Caso contrário irá apenas requerer qualquer um dos tempo de recargas para ativá-lo."
-L["If enabled then the filter will activate if the unit is casting anything."] = true
-L["If enabled then the filter will activate if the unit is channeling anything."] = true
-L["If enabled then the filter will activate if the unit is not casting anything."] = true
-L["If enabled then the filter will activate if the unit is not channeling anything."] = true
+L["If enabled then the filter will activate if the unit is casting anything."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade está lançando algo."
+L["If enabled then the filter will activate if the unit is channeling anything."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade estiver canalizando algo."
+L["If enabled then the filter will activate if the unit is not casting anything."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade não estiver lançando algo."
+L["If enabled then the filter will activate if the unit is not channeling anything."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade não estiver canalizando algo."
 L["If enabled then the filter will only activate if the level of the unit is equal to or higher than this value."] = "Se habilitado então o filtro irá apenas ser ativado se o level da unidade for igual ou maior que este valor."
 L["If enabled then the filter will only activate if the level of the unit is equal to or lower than this value."] = "Se habilitado então o filtro irá apenas ser ativado se o level da unidade for igual ou menor que este valor."
 L["If enabled then the filter will only activate if the level of the unit matches this value."] = "Se habilitado então o filtro irá apenas ser ativado se o level da unidade for igual a este valor."
@@ -825,26 +828,26 @@ L["If enabled then the filter will only activate if the unit is casting not inte
 L["If enabled then the filter will only activate if the unit is not casting or channeling one of the selected spells."] = "Se habilitado então o filtro irá apenas ser ativado se a unidade não estiver castando ou canalizando um dos feitiços selecionados."
 L["If enabled then the filter will only activate when the unit can be attacked by the active player."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade poder ser atacada pelo jogador ativo."
 L["If enabled then the filter will only activate when the unit can not be attacked by the active player."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade não poder ser atacada pelo jogador ativo."
-L["If enabled then the filter will only activate when the unit has a stealable buff(s)."] = true
-L["If enabled then the filter will only activate when the unit has no stealable buff(s)."] = true
+L["If enabled then the filter will only activate when the unit has a stealable buff(s)."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade tiver um bônus roubável."
+L["If enabled then the filter will only activate when the unit has no stealable buff(s)."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade não tiver um bônus roubável."
 L["If enabled then the filter will only activate when the unit is controlled by the player."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade estiver controlado pelo jogador."
 L["If enabled then the filter will only activate when the unit is in a Vehicle."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade estiver em um Veículo."
 L["If enabled then the filter will only activate when the unit is in combat."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade estiver em combate."
-L["If enabled then the filter will only activate when the unit is in your Party."] = true
-L["If enabled then the filter will only activate when the unit is in your Raid."] = true
+L["If enabled then the filter will only activate when the unit is in your Party."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade estiver em seu Grupo."
+L["If enabled then the filter will only activate when the unit is in your Raid."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade estiver em sua Raíde."
 L["If enabled then the filter will only activate when the unit is not controlled by the player."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade não estiver sendo controlada pelo jogador."
 L["If enabled then the filter will only activate when the unit is not in a Vehicle."] = "Se habilitado então o filtro irá apenas ser ativado quando não estiver em um Veículo."
-L["If enabled then the filter will only activate when the unit is not in your Party."] = true
-L["If enabled then the filter will only activate when the unit is not in your Raid."] = true
+L["If enabled then the filter will only activate when the unit is not in your Party."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade não estiver no seu Grupo."
+L["If enabled then the filter will only activate when the unit is not in your Raid."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade não estiver na sua Raíde."
 L["If enabled then the filter will only activate when the unit is not owned by the player."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade não pertencer ao jogador."
 L["If enabled then the filter will only activate when the unit is not pvp-flagged."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade não for pvp-flagged."
-L["If enabled then the filter will only activate when the unit is not tap denied."] = true
+L["If enabled then the filter will only activate when the unit is not tap denied."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade não for estiver reservada."
 L["If enabled then the filter will only activate when the unit is not targeting you."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade não tiver como você como alvo."
 L["If enabled then the filter will only activate when the unit is not the active player's pet."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade não for o pet do jogador ativo."
 L["If enabled then the filter will only activate when the unit is out of combat."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade estiver fora de combate."
 L["If enabled then the filter will only activate when the unit is owned by the player."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade não for pertencente pelo jogador."
 L["If enabled then the filter will only activate when the unit is pvp-flagged."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade for pvp-flagged."
-L["If enabled then the filter will only activate when the unit is tap denied."] = true
+L["If enabled then the filter will only activate when the unit is tap denied."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade estiver reservada."
 L["If enabled then the filter will only activate when the unit is targeting you."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade ter você como alvo."
 L["If enabled then the filter will only activate when the unit is the active player's pet."] = "Se habilitado então o filtro irá apenas ser ativado quando a unidade é o pet ativo do jogador."
 L["If enabled then the filter will only activate when you are focusing the unit."] = "Se habilitado então o filtro irá apenas ser ativado quando você estiver focando a unidade."
@@ -856,7 +859,7 @@ L["If enabled then the filter will only activate when you are not targeting the
 L["If enabled then the filter will only activate when you are out of combat."] = "Se habilitado então o filtro irá apenas ser ativado quando você estiver fora de combate."
 L["If enabled then the filter will only activate when you are resting at an Inn."] = "Se habilitado então o filtro irá apenas ser ativado quando você estiver descansado em uma estalagem."
 L["If enabled then the filter will only activate when you are targeting the unit."] = "Se habilitado então o filtro irá apenas ser ativado quando você ter a unidade como alvo."
-L["If enabled then the filter will only activate when you have a target."] = true
+L["If enabled then the filter will only activate when you have a target."] = "Se habilitado então o filtro irá apenas ser ativado quando você tiver um alvo."
 L["If enabled, the style filter will only activate when you are in one of the instances specified in Instance ID."] = "Se habilitado, então o estilo de filtro irá apenas ser ativado quando você estiver em uma das instâncias especificadas nos IDs da Instância."
 L["If enabled, the style filter will only activate when you are in one of the maps specified in Map ID."] = "Se habilitado, então o estilo de filtro irá apenas ser ativado quando você estiver em um dos mapas espeficiados em um dos IDs do Mapa."
 L["If enabled, the style filter will only activate when you are in one of the subzones specified in Add Subzone Name."] = "Se habilitado, então o estilo de filtro irá apenas ser ativado quando você estiver em uma das subzonas especificada em Adicionar Nome da Subzona."
@@ -873,25 +876,25 @@ L["If this threshold is used then the power of the unit needs to be higher than
 L["If this threshold is used then the power of the unit needs to be lower than this value in order for the filter to activate. Set to 0 to disable."] = "Se este limiar for usado, então o poder da unidade precisa ser menor que este valor para o filtro ser ativado. Coloque 0 para desabilitar."
 L["If you have a lot of 3D Portraits active then it will likely have a big impact on your FPS. Disable some portraits if you experience FPS issues."] = "Se você tem vários Retratos 3D ativos então você provavelmente terá um grande impacto no seu FPS. Desabilite alguns Retratos se você encontrar algum problema com FPS."
 L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "Se você tiver algum plugin suportando esta funcionalidade instalado você pode achá-lo no menu dropdown à direita."
-L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Se você destravar as Barras de Ações, tentar mover um feitiço pode fazê-lo ser castado se você casta feitiços ao pressionar a tecla em vez de quando soltá-la."
+L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Se você destravar as Barras de Ações, tentar mover um feitiço pode fazê-lo ser lançado se você casta feitiços ao pressionar a tecla em vez de quando soltá-la."
 L["Ignore mouse events."] = "Ignorar eventos do mouse (rato)."
-L["Ignored Items (Global)"] = true
-L["Ignored Items (Profile)"] = true
+L["Ignored Items (Global)"] = "Itens Ignorados (Global)"
+L["Ignored Items (Profile)"] = "Itens Ignorados (Perfil)"
 L["Import Now"] = "Importar Agora"
-L["Import Profile"] = true
-L["Import"] = true
+L["Import Profile"] = "Importar Perfil"
+L["Import"] = "Importar"
 L["Importing"] = "Importando"
-L["In Combat Label"] = true
-L["In Combat"] = true
-L["In Party"] = true
-L["In Pet Battle"] = true
-L["In Raid"] = true
-L["In Vehicle"] = true
+L["In Combat Label"] = "Rótulo em Combate"
+L["In Combat"] = "Em Combate"
+L["In Party"] = "Em Grupo"
+L["In Pet Battle"] = "Em Batalha de Mascote"
+L["In Raid"] = "Em Raíde"
+L["In Vehicle"] = "Em Veículo"
 L["Inactivity Timer"] = "Tempo de Inatividade"
 L["Index"] = "Índice"
-L["Indicate whether buffs you cast yourself should be separated before or after."] = "Indica se os buffs que lança em si próprio devem ser separados antes ou depois."
-L["Indicator Expiring"] = true
-L["Indicator"] = true
+L["Indicate whether buffs you cast yourself should be separated before or after."] = "Indica se os bônus que lança em si próprio devem ser separados antes ou depois."
+L["Indicator Expiring"] = "Indicador Expirando"
+L["Indicator"] = "Indicador"
 L["Individual Units"] = "Unidades Individuais"
 L["InfoPanel Border"] = "Borda do Painel de Informações"
 L["Information Panel"] = "Painel de Informações"
@@ -900,110 +903,110 @@ L["Inherit Global Fade"] = "Herdar Desvanecimento Global"
 L["INSANITY"] = "Insanidade"
 L["Inscription"] = "Escrivania"
 L["Inset"] = "Margem"
-L["Inspect Data"] = true
+L["Inspect Data"] = "Dados de Inspeção"
 L["Inspect"] = "Inspecionar"
-L["Install"] = true
+L["Install"] = "Instalar"
 L["Instance Difficulty"] = "Dificuldade da Instância"
 L["Instance ID"] = "ID da Instância"
 L["Instance Type"] = "Tipo da Instância"
-L["Instance"] = true
+L["Instance"] = "Instância"
 L["INTERFACE_OPTIONS"] = "Opções de interface"
-L["Interrupted"] = true
+L["Interrupted"] = "Interrompido"
 L["Interruptible"] = "Interrompível"
 L["Invert Colors"] = "Inverter Cores"
 L["Invert foreground and background colors."] = "Inverter cores do background e do frontground."
 L["Invert Grouping Order"] = "Inverter a Ordem de Agrupamento"
-L["INVTYPE_AMMO"] = "Ammo"
-L["INVTYPE_BODY"] = "Shirt"
-L["INVTYPE_CHEST"] = "Chest"
-L["INVTYPE_CLOAK"] = "Cloak"
-L["INVTYPE_FEET"] = "Feet"
-L["INVTYPE_FINGER1"] = "Finger 1"
-L["INVTYPE_FINGER2"] = "Finger 2"
-L["INVTYPE_HAND"] = "Hands"
-L["INVTYPE_HEAD"] = "Head"
-L["INVTYPE_LEGS"] = "Legs"
-L["INVTYPE_NECK"] = "Neck"
-L["INVTYPE_RANGED"] = "Ranged"
-L["INVTYPE_SHOULDER"] = "Shoulder"
-L["INVTYPE_TABARD"] = "Tabard"
-L["INVTYPE_TRINKET1"] = "Trinket 1"
-L["INVTYPE_TRINKET2"] = "Trinket 2"
-L["INVTYPE_WAIST"] = "Waist"
-L["INVTYPE_WEAPONMAINHAND"] = "Main Hand"
-L["INVTYPE_WEAPONOFFHAND"] = "Off Hand"
-L["INVTYPE_WRIST"] = "Wrist"
-L["Is Being Resurrected"] = true
+L["INVTYPE_AMMO"] = "Munição"
+L["INVTYPE_BODY"] = "Camisa"
+L["INVTYPE_CHEST"] = "Torso"
+L["INVTYPE_CLOAK"] = "Costas"
+L["INVTYPE_FEET"] = "Pés"
+L["INVTYPE_FINGER1"] = "Dedo 1"
+L["INVTYPE_FINGER2"] = "Dedo 2"
+L["INVTYPE_HAND"] = "Mãos"
+L["INVTYPE_HEAD"] = "Cabeça"
+L["INVTYPE_LEGS"] = "Pernas"
+L["INVTYPE_NECK"] = "Pescoço"
+L["INVTYPE_RANGED"] = "Longo alcance"
+L["INVTYPE_SHOULDER"] = "Ombros"
+L["INVTYPE_TABARD"] = "Tabardo"
+L["INVTYPE_TRINKET1"] = "Berloque 1"
+L["INVTYPE_TRINKET2"] = "Berloque 2"
+L["INVTYPE_WAIST"] = "Cintura"
+L["INVTYPE_WEAPONMAINHAND"] = "Mão principal"
+L["INVTYPE_WEAPONOFFHAND"] = "Mão Secundária"
+L["INVTYPE_WRIST"] = "Pulsos"
+L["Is Being Resurrected"] = "Está sendo Ressuscitado"
 L["Is Casting Anything"] = "Está castando qualquer coisa"
 L["Is Channeling Anything"] = "Está canalizando qualquer coisa"
-L["Is Charmed"] = true
+L["Is Charmed"] = "Está Encantado"
 L["Is Focused"] = "Está como Foco"
-L["Is Pet"] = true
-L["Is Possessed"] = true
-L["Is PvP"] = true
-L["Is Resting"] = true
+L["Is Pet"] = "É Mascote"
+L["Is Possessed"] = "Está Possuído"
+L["Is PvP"] = "É JvJ"
+L["Is Resting"] = "Está Descansando"
 L["Is Targeted"] = "Está como Alvo"
 L["Is Targeting Player"] = "Está com um Jogador como Alvo"
-L["Is Trivial"] = true
-L["Island Party Pose"] = true
+L["Is Trivial"] = "É trivial"
+L["Island Party Pose"] = "Pose do Grupo de Ilha"
 L["ISLANDS_HEADER"] = "Expedições Insulares"
 L["Item Count"] = "Contador de Item"
-L["Item Info"] = true
-L["Item Interaction"] = true
+L["Item Info"] = "Informação do Item"
+L["Item Interaction"] = "Interação de Item"
 L["Item Level Threshold"] = "Limiar do Item Level"
-L["Item Level"] = true
-L["Item Quality"] = true
+L["Item Level"] = "Nível de Item"
+L["Item Quality"] = "Qualidade de Item"
 L["Item Upgrade"] = "Aprimorar Item"
 L["ITEM_BIND_QUEST"] = "Item de missão"
 L["ITEM_QUALITY3_DESC"] = "Raro"
 L["ITEM_QUALITY6_DESC"] = "Artefato"
 L["Items"] = "Itens"
-L["Junk Icon"] = true
+L["Junk Icon"] = "Ícone de Lixo"
 L["JustifyH"] = "JustificarH"
-L["Keep Size Ratio"] = true
+L["Keep Size Ratio"] = "Manter Proporção de Tamanho"
 L["Key Down"] = "Tecla pressionada"
 L["Key Modifiers"] = "Modificador de Tecla"
-L["Key Ring"] = true
+L["Key Ring"] = "Chaveiro"
 L["KEY_BINDINGS"] = "Teclas de atalho"
 L["Keybind Mode"] = "Modo de Teclas de Atalho"
 L["Keybind Text"] = "Texto das Teclas de Atalho"
 L["Keyword Alert"] = "Alerta de palavra-chave"
-L["Keyword Alerts"] = true
+L["Keyword Alerts"] = "Alerta de palavra-chave"
 L["Keywords"] = "Palavras-chave"
-L["Known Spells"] = true
-L["Label"] = true
+L["Known Spells"] = "Feitiços Conhecidos"
+L["Label"] = "Rótulo"
 L["LANGUAGE"] = "Idioma"
-L["Large"] = true
-L["Larger Font"] = true
-L["Larger Outline"] = true
-L["Larger Size"] = true
+L["Large"] = "Grande"
+L["Larger Font"] = "Fonte Maior"
+L["Larger Outline"] = "Contorno Maior"
+L["Larger Size"] = "Tamanho Maior"
 L["Latency"] = "Latência"
 L["Leatherworking"] = "Couraria"
-L["Left Alt"] = "Left (esquerdo)"
-L["Left Buttons"] = true
-L["Left Control"] = true
+L["Left Alt"] = "Alt Esquerdo"
+L["Left Buttons"] = "Botões Esquerdos"
+L["Left Control"] = "Control Esquerdo"
 L["Left Only"] = "Somente Esquerda"
-L["Left Panel Height"] = true
-L["Left Panel Width"] = true
-L["Left Position"] = true
+L["Left Panel Height"] = "Altura do Painel Esquerdo"
+L["Left Panel Width"] = "Largura do Painel Esquerdo"
+L["Left Position"] = "Posição Esquerda"
 L["Left Shift"] = "Shift (esquerdo)"
 L["Left to Right"] = "Esquerda para Direita"
-L["Left"] = true
+L["Left"] = "Esquerda"
 L["LEVEL_BOSS"] = "Coloque level -1 para unidades Boss ou coloque 0 para disabilitar."
 L["LF Guild Frame"] = "Localizador de Guildas"
 L["LFG Queue"] = "Fila de LFG"
 L["LFG_TITLE"] = "Procurando grupo"
-L["Library Dropdown"] = true
+L["Library Dropdown"] = "Menus de Suspensão de Bibliotecas"
 L["Limit the number of rows or columns."] = "Limitar o número de linhas ou colunas."
-L["Lines"] = true
+L["Lines"] = "Linhas"
 L["Link to the latest development version."] = "Link para a última versão de desenvolvimento."
-L["Link to the latest PTR version."] = true
-L["List of words to color in chat if found in a message. If you wish to add multiple words you must separate the word with a comma. To search for your current name you can use %MYNAME%.\n\nExample:\n%MYNAME%, ElvUI, RBGs, Tank"] = "Lista de palavras a colorir se encontrada numa mensagem. Se desejar adicionar multiplas palavras deverá separa-las com uma vírgula. Para procurar pelo seu nome actual pode usar %MYNAME%.\n\nExemplo:\n%MYNAME%, ElvUI, RBGs, Tank"
-L["Load Distance"] = true
-L["Loadout Only"] = true
+L["Link to the latest PTR version."] = "Link para a última versão de PTR."
+L["List of words to color in chat if found in a message. If you wish to add multiple words you must separate the word with a comma. To search for your current name you can use %MYNAME%.\n\nExample:\n%MYNAME%, ElvUI, RBGs, Tank"] = "Lista de palavras a colorir se encontrada numa mensagem. Se desejar adicionar multiplas palavras deverá separa-las com uma vírgula. Para procurar pelo seu nome atual pode usar %MYNAME%.\n\nExemplo:\n%MYNAME%, ElvUI, RBGs, Tank"
+L["Load Distance"] = "Distância de Carregamento"
+L["Loadout Only"] = "Apenas em Configuração de Equipamento"
 L["Local Time"] = "Hora Local"
 L["Location Text"] = "Texto de Localização"
-L["Lock Distance Max"] = true
+L["Lock Distance Max"] = "Travar Distância Máxima"
 L["LOCK_ACTIONBAR_TEXT"] = "Travar barra de ações"
 L["Log Taints"] = "Capturar Problemas"
 L["Log the main chat frames history. So when you reloadui or log in and out you see the history from your last session."] = "Armazenar o histórico dos quadros principais do bate-papo. Para que possa ver o histórico de sua última sessão ao relogar ou conectar e desconectar."
@@ -1011,12 +1014,12 @@ L["Login Message"] = "Mensagem de Entrada"
 L["Loot Roll"] = "Disputa de Saques"
 L["Losing Threat"] = "Perdendo Aggro"
 L["LOSS_OF_CONTROL"] = "Alertas de perda de controle"
-L["Low Health Color"] = true
-L["Low Health Half"] = true
+L["Low Health Color"] = "Cor de Vida Baixa"
+L["Low Health Half"] = "Cor de Metade Baixa da Vida"
 L["Low Health Threshold"] = "Limiar de Vida Baixa"
-L["Low Threat"] = "Aggro Baixo"
+L["Low Threat"] = "Ameaça Baixo"
 L["Low Threshold"] = "Baixo Limiar"
-L["Low"] = true
+L["Low"] = "Baixo"
 L["Lower numbers mean a higher priority. Filters are processed in order from 1 to 100."] = "Números menores significam maior prioridade. Filtros são processados em ordem de 1 a 100."
 L["LUNAR_POWER"] = "Poder Astral"
 L["Macro Text"] = "Texto das Macros"
@@ -1027,11 +1030,11 @@ L["Mail Frame"] = "Correio"
 L["MAIL_LABEL"] = "Correio"
 L["Main backdrop color of the UI."] = "Cor básica para fundo da interface."
 L["Main border color of the UI."] = "Cor principal da borda da interface."
-L["Main Options"] = true
+L["Main Options"] = "Opções Principais"
 L["Main statusbar texture."] = "Textura princiapal da barra de estado."
-L["Major Factions"] = true
+L["Major Factions"] = "Facções Maiores"
 L["Make textures transparent."] = "Deixar as texturas transparentes."
-L["Make the unitframe glow when it is below this percent of health."] = true
+L["Make the unitframe glow when it is below this percent of health."] = "Faz o quadro de unidade brilhar quanto estiver abaixo desta porcentagem de vida."
 L["Make the world map smaller."] = "Fazer o Mapa Mundial menor."
 L["MANA"] = "Mana"
 L["Map ID"] = "ID do Mapa"
@@ -1042,32 +1045,32 @@ L["Mark Quest Reward"] = "Marcar Recompensas de Quests"
 L["Marks the most valuable quest reward with a gold coin."] = "Marca a recompensa mais valiosa da quest com uma moeda de ouro."
 L["Masque Support"] = "Suporte ao Masque"
 L["Masque"] = true
-L["Match if Item Name or ID is NOT in the list."] = true
+L["Match if Item Name or ID is NOT in the list."] = "Igualar se o Nome do Item ou ID NÃO estiver na lista."
 L["Match if Name or NPC ID is NOT in the list."] = "Igualar se Nome ou ID do NPC NÃO estiver nesta lista."
 L["Match Player Level"] = "Igualar nível do jogador"
-L["Match this trigger if the spell is not known."] = true
-L["Maw Buffs Position"] = true
-L["Max Allowed Groups"] = true
-L["Max Alpha"] = true
-L["Max amount of overflow allowed to extend past the end of the health bar."] = true
-L["Max Bars"] = true
-L["Max Distance"] = true
-L["Max Lines"] = true
-L["Max Overflow is set to zero. Absorb Overflows will be hidden when using Overflow style.\nIf used together Max Overflow at zero and Overflow mode will act like Normal mode without the ending sliver of overflow."] = true
-L["Max Overflow"] = true
+L["Match this trigger if the spell is not known."] = "Igualar este gatilho apenas se o feitiço não for conhecido"
+L["Maw Buffs Position"] = "Posição do Bônus da Gorja"
+L["Max Allowed Groups"] = "Grupos Máximos Permitidos"
+L["Max Alpha"] = "Transparência Máxima"
+L["Max amount of overflow allowed to extend past the end of the health bar."] = "Quantidade máxima de sobreposição permitida para extender além do fim da barra de vida."
+L["Max Bars"] = "Barras Máximas"
+L["Max Distance"] = "Distância Máxima"
+L["Max Lines"] = "Linhas Máximas"
+L["Max Overflow is set to zero. Absorb Overflows will be hidden when using Overflow style.\nIf used together Max Overflow at zero and Overflow mode will act like Normal mode without the ending sliver of overflow."] = "Sobreposição Máxima não está configurada para azero. A Sobreposição de Absorção será escondida quando estiver utilizando o estilo de Sobreposição.\nSe utilizados juntos a Sobreposição Máxima em zero e a Sobreposição vão agir como o modo Normal sem o traço final da sobreposição."
+L["Max Overflow"] = "Sobreposição Máxima"
 L["Max Wraps"] = "Enrolamentos Máximos"
 L["Maximum Duration"] = "Duração Máxima"
 L["Maximum Level"] = "Level Máximo"
 L["Maximum tick rate allowed for tag updates per second."] = "Taxa máxima de tick permitida para atualizações de Tags por segundo."
 L["Maximum Time Left"] = "Máximo de Tempo Restante"
 L["Media"] = "Mídia"
-L["Medium"] = true
+L["Medium"] = "Médio"
 L["Merchant Frame"] = "Comerciante"
 L["Method to sort by."] = "Método de Sorteamento."
 L["Middle Click - Set Focus"] = "Clique Meio - Defenir foco"
-L["Middle clicking the unit frame will cause your focus to match the unit.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = "Clicar com o botão do meio no quadro da unidade fará o foco ser defenido para esta unidade.\n|cffff3333Note:|r Se o Clique estiver activado, esta opção só afecta molduras ElvUI se estas não estiverem na lista negra do Clique."
+L["Middle clicking the unit frame will cause your focus to match the unit.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = "Clicar com o botão do meio no quadro da unidade fará o foco ser defenido para esta unidade.\n|cffff3333Note:|r Se o Clique estiver ativado, esta opção só afeta molduras ElvUI se estas não estiverem na lista de bloqueamento do Clique."
 L["Middle"] = "Meio"
-L["Min Alpha"] = true
+L["Min Alpha"] = "Transparência Mínima"
 L["Minimap Buttons"] = "Botões do Minimapa"
 L["Minimap Mouseover"] = "Passar com o rato(mouse) sobre o minimapa"
 L["Minimap Panels"] = "Painéis do Minimapa"
@@ -1076,96 +1079,96 @@ L["Minimum Duration"] = "Menor Duração"
 L["Minimum Level"] = "Menor Level"
 L["Minimum Time Left"] = "Menor Tempo Restante"
 L["Mining"] = "Minerando"
-L["Minions"] = true
+L["Minions"] = "Lacaios"
 L["Minus"] = "Menos"
 L["Minutes"] = "Minutos"
-L["Mirror Timers"] = true
+L["Mirror Timers"] = "Barra de Tempos"
 L["Misc Frames"] = "Quadro de Diversos"
-L["Missing Aura"] = true
+L["Missing Aura"] = "Aura Faltando"
 L["Missing"] = "Faltando"
 L["MM:SS Threshold"] = "Limiar MM:SS"
 L["MM:SS"] = true
 L["Model Rotation"] = "Girar o Modelo"
-L["Modified Rate"] = true
-L["Modifier Count"] = true
-L["Modifier for IDs"] = true
+L["Modified Rate"] = "Taxa Modificada"
+L["Modifier Count"] = "Contador de Modificação"
+L["Modifier for IDs"] = "Modificador para IDs"
 L["Module Control"] = "Controle de Módulo"
 L["Module Copy"] = "Copiar Módulo"
 L["Module Reset"] = "Resetar Módulo"
 L["Monitor"] = true
-L["Mouseover Cast Key"] = true
+L["Mouseover Cast Key"] = "Tecla de Lançamento ao Pairar o Mouse"
 L["Mouseover Glow"] = "Brilhar ao Pairar o Mouse"
 L["Mouseover Highlight"] = "Realçar ao Pairar o Mouse"
 L["Mouseover"] = "Pairar o Mouse"
 L["Movers"] = "Movedores"
-L["Multi-Monitor Support"] = "Suporte a Multiplos Monitores"
-L["Multiple Ranks"] = true
+L["Multi-Monitor Support"] = "Suporte a Múltiplos Monitores"
+L["Multiple Ranks"] = "Ranques Múltiplos"
 L["Multiply the backdrops height or width by this value. This is usefull if you wish to have more than one bar behind a backdrop."] = "Multiplicar a altura ou comprimento do fundo por este valor. Muito útil se desejar ter mais que uma barra por trás de um fundo."
-L["Must be in group with the player if he isn't on the same server as you."] = true
-L["My Guild"] = true
-L["Mythic+ Best Run"] = true
-L["Mythic+ Data"] = true
-L["Mythic+ Score"] = true
+L["Must be in group with the player if he isn't on the same server as you."] = "Deve estar em um grupo com o jogador se ele não estiver no mesmo servidor que você."
+L["My Guild"] = "Minha Guilda"
+L["Mythic+ Best Run"] = "Melhor Corrida de Mítica+"
+L["Mythic+ Data"] = "Dados de Mítica+"
+L["Mythic+ Score"] = "Pontuação de Mítica+"
 L["Name Font"] = "Fonte de Nomes"
 L["Name Only"] = "Apenas Nome"
-L["Name Style"] = true
-L["Name Taken"] = true
+L["Name Style"] = "Estilo de Nome"
+L["Name Taken"] = "Nome Tomado"
 L["Name"] = "Nome"
 L["Name: Current / Max - Percent"] = "Nome: Atual / Máximo - Porcentagem"
 L["Name: Current / Max"] = "Nome: Atual / Máximo"
 L["Name: Percent"] = "Nome: Porcentagem"
 L["Nameplate At Base"] = "Placas de identificação na Base"
 L["NamePlate Style Filters"] = "Filtros de Estilo de Placas de identificação"
-L["Nameplate Thin Borders"] = true
+L["Nameplate Thin Borders"] = "Bordas finas de Placas de Identificação"
 L["Nameplate"] = "placa de identificação"
 L["Nameplates"] = "Placas de Identificação"
-L["Names"] = true
-L["Negative Match"] = true
+L["Names"] = "Nomes"
+L["Negative Match"] = "Acerto negativo"
 L["Neutral"] = "Neutro"
-L["New Item Glow"] = true
-L["New Panel"] = true
+L["New Item Glow"] = "Brilho de Item Novo"
+L["New Panel"] = "Novo Painel"
 L["No Alert In Combat"] = "Sem alerta durante combate"
-L["No Duration"] = true
-L["No Icon"] = true
-L["No Label"] = true
-L["No NPC Title"] = true
+L["No Duration"] = "Sem Duração"
+L["No Icon"] = "Sem Ícone"
+L["No Label"] = "Sem Rótulo"
+L["No NPC Title"] = "Sem Título de NPC"
 L["No Sorting"] = "Não organizado"
-L["No Target"] = true
+L["No Target"] = "Sem Alvo"
 L["Non-Interruptible"] = "Não interrompível"
 L["Non-Raid Frame"] = "Quadro Não Raide"
-L["Non-Target Alpha"] = true
-L["Normal Font"] = true
-L["Normal Outline"] = true
-L["Normal Size"] = true
+L["Non-Target Alpha"] = "Transparência de Não Alvo"
+L["Normal Font"] = "Fonte Normal"
+L["Normal Outline"] = "Contorno Normal"
+L["Normal Size"] = "Tamanho Normal"
 L["Normal"] = true
-L["Not Another Players Pet"] = true
-L["Not Being Resurrected"] = true
+L["Not Another Players Pet"] = "Não é mascote de outro jogador"
+L["Not Being Resurrected"] = "Não está sendo Ressuscitado"
 L["Not Casting Anything"] = "Não castando nada"
 L["Not Channeling Anything"] = "Não canalizando nada"
-L["Not Charmed"] = true
+L["Not Charmed"] = "Não Encantado"
 L["Not Focused"] = "Não é o foco"
-L["Not in Party"] = true
-L["Not in Raid"] = true
-L["Not Known"] = true
-L["Not My Guild"] = true
-L["Not Owned By Player"] = true
-L["Not Pet Battle"] = true
-L["Not Pet"] = true
-L["Not Player Controlled"] = true
-L["Not Possessed"] = true
-L["Not PvP"] = true
-L["Not Quest Unit"] = true
-L["Not Resting"] = true
+L["Not in Party"] = "Não está em Grupo"
+L["Not in Raid"] = "Não está em Raíde"
+L["Not Known"] = "Não Conhecido"
+L["Not My Guild"] = "Não é da minha Guilda"
+L["Not Owned By Player"] = "Não pertence a outro Jogador"
+L["Not Pet Battle"] = "Não é Combate de Mascote"
+L["Not Pet"] = "Não é Mascote"
+L["Not Player Controlled"] = "Não é controlado por Jogador"
+L["Not Possessed"] = "Não está possuído"
+L["Not PvP"] = "Não é JxJ"
+L["Not Quest Unit"] = "Não é Unidade de Objetivo"
+L["Not Resting"] = "Não está Descansando"
 L["Not Spell"] = "Não é feitiço"
-L["Not Tap Denied"] = true
+L["Not Tap Denied"] = "Não está Reservado"
 L["Not Targeted"] = "Não é o alvo"
 L["Not Targeting Player"] = "Não tem jogador como alvo"
-L["Not Trivial"] = true
+L["Not Trivial"] = "Não é Trivial"
 L["Not Usable"] = "Não usável"
 L["NPC"] = true
 L["Num Rows"] = "Número de linhas"
-L["Number Allowed"] = true
-L["Number of DataTexts"] = true
+L["Number Allowed"] = "Número Permitido"
+L["Number of DataTexts"] = "Número de Textos de Informação"
 L["Number of Groups"] = "Número de Grupos"
 L["Number of messages you scroll for each step."] = "Número de mensagens você rola cada vez"
 L["Number of repeat characters while in combat before the chat editbox is automatically closed."] = "Número de caracteres repetidos enquanto em combate antes da caixa de edição do bate-papo ser automaticamente fechada."
@@ -1174,55 +1177,55 @@ L["Objective Frame Height"] = "Altura do Quadro de Objetivos"
 L["OBJECTIVES_TRACKER_LABEL"] = "Objetivos"
 L["OBLITERUM_FORGE_TITLE"] = "Forja de Obliterum"
 L["Off Cooldown"] = "Fora do Tempo de Recarga"
-L["Off Tank (Pets)"] = true
-L["Off Tank Bad Transition"] = true
-L["Off Tank Good Transition"] = true
-L["Off Tank"] = true
-L["Officer"] = true
-L["Offset of the powerbar to the healthbar, set to 0 to disable."] = "A distância entre barra de poder e a barra de vida, definir 0 para desactivar."
+L["Off Tank (Pets)"] = "Tanque Secundário (Mascotes)"
+L["Off Tank Bad Transition"] = "Transição Ruim de Tanque Secundário"
+L["Off Tank Good Transition"] = "Transição Boa de Tanque Secundário"
+L["Off Tank"] = "Tanque Secundário"
+L["Officer"] = "Oficial"
+L["Offset of the powerbar to the healthbar, set to 0 to disable."] = "A distância entre barra de poder e a barra de vida, definir 0 para desativar."
 L["Offset"] = "Distância"
 L["On Cooldown"] = "Durante Tempo de Recarga"
 L["On Me"] = "Em Mim"
 L["On Pet"] = "Em Pet"
-L["On screen positions for different elements."] = true
-L["Only Free Slots"] = true
-L["Only highlight the aura that originated from you and not others."] = true
-L["Only load nameplates for units within this range."] = true
-L["Only Low"] = true
+L["On screen positions for different elements."] = "Posições na tela para diferentes elementos."
+L["Only Free Slots"] = "Apenas Vagas Vazias"
+L["Only highlight the aura that originated from you and not others."] = "Apenas destacar a aura que originou de você e não de outros."
+L["Only load nameplates for units within this range."] = "Apenas carregar placas de identificação para unidades dentro desta distância."
+L["Only Low"] = "Apenas Baixos"
 L["Only Match SpellID"] = "Apenas Corresponde ao ID do Feitiço"
-L["Only show icons instead of specialization names"] = true
-L["Only Used Slots"] = true
+L["Only show icons instead of specialization names"] = "Apenas mostrar ícones ao invés de nomes de especializações"
+L["Only Used Slots"] = "Apenas Vagas Utilizadas"
 L["OPACITY"] = "Opacidade"
 L["OPTION_TOOLTIP_ACTION_BUTTON_USE_KEY_DOWN"] = "As ações dos botões serão executadas quando a tecla for pressionada, em vez de quando for solta."
 L["OPTION_TOOLTIP_TIMESTAMPS"] = "Selecione o formato dos carimbos de hora para mensagens de bate-papo."
 L["Order Hall Command Bar"] = "Barra de Comandos do Salão da Ordem"
-L["Orderhall"] = true
-L["Other AddOns"] = true
+L["Orderhall"] = "Salão de Classe"
+L["Other AddOns"] = "Outros AddOns"
 L["Other Filter"] = "Outro Filtro"
 L["Other's First"] = "De outros primeiro"
 L["Others"] = "Outros"
-L["Out of Combat Label"] = true
-L["Out of Combat"] = true
+L["Out of Combat Label"] = "Rótulo Fora de Combate"
+L["Out of Combat"] = "Fora de Combate"
 L["Out of Power"] = "Sem Poder"
 L["Out of Range"] = "Fora de Alcance"
-L["Out of Vehicle"] = true
-L["Over Absorbs"] = true
-L["Over Heal Absorbs"] = true
-L["Over Health Threshold"] = true
-L["Over Power Threshold"] = true
-L["Overflow"] = true
-L["Overlap Horizontal"] = true
-L["Overlap Vertical"] = true
-L["Overlay Alpha"] = true
-L["Overlay mode is forced when the Frame Orientation is set to Middle."] = true
+L["Out of Vehicle"] = "Fora de Veículo"
+L["Over Absorbs"] = "Sobre Absorções"
+L["Over Heal Absorbs"] = "Sobre Absorções de Cura"
+L["Over Health Threshold"] = "Sobre limiar de Vida"
+L["Over Power Threshold"] = "Sobre limiar de Poder"
+L["Overflow"] = "Sobreposição"
+L["Overlap Horizontal"] = "Sobreposição Horizontal"
+L["Overlap Vertical"] = "Sobreposição Vertical"
+L["Overlay Alpha"] = "Transparência de Sobreposição"
+L["Overlay mode is forced when the Frame Orientation is set to Middle."] = "Modo de Sobreposição é forçado quando a Orientação do Quadro estiver em Meio."
 L["Overlay"] = "Sobrepor"
 L["Override the default class color setting."] = "Sobrescreve a configuração de cor de classe padrão."
-L["Owned By Player"] = true
+L["Owned By Player"] = "Possuído por Jogador"
 L["PAIN"] = "Dor"
 L["Panel Backdrop"] = "Fundo do Painel"
 L["Panel Height"] = "Altura do Painel"
-L["Panel Options"] = true
-L["Panel Snapping"] = true
+L["Panel Options"] = "Opções do Painel"
+L["Panel Snapping"] = "Encaixe do Painel"
 L["Panel Texture (Left)"] = "Textura do Painel (Esquerdo)"
 L["Panel Texture (Right)"] = "Textura do Painel (Direito)"
 L["Panel Transparency"] = "Transparência do Painel"
@@ -1230,36 +1233,36 @@ L["Panel Width"] = "Comprimento do Painel"
 L["Panels"] = "Painéis"
 L["Parchment Remover"] = "Removedor de Pergaminho"
 L["Parent"] = "Parente"
-L["Particles"] = true
-L["Party / Raid"] = true
-L["Party Indicator"] = true
+L["Particles"] = "Partículas"
+L["Party / Raid"] = "Grupo / Raíde"
+L["Party Indicator"] = "Indicador de Grupo"
 L["Party Only"] = "Apenas Party"
-L["Party PVP"] = true
-L["Party"] = true
+L["Party PVP"] = "Grupo JxJ"
+L["Party"] = "Grupo"
 L["Pause"] = true
 L["Per Row"] = "Por Linha"
 L["Percent"] = "Porcentagem"
 L["Percentage amount for horizontal overlap of Nameplates."] = "Quantidade (porcentagem) para sobreposição horizontal das Placas de identificação"
 L["Percentage amount for vertical overlap of Nameplates."] = "Quantidade (porcentagem) para sobreposição vertical das Placas de identificação"
-L["Perks"] = true
+L["Perks"] = "Benefícios"
 L["Personal"] = "Pessoal"
 L["Pet Battle"] = "Batalha de Mascote"
-L["Pet Group"] = true
-L["Pet Happiness"] = true
-L["Pet"] = true
+L["Pet Group"] = "Grupo de Mascote"
+L["Pet Happiness"] = "Felicidade do Mascote"
+L["Pet"] = "Mascote"
 L["Petition Frame"] = "Petição"
-L["Pets"] = true
+L["Pets"] = "Mascotes"
 L["PetTarget"] = "Alvo do Pet"
 L["Phase Indicator"] = "Indicador de Phase"
 L["PICKUP_ACTION_KEY_TEXT"] = "Botão de ação de saquear"
 L["Pin Voice Buttons"] = "Pinar Botões de Voz"
 L["Player Bars"] = "Barras de Jogador"
-L["Player Choice Frame"] = true
-L["Player Controlled"] = true
+L["Player Choice Frame"] = "Quadro de Escolha de Jogador"
+L["Player Controlled"] = "Controlado por Jogador"
 L["Player Frame Aura Bars"] = "Barra de Auras do Quadro do Jogador"
 L["Player Health"] = "Vida do Jogador"
 L["Player Power"] = "Poder do Jogador"
-L["Player Spell"] = true
+L["Player Spell"] = "Feitiço de Jogador"
 L["Player Target"] = "Alvo do Jogador"
 L["Player Titles"] = "Títulos dos Jogadores"
 L["Player"] = "Player"
@@ -1281,15 +1284,15 @@ L["Power Threshold"] = "Limiar do Poder"
 L["Power"] = "Poder"
 L["POWER_TYPE_ARCANE_CHARGES"] = "Cargas Arcanas"
 L["POWER_TYPE_ESSENCE"] = "Essência"
-L["Prefer Target Color"] = true
+L["Prefer Target Color"] = "Preferir Cor do Alvo"
 L["Prevent the same messages from displaying in chat more than once within this set amount of seconds, set to zero to disable."] = "Prevenir que as mesmas mensagens sejam exibidas no bate-papo mais que uma vez dentro desta quantidade de segundos, definir 0 para desativar."
 L["Primary Texture"] = "Textura principal"
 L["Priority"] = "prioridade"
 L["Private (Character Settings)"] = "Privado (Configurações do Personagem)"
-L["Private"] = true
+L["Private"] = "Privado"
 L["Profession Bags"] = "Bolsas de Profissão"
-L["Profession Quality"] = true
-L["Professions"] = true
+L["Profession Quality"] = "Qualidade de Profissão"
+L["Professions"] = "Profissão"
 L["PROFESSIONS_COOKING"] = "Culinária"
 L["PROFESSIONS_CRAFTING"] = "Criação"
 L["PROFESSIONS_FISHING"] = "Pesca"
@@ -1297,9 +1300,9 @@ L["Profile imported successfully!"] = "Perfil importado com sucesso!"
 L["Profile Name"] = "Nome do Perfil"
 L["Profile Specific"] = "Perfil-Específico"
 L["Profile"] = "Perfil"
-L["Profiles"] = true
+L["Profiles"] = "Perfis"
 L["Progress Bar"] = "Barra de Progresso"
-L["PTR Version"] = true
+L["PTR Version"] = "Versão PTR"
 L["Puts coordinates on the world map."] = "Colocar Coordenadas no Mapa Mundial"
 L["PvP & Prestige Icon"] = "Ícones PvP & Prestígio"
 L["PvP Classification Indicator"] = "Indicador da Classificação PvP"
@@ -1307,93 +1310,93 @@ L["PvP Frames"] = "Quadro PxP"
 L["PvP Indicator"] = "Indicador PvP"
 L["PvP Text"] = "Texto PvP"
 L["PVP Trinket"] = "Amuleto de PvP"
-L["Quality Background"] = true
-L["Quality Itemlevel"] = true
-L["Quality Name"] = true
-L["Quality StatusBar"] = true
-L["Quest Boss"] = "Boss de Quest"
-L["Quest Choice"] = "Escolha de Quest"
-L["Quest Experience"] = true
+L["Quality Background"] = "Qualidade de Fundo"
+L["Quality Itemlevel"] = "Qualidade de Nível de Item"
+L["Quality Name"] = "Qualidade de Nome"
+L["Quality StatusBar"] = "Barra de Qualidade"
+L["Quest Boss"] = "Chefe de Objetivo"
+L["Quest Choice"] = "Escolha de Objetivo"
+L["Quest Experience"] = "Experiência de Objetivo"
 L["Quest Frames"] = "Quadro de Quests"
-L["Quest Icon"] = true
-L["Quest Starter Icon"] = "Ícone Iniciar Quest"
-L["Quest Starter"] = "Iniciador de Quest"
-L["Quest Unit"] = true
-L["Quests in Current Zone Only"] = true
-L["Quests"] = true
-L["Queue Status"] = true
+L["Quest Icon"] = "Ícone de Objetivo"
+L["Quest Starter Icon"] = "Ícone de Iniciar Objetivo"
+L["Quest Starter"] = "Iniciador de Objetivo"
+L["Quest Unit"] = "Unidade de Objetivo"
+L["Quests in Current Zone Only"] = "Objetivos apenas na Zona Atual"
+L["Quests"] = "Objetivos"
+L["Queue Status"] = "Estado da Fila"
 L["Quick Join Messages"] = "Mensagem de entrada-rápida"
-L["Quiver / Ammo"] = true
+L["Quiver / Ammo"] = "Aljava / Munição"
 L["RAGE"] = "Raiva"
-L["Raid Debuff Indicator"] = "Indicador das Debuffs da Raide"
-L["Raid Difficulty"] = "Dificuldade da Raid"
-L["Raid Frame"] = "Quadro de Raid"
-L["Raid Only"] = "Apenas Raid"
-L["Raid Pet"] = "Pet da Raid"
-L["Raid Role Indicator"] = true
-L["Raid"] = true
-L["Raid-Wide Sorting"] = "Ordenação Raid-Largura"
-L["RAID_CONTROL"] = "Controle de raides"
+L["Raid Debuff Indicator"] = "Indicador das Penalidades da Raíde"
+L["Raid Difficulty"] = "Dificuldade da Raíde"
+L["Raid Frame"] = "Quadro de Raíde"
+L["Raid Only"] = "Apenas Raíde"
+L["Raid Pet"] = "Mascotes da Raíde"
+L["Raid Role Indicator"] = "Indicador de Papel na Raíde"
+L["Raid"] = "Raíde"
+L["Raid-Wide Sorting"] = "Ordenação por toda a Raíde"
+L["RAID_CONTROL"] = "Controle de raídes"
 L["RAID_INFO_WORLD_BOSS"] = "Chefe de mundo:"
 L["Range"] = "Alcance"
-L["Rarity Color"] = true
-L["Reaction Castbars"] = true
-L["Reaction Color"] = true
-L["Reaction Colors"] = true
-L["Reaction Type"] = true
-L["Reaction"] = true
+L["Rarity Color"] = "Cor de Raridade"
+L["Reaction Castbars"] = "Barras de Lançamentos por Reação"
+L["Reaction Color"] = "Cor de Reação"
+L["Reaction Colors"] = "Cores de Reações"
+L["Reaction Type"] = "Tipo de Reação"
+L["Reaction"] = "Reação"
 L["Reactions"] = "Reações"
-L["Ready Check Icon"] = true
-L["Reagent"] = true
+L["Ready Check Icon"] = "Ícone de Checagem de Prontidão"
+L["Reagent"] = "Reagente"
 L["Remaining / Max"] = "Restante / Máximo"
 L["Remaining"] = "Restante"
-L["Remove a Item Name or ID from the list."] = true
+L["Remove a Item Name or ID from the list."] = "Remove um Nome de Item ou ID da lista."
 L["Remove a Name or NPC ID from the list."] = "Remove um Nome ou ID de NPC da lista."
 L["Remove Backdrop"] = "Remover Fundo"
 L["Remove Instance ID"] = "Remover ID da Instância"
-L["Remove Item Name or ID"] = true
+L["Remove Item Name or ID"] = "Remover Nome de Item ou ID"
 L["Remove Map ID"] = "Remover ID do Mapa"
 L["Remove Name or NPC ID"] = "Remover Nome ou ID do NPC"
-L["Remove Spell - %s"] = true
+L["Remove Spell - %s"] = "Remover Feitiço - %s"
 L["Remove Spell ID or Name"] = "Remover ID do Feitiço ou Nome"
 L["Remove Spell"] = "Remover Feitiço"
 L["Remove Subzone Name"] = "Remover Nome da Subzona"
-L["Remove Texture"] = true
+L["Remove Texture"] = "Remover Textura"
 L["Remove Zone Name"] = "Remover Nome da Zona"
-L["Renown"] = true
+L["Renown"] = "Renome"
 L["Replace Blizzard Fonts"] = "Substituir Fontes da Blizzard"
 L["Replace Blizzard's Alternative Power Bar"] = "Substituir Barra de Poder Alternativo da Blizzard"
 L["Replace Blizzard's Voice Overlay."] = "Substituir Sobreposição de Voz da Blizzard."
-L["Replace Combat Font"] = true
-L["Replace Font"] = true
-L["Replace Name Font"] = true
-L["Replace Nameplate Fonts"] = true
-L["Replace Text on Me"] = true
-L["Replaces the default Blizzard fonts on various panels and frames with the fonts chosen in the Media section of the ElvUI Options. NOTE: Any font that inherits from the fonts ElvUI usually replaces will be affected as well if you disable this. Enabled by default."] = true
-L["Replaces the font on Blizzard Nameplates."] = true
-L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."] = true
+L["Replace Combat Font"] = "Substituir Fonte de Combate"
+L["Replace Font"] = "Substituir Fonte"
+L["Replace Name Font"] = "Substituir Fonte do Nome"
+L["Replace Nameplate Fonts"] = "Substituir Fontes das Placas de Identificação"
+L["Replace Text on Me"] = "Substituir Texto em Mim"
+L["Replaces the default Blizzard fonts on various panels and frames with the fonts chosen in the Media section of the ElvUI Options. NOTE: Any font that inherits from the fonts ElvUI usually replaces will be affected as well if you disable this. Enabled by default."] = "Substituir as fontes padrão da Blizzard em vários painéis com as fontes escolhidas na seção de Mídia das Opções do ElvUI. NOTA: Qualquer fonte que segue as fontes que o ElvUI normalmente substitui também será afetada por isto se você desabilitar. Habilitado por padrão."
+L["Replaces the font on Blizzard Nameplates."] = "Substituir a fonte das placas de identificação da Blizzard"
+L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."] = "Substituir a textura da Barra de Estado dos Quadros de Unidades e Placas de Identificação com a textura primária."
 L["Reposition Window"] = "Reposicionar Janela"
-L["Reputation Alpha"] = true
+L["Reputation Alpha"] = "Transparência da Reputação"
 L["Reputation"] = "Reputação"
 L["Require All"] = "Requerer Tudo"
 L["Require holding the Alt key down to move cursor or cycle through messages in the editbox."] = "Requere segurar a tecla ALT para mover or cursor ou percorrer pelas mensagens no box de edição."
-L["Require Target"] = true
-L["Reset Action Paging"] = true
-L["Reset all frames to their original positions."] = true
+L["Require Target"] = "Requerer Alvo"
+L["Reset Action Paging"] = "Restaurar Paginação de Ação"
+L["Reset all frames to their original positions."] = "Restaurar todos os quadros para suas posições originais."
 L["Reset Aura Filters"] = "Restaurar Filtros de Auras"
-L["Reset Chat Position"] = true
-L["Reset CVars"] = "Resetar CVars"
-L["Reset Editbox History"] = true
-L["Reset Filter - %s"] = true
-L["Reset filter priority to the default state."] = "Resetar prioridade de filtros para o status padrão."
-L["Reset Filter"] = "Resetar Filtro"
-L["Reset History"] = true
-L["Reset Nameplate CVars to the ElvUI recommended defaults."] = "Resetar CVars das Placas de identificação para o recomendado pelo ElvUI."
-L["Reset Priority"] = "Resetar Prioridade"
-L["Reset the size and position of this frame."] = true
-L["Reset Zoom"] = "Resetar Zoom"
+L["Reset Chat Position"] = "Restaurar Posição do Bate-papo"
+L["Reset CVars"] = "Restaurar CVars"
+L["Reset Editbox History"] = "Restaurar Histórico da Caixa de Edição"
+L["Reset Filter - %s"] = "Restaurar Filtro - %s"
+L["Reset filter priority to the default state."] = "Restaurar prioridade de filtros para o status padrão."
+L["Reset Filter"] = "Restaurar Filtro"
+L["Reset History"] = "Restaurar Histórico"
+L["Reset Nameplate CVars to the ElvUI recommended defaults."] = "Restaurar CVars das Placas de identificação para o recomendado pelo ElvUI."
+L["Reset Priority"] = "Restaurar Prioridade"
+L["Reset the size and position of this frame."] = "Restaurar o tamanho e posição deste quadro."
+L["Reset Zoom"] = "Restaurar Zoom"
 L["Rest Icon"] = "ìcone de descansar"
-L["Rested Experience"] = true
+L["Rested Experience"] = "Experiência de Descanso"
 L["Restore Bar"] = "Restaurar Barra"
 L["Restore Defaults"] = "Restaurar ao Padrão"
 L["Restore the actionbars default settings"] = "Restaurar as configurações padrões das barras de ações"
@@ -1403,62 +1406,62 @@ L["Return filter to its default state."] = "Retornar filtro para seu status padr
 L["Reverse Bag Slots"] = "Inverter Slots da Bolsa"
 L["Reverse Fill Direction"] = "Inverter Direção de Preenchimento"
 L["Reverse Fill"] = "Inverter Preenchimento"
-L["Reverse Toggle will enable Cooldown Text on this module when the global setting is disabled and disable them when the global setting is enabled."] = true
-L["Reverse Toggle"] = true
-L["Reverse"] = true
+L["Reverse Toggle will enable Cooldown Text on this module when the global setting is disabled and disable them when the global setting is enabled."] = "Inverter a Habilitação vai habilitar o Texto de Recarga deste módulo quando a configuração global estiver desabilitada e irá desabilitá-la quando a configuração global estiver habilitada."
+L["Reverse Toggle"] = "Inverter Habilitação"
+L["Reverse"] = "Inverter"
 L["REVERSE_NEW_LOOT_TEXT"] = "Saquear para a Bolsa mais à Esquerda"
-L["Reversed"] = true
-L["Reward Icon"] = true
-L["Reward Position"] = true
+L["Reversed"] = "Invertido"
+L["Reward Icon"] = "Ìcone de Recompensa"
+L["Reward Position"] = "Posição da Recompensa"
 L["Right Alt"] = "Alt (direito)"
 L["Right Click Self Cast"] = "CliqueDireito para Castar em si"
 L["Right Control"] = "Control (direito)"
 L["Right Only"] = "Somente Direita"
 L["Right Panel Height"] = "Altura do Painel Direito"
 L["Right Panel Width"] = "Largura do Painel Direito"
-L["Right Position"] = true
-L["Right Shift"] = "Shift (esquerdo)"
+L["Right Position"] = "Posição Direita"
+L["Right Shift"] = "Shift Esquerdo"
 L["Right to Left"] = "Esquerda para Direita"
 L["Right"] = "Direita"
-L["Role Icon"] = "Ícone do papel"
-L["Role Order"] = true
+L["Role Icon"] = "Ícone do Papel"
+L["Role Order"] = "Ordem de Papel"
 L["ROLE"] = "Função"
-L["Round Timers"] = true
-L["Run the installation process."] = true
-L["RUNE_BLOOD"] = "Blood Rune"
-L["RUNE_CHARGE"] = "Charging Rune"
-L["RUNE_DEATH"] = "Death Rune"
-L["RUNE_FROST"] = "Frost Rune"
-L["RUNE_UNHOLY"] = "Unholy Rune"
-L["Runeforge"] = true
+L["Round Timers"] = "Tempos Arredondados"
+L["Run the installation process."] = "Rodar o processo de instalação"
+L["RUNE_BLOOD"] = "	Runa de Sangue"
+L["RUNE_CHARGE"] = "Runa Carregando"
+L["RUNE_DEATH"] = "Runa"
+L["RUNE_FROST"] = "Runa Gélida"
+L["RUNE_UNHOLY"] = "Runa Profana"
+L["Runeforge"] = "Runogravura"
 L["RUNES"] = "Runas"
 L["RUNIC_POWER"] = "Poder rúnico"
 L["Say"] = "Dizer"
 L["Scale"] = "Escala"
 L["SCENARIOS"] = "Cenários"
-L["School"] = true
-L["Scrap Icon"] = true
+L["School"] = "Escola"
+L["Scrap Icon"] = "Ícone Sucateável"
 L["SCRAP_BUTTON"] = "Sucatear"
 L["Scroll Interval"] = "Intervalo de Rolar"
-L["Scroll Messages"] = true
+L["Scroll Messages"] = "Mensagems de Rolagem"
 L["Search for a spell name inside of a filter."] = "Procurar por nome de feitiço dentro de um filtro."
-L["Search"] = true
+L["Search"] = "Procurar"
 L["Secondary Texture"] = "Textura secundária"
 L["Seconds"] = "Segundos"
-L["Securely Tanking"] = true
-L["Seen Textures"] = true
+L["Securely Tanking"] = "Tanqueando Seguramente"
+L["Seen Textures"] = "Texturas Vistas"
 L["Select a profile to copy from/to."] = "Selecione um perfil para copiar de -> para."
 L["Select a unit to copy settings from."] = "Selecione uma unidade para que se copiem as definições!"
 L["Select Filter"] = "Selecionar filtros"
 L["Select Spell"] = "Selecionar feitiço"
 L["Select the display method of the portrait."] = "Seleciona o método de exibição do retrato."
-L["Selected Text Color"] = true
-L["Selection Health"] = true
-L["Selection Power"] = true
+L["Selected Text Color"] = "Cor do Texto Selecionado"
+L["Selection Health"] = "Vida Selecionada"
+L["Selection Power"] = "Poder Selecionado"
 L["Selection"] = "Seleção"
-L["Selector Color"] = true
-L["Selector Style"] = true
-L["Self Cast Key"] = true
+L["Selector Color"] = "Cor de Seletor"
+L["Selector Style"] = "Estilo de Seletor"
+L["Self Cast Key"] = "Tecla para Autolançamento"
 L["Sell Interval"] = "Intervalo de Venda"
 L["Send ADDON_ACTION_BLOCKED errors to the Lua Error frame. These errors are less important in most cases and will not effect your game performance. Also a lot of these errors cannot be fixed. Please only report these errors if you notice a Defect in gameplay."] = "Mandar os erros de AÇÃO do ADDON BLOQUEADA para o quadro de erros de Lua. Estes erros são, na maioria das vezes, pouco importantes e não irão afetar o seu desempenho de jogo. Muitos destes erros nao podem ser reparados. Por favor denuncie estes erros apenas se notar problemas no desempenho do jogo."
 L["Sends your current profile to your target."] = "Envia seu perfil atual para seu alvo."
@@ -1467,13 +1470,13 @@ L["Separate Panel Sizes"] = "Tamanhos de Paineis Separados"
 L["Separate"] = "Separar"
 L["Set auras that are not from you to desaturated."] = "Define auras que não são suas para desaturar."
 L["Set Settings to Default"] = "Define as configurações para o padrão"
-L["Set the alpha level of portrait when frame is overlayed."] = true
-L["Set the filter type. Blacklist will hide any auras in the list and show all others. Whitelist will show any auras in the filter and hide all others."] = "Define o tipo de filtro. Lista-negra irá esconder qualquer aura nesta lista e mostrar todas as outras. Lista-branca irá apenas mostrar as auras neste filtro e esconder as outras."
+L["Set the alpha level of portrait when frame is overlayed."] = "Define o nível de transparência para o retrato quando o quadro estiver sobreposicionado."
+L["Set the filter type. Blacklist will hide any auras in the list and show all others. Whitelist will show any auras in the filter and hide all others."] = "Define o tipo de filtro. Lista-negra irá esconder qualquer aura nesta lista e mostrar todas as outras. Lista de Permissão irá apenas mostrar as auras neste filtro e esconder as outras."
 L["Set the font outline."] = "Definir o contorno de fonte."
 L["Set the font size for everything in UI. Note: This doesn't effect somethings that have their own separate options (UnitFrame Font, Datatext Font, ect..)"] = "Define o tamanho da fonte para toda a Interface. Nota: Isto nao afeta coisas que tenham suas prórpias opções de fonte (Quadros de Unidade, Textos Informativos, etc..)"
 L["Set the order that the group will sort."] = "Define a ordem em que o grupo vai se organizar."
 L["Set the orientation of the UnitFrame."] = "Define a orientação da Placa de identificação."
-L["Set the priority order of the spell, please note that prioritys are only used for the raid debuff module, not the standard buff/debuff module. If you want to disable set to zero."] = "Define a ordem prioritária dos feitiços, por favor note que prioridades só são usadas o modo de Debuffs de Raide, não para o modo normal de bônus/Debuffs."
+L["Set the priority order of the spell, please note that prioritys are only used for the raid debuff module, not the standard buff/debuff module. If you want to disable set to zero."] = "Define a ordem prioritária dos feitiços, por favor note que prioridades só são usadas o modo de Penalidades de Raide, não para o modo normal de bônus/penalidades."
 L["Set the size of the individual auras."] = "Definir o tamanho das auras individuais."
 L["Set the size of your bag buttons."] = "Define o tamanho dos botões das Bolsas"
 L["Set the type of auras to show when a unit is a foe."] = "Define o tipo de auras a serem mostradas quando a unidade é um inimigo."
@@ -1484,65 +1487,65 @@ L["Setup on-screen display of information bars."] = "Setup das barras de informa
 L["Share Current Profile"] = "Compartilhar Perfil Atual"
 L["Share Filters"] = "Compartilhar Filtros"
 L["SHIFT_KEY_TEXT"] = "SHIFT"
-L["Short (Whole Numbers Spaced)"] = true
-L["Short (Whole Numbers)"] = "Curto (números inteiros"
+L["Short (Whole Numbers Spaced)"] = "Curto (Números Inteiros Espacionados)"
+L["Short (Whole Numbers)"] = "Curto (Números Inteiros)"
 L["Short Channels"] = "Abreviar os Canáis"
 L["SHORT"] = "Pequeno"
 L["Shortcut to global filters."] = "Atalho para filtros globais"
 L["Shorten the channel names in chat."] = "Abreviar o nome dos canáis no bate-papo."
 L["Should tooltip be anchored to mouse cursor"] = "O tooltip deve ser ancorado ao cursor do mouse"
-L["Show All Tracking Options"] = true
-L["Show an incoming heal prediction bar on the unitframe. Also display a slightly different colored bar for incoming overheals."] = "Mostra a barra de predicção de cura no quadro de unidade. Também exibe uma barra com uma cor ligeiramente diferente para a predicção de sobrecura."
+L["Show All Tracking Options"] = "Mostrar Todas as Opções de Rastreamento"
+L["Show an incoming heal prediction bar on the unitframe. Also display a slightly different colored bar for incoming overheals."] = "Mostra a barra de predição de cura no quadro de unidade. Também exibe uma barra com uma cor ligeiramente diferente para a predição de sobrecura."
 L["Show Assigned Color"] = "Mostrar Cores Atribuídas"
 L["Show Aura From Other Players"] = "Mostrar Auras de outros Jogadores"
 L["Show Auras"] = "Mostrar Auras"
 L["Show Badge"] = "Mostrar Distintivo"
-L["Show Border"] = true
+L["Show Border"] = "Mostrar Borda"
 L["Show Both"] = "Mostrar Ambos"
-L["Show Bubbles"] = true
+L["Show Bubbles"] = "Mostrar Bolhas"
 L["Show clickable Quick Join messages inside of the chat."] = "Mostrar mensagens de entradas-rápidas clicáveis dentro do chat."
-L["Show Coins"] = "Mostrar moedas"
-L["Show Continent"] = true
-L["Show Count"] = true
-L["Show Dispellable Debuffs"] = "Mostrar debuffs dissipáveis"
-L["Show ElvUI users and their version of ElvUI."] = true
-L["Show ElvUI Users"] = true
+L["Show Coins"] = "Mostrar Moedas"
+L["Show Continent"] = "Mostrar Continente"
+L["Show Count"] = "Mostrar Contagem"
+L["Show Dispellable Debuffs"] = "Mostrar penalidades dissipáveis"
+L["Show ElvUI users and their version of ElvUI."] = "Mostrar usuários do ElvUI e a versão do ElvUI deles."
+L["Show ElvUI Users"] = "Mostrar usuários do ElvUI"
 L["Show Empty Buttons"] = "Mostrar botões vazios"
 L["Show For DPS"] = "Mostrar para DPS"
 L["Show For Healers"] = "Mostrar para Healers"
 L["Show For Tanks"] = "Mostrar para Tanks"
 L["Show Icon"] = "Mostrar Ícone"
 L["Show In Combat"] = "Mostrar em Combate"
-L["Show Label"] = true
-L["Show Max Currency"] = true
-L["Show Only Names"] = true
+L["Show Label"] = "Mostrar Rótulo"
+L["Show Max Currency"] = "Mostrar Moeda Máxima"
+L["Show Only Names"] = "Mostrar Apenas Nomes"
 L["Show PvP Badge Indicator if available"] = "Mostrar Indicador de Distintivo de PvP se disponível"
 L["Show Quality Color"] = "Mostrar Cor da Qualidade"
-L["Show QuestXP"] = true
+L["Show QuestXP"] = "Mostrar Experiência de Objetivo"
 L["Show Special Bags Color"] = "Mostrar Cores de Bolsas Especiais"
-L["Show Subzone"] = true
-L["Show Text"] = true
+L["Show Subzone"] = "Mostrar Subzona"
+L["Show Text"] = "Mostrar Texto"
 L["Show the castbar icon desaturated if a spell is not interruptible."] = "Mostrar o ícone da barra de cast desaturado se um feitiço não for interrompível."
 L["Show Title"] = "Mostrar Título"
 L["Show When Not Active"] = "Mostrar Quando Não Ativo"
 L["Show With Target"] = "Mostrar com Alvo"
-L["Show Zone"] = true
+L["Show Zone"] = "Mostrar Zona"
 L["Show"] = "Exibir"
 L["Show/Hide Test Frame"] = "Mostrar/Esconder Quadro de Teste"
-L["Shows a swipe animation when a spell is recharging but still has charges left."] = true
-L["Shows item level of each item, enchants, and gems on the character page."] = "Mostra o Item Level de cada item, encantamentos e gemas na página do personagem."
-L["Shows item level of each item, enchants, and gems when inspecting another player."] = "Mostra o Item Level de cada item, encantamentos e gemas quando inspecionando outros jogadores."
+L["Shows a swipe animation when a spell is recharging but still has charges left."] = "Mostra uma animação de deslizamento quando um feitiço estiver recarregando mas ainda tiver cargas restantes."
+L["Shows item level of each item, enchants, and gems on the character page."] = "Mostra o Nível de Item de cada item, encantamentos e gemas na página do personagem."
+L["Shows item level of each item, enchants, and gems when inspecting another player."] = "Mostra o Nível de Item de cada item, encantamentos e gemas quando inspecionando outros jogadores."
 L["Side Arrows"] = "Setas laterais"
 L["Size and Positions"] = "Tamanhos e Posições"
-L["Size Offset"] = true
+L["Size Offset"] = "Tamanho Deslocado"
 L["Size Override"] = "Sobrescrever Tamanho"
 L["Size"] = "Tamanho"
 L["Skin Backdrop (No Borders)"] = "Redesenhar o Fundo (sem bordas)"
 L["Skin Backdrop"] = "Redesenhar o Fundo"
 L["Skin the blizzard chat bubbles."] = "Redesenhar os balões de conversação da Blizzard"
 L["Skins"] = "Aparências"
-L["Slots"] = true
-L["Small"] = true
+L["Slots"] = "Vagas"
+L["Small"] = "Pequeno"
 L["Smaller World Map Scale"] = "Escala de Mapa Mundial Menor"
 L["Smaller World Map"] = "Mapa Mundial Menor"
 L["Smart Aura Position"] = "Posição de Auras Inteligente"
@@ -1550,109 +1553,109 @@ L["Smart Raid Filter"] = "Filtro de Raid inteligente"
 L["Smart"] = "Inteligente"
 L["Smooth Bars"] = "Barras suaves"
 L["Smooth"] = "Suave"
-L["Smoothing Amount"] = true
+L["Smoothing Amount"] = "Quantidade de Suavização"
 L["Socket Frame"] = "Engaste"
 L["Sort By"] = "Ordernar Por"
 L["Sort Direction"] = "Direção de organização"
 L["Sort Inverted"] = "Organizar Invertido"
 L["Sort Method"] = "Método de organização"
-L["Sorting"] = true
-L["Soul Binds"] = true
+L["Sorting"] = "Ordenação"
+L["Soul Binds"] = "Vínculo de Alma"
 L["SOUL_SHARDS"] = "|4Fragmento:Fragmentos; de Alma"
-L["Soulbinds"] = true
+L["Soulbinds"] = "Vínculos de Almas"
 L["Spaced"] = "Espaçado"
 L["Spacing"] = "Espaçamento"
 L["Spam Interval"] = "Intervalo de Spam"
 L["Spark"] = "Faísca"
 L["Spec Icon"] = "Ícone de Especialização"
-L["Spec/Loadout"] = true
-L["Specializations Only"] = true
+L["Spec/Loadout"] = "Especialização/Configuração"
+L["Specializations Only"] = "Apenas Especializações"
 L["SPEED"] = "Velocidade"
 L["Spell/Item IDs"] = "IDs de Feitiços/Itens"
 L["SPELLBOOK"] = "Grimório"
 L["Split"] = "Dividir"
 L["Stable"] = "Estábulo"
-L["Stack Auras"] = true
-L["Stack Counter"] = "Contador de Stacks"
-L["Stack Threshold"] = "Limiar de Stack"
+L["Stack Auras"] = "Empilhar Auras"
+L["Stack Counter"] = "Contador de Empilhamento"
+L["Stack Threshold"] = "Limiar de Empilhamento"
 L["Start Near Center"] = "Começar perto do Centro"
-L["Status Bar"] = "Barra de Status"
-L["StatusBar Color"] = true
-L["Statusbar Fill Orientation"] = "Orientação do preenchimento da barra de status"
+L["Status Bar"] = "Barra de Estado"
+L["StatusBar Color"] = "Cor da Barra de Estado"
+L["Statusbar Fill Orientation"] = "Orientação do preenchimento da barra de estado"
 L["StatusBar Texture"] = "Textura da barra de estado"
-L["Statusbar"] = true
+L["Statusbar"] = "Barra de Estado"
 L["Sticky Chat"] = "Lembrar Canal"
 L["Strata and Level"] = "Camada e Level"
 L["Style Filter"] = "Filtro de Estilo"
 L["Style"] = "Estilo"
 L["Subzone Name"] = "Nome da Subzona"
-L["Summon Icon"] = "Ícone de Sumonar"
+L["Summon Icon"] = "Ícone de Invocação"
 L["Support"] = "Suporte & Download"
-L["Supported"] = true
+L["Supported"] = "Suportado"
 L["Swap to Alt Power"] = "Mudar para Poder Alternativo"
-L["Swapped Alt Power"] = true
-L["Swipe: Loss of Control"] = true
-L["Swipe: Normal"] = true
+L["Swapped Alt Power"] = "Poder Alternativo Mudado"
+L["Swipe: Loss of Control"] = "Deslizamento: Perda de Controle"
+L["Swipe: Normal"] = "Deslizamento: Normal"
 L["Tab Font Outline"] = "Contorno da fonte da Guia"
 L["Tab Font Size"] = "Tamanho da fonte da Guia"
 L["Tab Font"] = "Fonte da Guia"
 L["Tab Panel Transparency"] = "Transparência do painel da Guia"
 L["Tab Panel"] = "Painel da Guia"
-L["Tab Panels"] = true
-L["Tab Selector"] = true
+L["Tab Panels"] = "Abas do Painel"
+L["Tab Selector"] = "Seletor de Aba"
 L["Tabard Frame"] = "Tabardo"
-L["Table"] = true
-L["Tag Update Rate"] = "Taxa de actualização da Tags."
-L["Tagged NPC"] = true
+L["Table"] = "Tabela"
+L["Tag Update Rate"] = "Taxa de atualização das Tags."
+L["Tagged NPC"] = "NPC Reservado"
 L["TALENTS"] = "Talentos"
-L["Talking Head Backdrop"] = true
-L["Talking Head Scale"] = true
-L["Talking Head"] = true
-L["Tank Colors"] = true
+L["Talking Head Backdrop"] = "Fundo da Cabeça Falante"
+L["Talking Head Scale"] = "Escala da Cabeça Falante"
+L["Talking Head"] = "Cabeça Falante"
+L["Tank Colors"] = "Cores de Tanques"
 L["Tank Frames"] = "Quadro do Tanques"
-L["Tank Icon"] = true
-L["Tank"] = true
-L["Tap Denied"] = true
+L["Tank Icon"] = "Ícone de Tanque"
+L["Tank"] = "Tanque"
+L["Tap Denied"] = "Reservação Negada"
 L["Tapped"] = "Reservado"
-L["Target Aura Expiring"] = true
-L["Target Aura"] = true
-L["Target Group"] = true
+L["Target Aura Expiring"] = "Aura do Alvo Expirando"
+L["Target Aura"] = "Aura do Alvo"
+L["Target Group"] = "Grupo do Alvo"
 L["Target Indicator Color"] = "Indicador da Cor do Alvo"
 L["Target Info"] = "Informações do Alvo"
-L["Target Marker Icon"] = true
+L["Target Marker Icon"] = "Ícone de Marcação de Alvo"
 L["Target On Mouse-Down"] = "Selecionar ao Pressionar o Mouse"
-L["Target Reticle"] = true
-L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = true
+L["Target Reticle"] = "Retículo de Alvo"
+L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = "Selecionar alvo ao apertar o mouse ao invés de soltar.\n|cffff3333Nota:|r Se o Clique estiver instalado e habilitado, esta opção apenas afetará quadros do ElvUI se eles não estiverem bloqueados no Clique."
 L["Target"] = "Alvo"
 L["Target/Low Health Indicator"] = "Indicador de Alvo/Vida Baixa"
-L["Targeted Glow"] = true
-L["Targeting Sound"] = true
-L["Targeting"] = true
+L["Targeted Glow"] = "Brilho quando Mirado"
+L["Targeting Sound"] = "Som quando obtendo Alvo"
+L["Targeting"] = "Mirando"
 L["TargetTarget"] = "AlvoDoAlvo"
 L["TargetTargetTarget"] = "AlvoDoAlvoDoAlvo"
-L["Template"] = true
+L["Template"] = "Modelo"
 L["Testing:"] = "Testar:"
 L["Text Color"] = "Cor do Texto"
 L["Text Fade"] = "Desvanecer Texto"
-L["Text Format"] = "Formato de texto"
-L["Text Justify"] = true
-L["Text Options"] = "Opções de Texto"
-L["Text Position"] = true
+L["Text Format"] = "Formato do texto"
+L["Text Justify"] = "Justificação do Texto"
+L["Text Options"] = "Opções do Texto"
+L["Text Position"] = "Posição do Texto"
 L["Text Threshold"] = "Limiar do Texto"
-L["Text Toggle On NPC"] = "Texto ligado no NPC"
+L["Text Toggle On NPC"] = "Texto Alternado no NPC"
 L["Text"] = "Texto"
-L["Texts"] = true
-L["Texture Matching"] = true
+L["Texts"] = "Textos"
+L["Texture Matching"] = "Textura Igualada"
 L["Texture"] = "Textura"
 L["Textured Icon"] = "Ícone Texturizado"
 L["Textures"] = "Texturas"
 L["The amount of buttons to display per row."] = "Quantidade de botões a serem exibidos por linha."
 L["The amount of buttons to display."] = "Quantidade de botões a serem exibidos"
-L["The button you must hold down in order to drag an ability to another action button."] = "Botão que deve ser pressionado para permitir o arrastar uma habilidade para outro botão de acção"
+L["The button you must hold down in order to drag an ability to another action button."] = "Botão que deve ser pressionado para permitir o arrastar uma habilidade para outro botão de ação"
 L["The debuff needs to reach this amount of stacks before it is shown. Set to 0 to always show the debuff."] = "O debuff precisa alcançar este montante de stacks antes de aparecer. Coloque 0 para sempre mostrá-lo"
-L["The direction that the bag frames be (Horizontal or Vertical)."] = "Direcção em que os quadros das bolsas são (Horizontal ou Vertical)."
-L["The direction that the bag frames will grow from the anchor."] = "Direcção para qual as barras crescerão a partir do seu Fixador."
-L["The direction the auras will grow and then the direction they will grow after they reach the wrap after limit."] = true
+L["The direction that the bag frames be (Horizontal or Vertical)."] = "Direção em que os quadros das bolsas são (Horizontal ou Vertical)."
+L["The direction that the bag frames will grow from the anchor."] = "Direção para qual as barras crescerão a partir do seu Fixador."
+L["The direction the auras will grow and then the direction they will grow after they reach the wrap after limit."] = "A direção que as auras vão crescer e então a direção que elas vão crescer após chegarem no limite."
 L["The display format of the currency icons that get displayed below the main bag. (You have to be watching a currency for this to display)"] = "O formato de exibição dos ícones de moeda exibidos abaixo da bolsa principal. (Para isto ser exibido é necessário que selecione Mostrar na Mochila na moeda desejada na aba Moeda dentro do Quadro do Personagem)."
 L["The display format of the money text that is shown at the top of the main bag."] = "O formato de exibição do texto do dinheiro que é mostrado no topo da bolsa principal."
 L["The display format of the money text that is shown in the gold datatext and its tooltip."] = "O formato de exibição do texto de dinheiro que é mostrado no textos informativos de ouro e sua tooltip."
@@ -1663,7 +1666,7 @@ L["The font that combat text will use. |cffFF3333WARNING: This requires a game r
 L["The font that the core of the UI will use."] = "Fonte que o núcleo da interface usará."
 L["The font that the unitframes will use."] = "A fonte que os quadros de unidades usarão."
 L["The frame is not shown unless you mouse over the frame."] = "A não ser que passe com o rato (mouse) por cima do quadro, este não será mostrado."
-L["The height of the action buttons."] = true
+L["The height of the action buttons."] = "A Altura dos botões de ação."
 L["The initial group will start near the center and grow out."] = "O grupo inicial começara perto do centro e crescerá para fora."
 L["The minimum item level required for it to be shown."] = "O menor item level requerido para que seja mostrado."
 L["The name you have selected is already in use by another element."] = "O nome que escolheu já está a ser usado noutro elemento."
@@ -1675,16 +1678,16 @@ L["The spacing between the backdrop and the buttons."] = "O espaçamento entre o
 L["The texture that will be used mainly for statusbars."] = "Textura que será usada principalmente para a barras de estado."
 L["The Thin Border Theme option will change the overall apperance of your UI. Using Thin Border Theme is a slight performance increase over the traditional layout."] = "O Tema de Bordas Finas irá mudar a aparência geral da sua interface. Usar o Tema de Bordas Finas é uma pequena melhoria comparado ao leiatue tradicional."
 L["The unit prefixes you want to use when values are shortened in ElvUI. This is mostly used on UnitFrames."] = "Os prefixos de unidade que você quer usar quando valores são encurtados pelo ElvUI. Isso é na maioria das vezes usado nos Quadros de Unidades."
-L["The width of the action buttons."] = true
+L["The width of the action buttons."] = "A largura dos botões de ação."
 L["These filters don't use a list of spells like the regular filters. Instead they use the WoW API and some code logic to determine if an aura should be allowed or blocked."] = "Estes filtros não usam uma lista de feitiços como filtros normais. Ao invés disso, eles usam o API do WoW e alguma lógica de codificação para determina se uma aura deve ou não ser bloqueada."
 L["These filters use a list of spells to determine if an aura should be allowed or blocked. The content of these filters can be modified in the Filters section of the config."] = "Estes filtros usam uma lista de feitiços para determinar se uma Aura deve ou não ser bloqueada. O conteúdo desses filtros pode ser modificada nas configurações de Filtros."
 L["Thin Borders"] = "Bordas Finas"
 L["This allows you to create a new datatext which will track the currency with the supplied currency ID. The datatext can be added to a panel immediately after creation."] = "Isto permite que você crie Textos de Informaçãso que irão rastrear a moeda com o ID que foi inserido. O Texto de Informação pode ser adicionado ao painel logo após sua criação."
-L["This changes the size of the Aura Icon by this value."] = true
+L["This changes the size of the Aura Icon by this value."] = "Isto muda o tamanho do Ìcone de Aura por este valor."
 L["This dictates the size of the icon when it is not attached to the castbar."] = "Isso dita o tamanho do ícone quando não está anexado a barra de cast."
 L["This feature will allow you to transfer settings to other characters."] = "Este recurso permite enviar sus configurações a outros personagens."
 L["This is for Customized Icons in your Interface/Icons folder."] = "Isto é para os Ícones Customizados na sua pasta de Interface/Ícones."
-L["This list will display any textures Boss Mods have sent to the Boss Mod Auras element during the current session."] = true
+L["This list will display any textures Boss Mods have sent to the Boss Mod Auras element during the current session."] = "Esta lista vai mostrar qualquer textura que Boss Mods mandou para o elemento de Aura Boss Mod durante a seção atual."
 L["This opens the AuraBar Colors filter. These settings affect specific spells."] = "Isto abre o Filtro de Cores das Barras de Aura. Estas configurações afetam feitiços específicos."
 L["This opens the UnitFrames Color settings. These settings affect all unitframes."] = "Isto abre as configurações de Cor de Quadros de Unidades. Estas configurações afetam TODOS os Quadros de Unidades."
 L["This option allows the overlay to span the whole health, including the background."] = "Esta opção permite a sobreposição abranger toda a vida, incluindo o background."
@@ -1696,98 +1699,98 @@ L["This selects the Chat Frame to use as the output of ElvUI messages."] = "Isto
 L["This setting controls the size of text in item comparison tooltips."] = "Esta opção controla o tamanho do texto na comparação no tooltip."
 L["This setting will be updated upon changing stances."] = "Essa configuração atualizará ao trocar posturas."
 L["This texture will get used on objects like chat windows and dropdown menus."] = "Esta textura será usada em objetos como janelas de bate-papo e menus de suspensão."
-L["This uses the IsPlayerSpell API which is only required sometimes."] = true
-L["This will allow you to toggle flashing of the time datatext when there are calendar invites."] = true
-L["This will join auras together which are normally separated. Example: Bolstering and Force of Nature."] = true
+L["This uses the IsPlayerSpell API which is only required sometimes."] = "Isto utiliza a API IsPlayerSpell da Blizzard que só é necessária as vezes."
+L["This will allow you to toggle flashing of the time datatext when there are calendar invites."] = "Isto vai permitir que voce alterne o brilho do texto de informação de tempo quando tiver convites para o calendário."
+L["This will join auras together which are normally separated. Example: Bolstering and Force of Nature."] = "Isto vai juntar auras que ficam normalmente separadas. Exemplo: Força da Natureza."
 L["This will override the global cooldown settings."] = "Isto irá sobrescrever as configurações globais de Tempo de Recarga."
 L["This will pin the voice buttons to the chat's tab panel. Unchecking it will create a voice button panel with a mover."] = "Isto irá pinar os botões de voz no painel de bate-papo. Deselecionar isto irá criar um botão de voz que pode ser movido."
 L["This will reset the contents of this filter back to default. Any spell you have added to this filter will be removed."] = "Isto irá resetar todo o conteúdo de um filtro de volta para seu padrão. Qualquer feitiço que você adicionou a este filtro será removido."
-L["This works like a macro, you can run different situations to get the actionbar to page differently.\n Example: '[combat] 2;'"] = true
-L["This works like a macro, you can run different situations to get the actionbar to show/hide differently.\n Example: '[combat] show;hide'"] = true
-L["Threat Display Mode"] = "Modo de Exibição de Ameaça"
+L["This works like a macro, you can run different situations to get the actionbar to page differently.\n Example: '[combat] 2;'"] = "Isto funciona como uma macro, você pode ter várias situações para ter a barra de ações paginando diferentemente.\nExemplo: '[combat] 2;'"
+L["This works like a macro, you can run different situations to get the actionbar to show/hide differently.\n Example: '[combat] show;hide'"] = "Isto funciona como uma macro, você pode ter várias situações para ter a barra de ações mostrando/escondendo diferentemente.\nExemplo: '[combat] show;hide'"
+L["Display Mode"] = "Modo de Exibição"
 L["Threat"] = "Aggro"
 L["Threshold (in minutes) before text is shown in the HH:MM format. Set to -1 to never change to this format."] = "Limiar (em minutos) antes do texto ser mostrado no formato HH:MM. Definir -1 para nunca mudar este formato."
 L["Threshold (in seconds) before text is shown in the MM:SS format. Set to -1 to never change to this format."] = "Limiar (em segundos) antes do texto ser mostrado no formato MM:SS. Definir -1 para nunca mudar este formato."
 L["Threshold before text turns red and is in decimal form. Set to -1 for it to never turn red"] = "Limiar antes do texto se tornar vermelho e em forma décimal. Definir -1 para nunca se tornar vermelho"
 L["Threshold before the icon will fade out and back in. Set to -1 to disable."] = "Limiar antes do Ícone desvanecer e voltar. Definir -1 para desabilitar."
 L["Threshold Colors"] = "Cor dos Limiares"
-L["Ticket Tracker"] = true
+L["Ticket Tracker"] = "Rastreador de Ticket"
 L["Ticks"] = "Ticks"
 L["Time Indicator Colors"] = "Cor de Indicadores de Tempo"
 L["Time Options"] = "Opções de Tempo"
 L["Time Remaining"] = "Tempo Remanescente"
-L["Time Text"] = true
+L["Time Text"] = "Tempo de Texto"
 L["Time To Hold"] = "Tempo para Segurar"
 L["Time"] = "Tempo"
 L["TIMEMANAGER_TITLE"] = "Relógio"
-L["Timer Only"] = true
+L["Timer Only"] = "Apenas Tempo"
 L["TIMESTAMPS_LABEL"] = "Registro de hora no bate-papo"
 L["Title will only appear if Name Only is enabled or triggered in a Style Filter."] = "O Título irá apenas aparecer se Apenas Nome estiver habilitado ou ter sido ativado em Estilos de Filtro."
-L["Title"] = true
+L["Title"] = "Título"
 L["Toggle 24-hour mode for the time datatext."] = "Ativar formato 24 horas para o texto informativo de hora"
 L["Toggle Anchors"] = "Mostrar/Ocultar Fixadores"
 L["Toggle Off While In Combat"] = "Desabilitar durante combate."
 L["Toggle On While In Combat"] = "Habilitar durante combate."
 L["Toggle showing of the left and right chat panels."] = "Mostrar/Ocultar os painéis de conversação da esquerda e direita."
-L["Toggle the camera spin on the AFK screen."] = true
+L["Toggle the camera spin on the AFK screen."] = "Alterna a Rotação da Câmera na tela de AFK."
 L["Toggle the chat tab panel backdrop."] = "Mostrar/ocultar o fundo da guia do bate-papo."
 L["Toggle Tutorials"] = "Ativar Tutoriais"
-L["Tooltip Body"] = true
-L["Tooltip Header"] = true
-L["Tooltip Lines"] = true
+L["Tooltip Body"] = "Corpo da Dica"
+L["Tooltip Header"] = "Cabeçalho da Dica"
+L["Tooltip Lines"] = "Linhas da Dica"
 L["Top Arrow"] = "Seta Superior"
 L["Top Left"] = "Seta Esquerda"
 L["Top Panel"] = "Painel Superior"
 L["Top Right"] = "Superior Direito"
 L["Top to Bottom"] = "De cima para baixo"
 L["Top"] = "Superior"
-L["Torghast Level Picker"] = true
+L["Torghast Level Picker"] = "Escolhedor de Nível do Torghast"
 L["TOTEM_AIR"] = "Totem do Ar"
 L["TOTEM_EARTH"] = "Totem da Terra"
 L["TOTEM_FIRE"] = "Totem do Fogo"
 L["TOTEM_WATER"] = "Totem da Água"
 L["Totems"] = "Totens"
-L["Tracked Quests Only"] = true
-L["Tracking"] = true
+L["Tracked Quests Only"] = "Apenas Objetivos Rastreados"
+L["Tracking"] = "Rastreando"
 L["TRADE"] = "Negociar"
 L["TRADESKILLS"] = "Perícias profissionais"
 L["Trainer Frame"] = "Instrutores"
 L["TRANSMOGRIFY"] = "Transmogrificar"
-L["Transparency level when not in combat, no target exists, full health, not casting, and no focus target exists."] = true
+L["Transparency level when not in combat, no target exists, full health, not casting, and no focus target exists."] = "Nível de transparência quando não estiver em combate, nenhum alvo existir, vida cheia, não estiver lançando, e nenhum foco existir."
 L["Transparent"] = "Transparente"
 L["Triggers"] = "Gatilhos"
 L["Trivial"] = true
 L["Turtle Color"] = "Cor para Tartaruga"
 L["Tutorials"] = "Tutoriais"
-L["Ultrawide Support"] = true
-L["Unconscious"] = true
+L["Ultrawide Support"] = "Suporte para Ultrawide"
+L["Unconscious"] = "Inconsciente"
 L["Under Health Threshold"] = "Abaixo do limiar da Vida"
 L["Under Power Threshold"] = "Abaixo do limiar do Poder"
 L["Unfriendly"] = "Não-Amigável"
-L["Unhappy"] = true
-L["Unit Class Color"] = true
+L["Unhappy"] = "Infeliz"
+L["Unit Class Color"] = "Cor de Classe da Unidade"
 L["Unit Conditions"] = "Condições da Unidade"
-L["Unit Faction"] = true
+L["Unit Faction"] = "Facção da Unidade"
 L["Unit Prefix Style"] = "Estilo de Prefixo de Unidade"
 L["Unit Target"] = "Alvo da Unidade"
 L["Unit Type"] = "Tipo de Unidade"
-L["Unit"] = true
+L["Unit"] = "Unidade"
 L["UNIT_NAME_PLAYER_TITLE"] = "Títulos"
 L["UNIT_NAMEPLATES_AUTOMODE"] = "Sempre mostrar placas de nomes"
 L["UNIT_NAMEPLATES_TYPE_1"] = "Placas de identificação sobrepostas"
 L["UNIT_NAMEPLATES_TYPE_2"] = "Placas de identificação empilhadas"
 L["UNIT_NAMEPLATES_TYPES"] = "Tipo de movimento de placas de identificação"
-L["Unitframe Thin Borders"] = true
-L["Unitframes Border"] = true
+L["Unitframe Thin Borders"] = "Bordas Finas dos Quadros de Unidades"
+L["Unitframes Border"] = "Bordas dos Quadros de Unidades"
 L["UnitFrames"] = "Quadro de Unidades"
 L["Unlock various elements of the UI to be repositioned."] = "Destravar vários elementos da interface para serem reposicionados."
 L["Up"] = "Acima"
-L["Upgrade Icon"] = true
-L["URL Links"] = "Links URL"
+L["Upgrade Icon"] = "Ìcone de Upgrade"
+L["URL Links"] = "Links de URL"
 L["Usable"] = "Usável"
 L["Use a more visible flash animation for Auto Attacks."] = "Usar uma animação com flash mais visível para Auto-Ataques."
 L["Use Alt Key"] = "Usar Tecla Alt"
-L["Use Atlas Textures"] = "Usar Texturas Atlas."
+L["Use Atlas Textures"] = "Usar Texturas de Atlas."
 L["Use BattleTag instead of Real ID names in chat. Chat History will always use BattleTag."] = "Usar BattleTag em vez do nome de ID Real no chat. A histórico do chat sempre usará a BattleTag."
 L["Use Blizzard Cleanup"] = "Usar Limpeza da Blizzard"
 L["Use class color for the names of players when they are mentioned."] = "Usar cor da classe para nome de jogadores quando eles são mencionados."
@@ -1796,36 +1799,36 @@ L["Use coin icons instead of colored text."] = "Usar ícones de moedas em vez de
 L["Use Custom Backdrop"] = "Usar Backdrop Customizado"
 L["Use Custom Level"] = "Usar Level Customizado"
 L["Use Custom Strata"] = "Usar Camada Customizada"
-L["Use Dead Backdrop"] = true
-L["Use Default"] = "usar Padrão"
+L["Use Dead Backdrop"] = "Usar Fundo de Morto"
+L["Use Default"] = "Usar Padrão"
 L["Use drag and drop to rearrange filter priority or right click to remove a filter."] = "Usar arrastar e soltar para rearranjar a prioridade de filtros ou clique-direito para remover um filtro."
-L["Use Icons"] = true
+L["Use Icons"] = "Usar Ìcones"
 L["Use Indicator Color"] = "Usar Indicador de Cores"
 L["Use Instance ID or Name"] = "Usar ID de Instância ou Nome"
 L["Use Map ID or Name"] = "Usar ID de Mapa ou Nome"
-L["Use Modifier for Item Count"] = true
-L["Use Off Tank Color when another Tank has threat."] = true
+L["Use Modifier for Item Count"] = "Usar Modificador para Contador de Itens"
+L["Use Off Tank Color when another Tank has threat."] = "Usar Cor de Tanque Secundário quando outro Tanque tiver Ameaça."
 L["Use Portrait"] = "Usar Retrato"
 L["Use Real ID BattleTag"] = "Usar ID Real Battletag"
 L["Use Shift+LeftClick to toggle between friendly or enemy or normal state. Normal state will allow the filter to be checked on all units. Friendly state is for friendly units only and enemy state is for enemy units."] = true
 L["Use Static Position"] = "Usar Posição Estática"
 L["Use Subzone Names"] = "Usar Nomes de Subzonas"
 L["Use the custom backdrop color instead of a multiple of the main color."] = "Usar a cor de fundo da vida personalizada em vez de um multiplo da cor de vida principal."
-L["Use the profile specific filter Aura Indicator (Profile) instead of the global filter Aura Indicator."] = true
-L["Use thin borders on certain nameplate elements."] = true
+L["Use the profile specific filter Aura Indicator (Profile) instead of the global filter Aura Indicator."] = "Usar filtro específico de perfil para o Indicador de Aura (Perfil) ao invés do filtro global Indicador de Aura."
+L["Use thin borders on certain nameplate elements."] = "Usar bordas finas para certos elementos das placas de identificação."
 L["Use thin borders on certain unitframe elements."] = "Usar Bordas Finas em certos elementos de Quadros de Unidades."
 L["Use this backdrop color for units that are dead or ghosts."] = "Usar essa cor de backdrop para unidades que estão mortas ou fantasmas."
 L["Use Threat Color"] = "Usar cor de ameaça"
-L["Use Value Color"] = true
+L["Use Value Color"] = "Usar Cor de Valor"
 L["Use Zone Names"] = "Usar Nome de Zonas"
-L["Used as Raid Debuff Indicator"] = true
-L["Used/Total"] = true
-L["Value"] = true
+L["Used as Raid Debuff Indicator"] = "Usado como Indicador de Penalidade de Raíde"
+L["Used/Total"] = "Usado/Total"
+L["Value"] = "Valor"
 L["Vehicle Exit"] = "Sair do Veículo"
 L["Vehicle Seat Indicator Size"] = "Indicador de Tamanho de Assento de Veículo"
 L["Vehicle"] = "Veículo"
 L["Vendor Gray Detailed Report"] = "Relatório Detalhado de Venda de Cinzentos"
-L["Vendor"] = true
+L["Vendor"] = "Vendedor"
 L["Version"] = "Versão"
 L["Vertical Fill Direction"] = "Direção de Preenchimento Vertical"
 L["Vertical Spacing"] = "Espaçamento Vertical"
@@ -1834,50 +1837,49 @@ L["Visibility State"] = "Estado de Visibilidade"
 L["Visibility"] = "Visibilidade"
 L["VOID_STORAGE"] = "Cofre Etéreo"
 L["WeakAuras"] = true
-L["Weekly Rewards"] = true
+L["Weekly Rewards"] = "Recompensas Semanais"
 L["What point to anchor to the frame you set to attach to."] = "Qual é o ponto a fixar ao quadro que você definiu para ser anexado."
-L["What to attach the anchor frame to."] = true
-L["Whats New"] = true
-L["When disabled, the Chat Background color has to be set via Blizzards Chat Tabs Background setting."] = true
+L["What to attach the anchor frame to."] = "No que fixar a âncora do quadro."
+L["Whats New"] = "O que tem de Novo"
+L["When disabled, the Chat Background color has to be set via Blizzards Chat Tabs Background setting."] = "Quando desabilitado, a cor do Fundo do Bate-papo tem que ser configurada através da configuração de Fundo de Bate-papo da Blizzard"
 L["When enabled it will only show spells that were added to the filter using a spell ID and not a name."] = "Quando habilitado irá apenas mostrar feitiços que foram adicionados ao filtro usando o ID do Feitiço e não o nome."
 L["When enabled the nameplate will stay visible in a locked position."] = "Quando habilitado a Placa de identificação ficará visível em uma área travada."
 L["When in a raid group display if anyone in your raid is targeting the current tooltip unit."] = "Exibe se alguém em sua raide tem como alvo a unidade da tooltip."
 L["When opening the Chat Editbox to type a message having this option set means it will retain the last channel you spoke in. If this option is turned off opening the Chat Editbox should always default to the SAY channel."] = "Ter esta opção ativada significa que sempre que escrever algo será usado o último canal no qual escreveu. Se a opção estiver desativada escreverá sempre no canal padrão DIZER"
-L["When this is enabled, Low Health Threshold colors will not be displayed while targeted."] = true
+L["When this is enabled, Low Health Threshold colors will not be displayed while targeted."] = "Quando estiver habilitado, as cores do Limiar de Vida Baixa não vão ser exibidas quando estiver mirado."
 L["When true, the header includes the player when not in a raid."] = "Quando verdade, o cabeçalho inclui o jogador quando não está em Raide."
 L["When using Static Position, this option also requires the target to be attackable."] = "Quando usando Posição Estática, essa opção também requere que o alvo seja atacável."
 L["When you go AFK display the AFK screen."] = "Quando você ficar AFK mostrar a tela AFK."
-L["Whisper"] = true
-L["Whitelist"] = "Lista Branca"
+L["Whisper"] = "Sussurro"
+L["Whitelist"] = "Lista de Permissão"
 L["Width Multiplier"] = "Multiplicador de Comprimento"
 L["Width"] = "Comprimento"
 L["Wiki:"] = true
 L["Will attempt to sell another item in set interval after previous one was sold."] = "Irá tentar vender outro item num intervalo definido após o anterior ter sido vendido."
-L["Will display mana when main power is:"] = true
-L["Will show Buffs in the Debuff position when there are no Debuffs active, or vice versa."] = "Irá mostrar Buffs na posição de Debuffs quando não tiver Debuffs ativo, ou vice-versa."
+L["Will display mana when main power is:"] = "Irá mostrar mana quando o poder principal for:"
+L["Will show Buffs in the Debuff position when there are no Debuffs active, or vice versa."] = "Irá mostrar Bônus na posição de Penalidades quando não tiver Penalidades ativas, ou vice-versa."
 L["Word Wrap"] = "Enrolar Palavras"
-L["World Latency"] = true
+L["World Latency"] = "Latência do Mundo"
 L["World Map Coordinates"] = "Coordenadas do Mapa Mundial"
 L["WORLD_MAP"] = "Mapa do Mundo"
 L["Wrap After"] = "Enrolar depois"
-L["Wrapped"] = true
+L["Wrapped"] = "Embrulhado"
 L["X-Offset"] = "Distância X"
-L["XP Quest Percent"] = true
+L["XP Quest Percent"] = "Porcentagem de XP do Objetivo"
 L["Y-Offset"] = "Distância Y"
 L["Yell"] = "Gritar"
-L["You are about to reset paging. Are you sure?"] = true
+L["You are about to reset paging. Are you sure?"] = "Você está a prestes de restaurar a paginação. Você tem certeza?"
 L["You are going to copy settings for |cffD3CF00\"%s\"|r from your current |cff4beb2c\"%s\"|r profile to |cff4beb2c\"%s\"|r profile. Are you sure?"] = "Você irá copiar as configurações para |cffD3CF00\"%s\"|r do seu atual perfil |cff4beb2c\"%s\"|r para o perfil |cff4beb2c\"%s\"|r. Você tem certeza?"
 L["You are going to copy settings for |cffD3CF00\"%s\"|r from |cff4beb2c\"%s\"|r profile to your current |cff4beb2c\"%s\"|r profile. Are you sure?"] = "Você irá copiar as configurações para |cffD3CF00\"%s\"|r do perfil |cff4beb2c\"%s\"|r para seu atual perfil |cff4beb2c\"%s\"|r. Você tem certeza?"
 L["You cannot copy settings from the same unit."] = "Você não pode copiar as configurações da mesma unidade."
-L["You cannot copy settings from the same unit."] = true
 L["You do not need to use Is Casting Anything or Is Channeling Anything for these spells to trigger."] = "You não precisa usar Está Castando Qualquer Coisa ou Está Canalizando Qualquer Coisa para esses feitiços desencadearem."
 L["You must be targeting a player."] = "É necessário ter um jogador como alvo."
 L["Your Auras First"] = "Suas auras primeiro"
-L["Zone Button"] = true
+L["Zone Button"] = "Botão de Zona"
 L["Zone Name"] = "Nome da Zona"
-L["|cffFF3333This does not work in Instances or Garrisons!|r"] = true
-L["|cffFF3333This is for information. This will not change the tags in the UI.|r"] = true
-L["|cffFF3333Warning:|r Changing options in this section will apply to all Aura Indicator auras. To change only one Aura, please click \"Configure Auras\" and change that specific Auras settings. If \"Profile Specific\" is selected it will apply to that filter set."] = true
+L["|cffFF3333This does not work in Instances or Garrisons!|r"] = "|cffFF3333Isto não funciona em Instâncias ou Guarnições!|r"
+L["|cffFF3333This is for information. This will not change the tags in the UI.|r"] = "|cffFF3333Isto é para informação. Isto não irá mudar as tags na IU.|r"
+L["|cffFF3333Warning:|r Changing options in this section will apply to all Aura Indicator auras. To change only one Aura, please click \"Configure Auras\" and change that specific Auras settings. If \"Profile Specific\" is selected it will apply to that filter set."] = "|cffFF3333Aviso:|r Mudar as opções nesta seção irá aplicar para todos os Indicadores de Aura. Para mudar para apenas uma Aura, por favor clique \"Configurar Auras\" e mude as configurações daquela Aura específica. Se \"Específico para Perfil\" estiver selecionado ele irá aplicar para aquele filtro."
 L["|cffFF3333Warning:|r Click the arrow on the dropdown box to see a list of spells."] = "|cffFF3333Aviso:|r Clique na seta na caixa de suspensão para ver a lista de feitiços."
 L["|cffFF3333Warning:|r Enable and Number of Groups are managed by Smart Raid Filter. Disable Smart Raid Filter in (UnitFrames - General) to change these settings."] = "|cffFF3333Aviso:|r O botão Habilitar e Número dos Grupos são gerenciados pelo Filtro de Raide Inteligente. Disabilite o Filtro de Raide Inteligente em (Quadro de Unidades - Geral) para mudar essas configurações."
 
@@ -1902,22 +1904,22 @@ L["RAID_TARGET_8"] = "Caveira"
 
 ----------------------------------
 L["BlizzardNameplate"] = "Placas de identificação Blizzard"
-L["blockCastByPlayers"] = "[Bloquear] Castado por Jogadores"
+L["blockCastByPlayers"] = "[Bloquear] Lançado por Jogadores"
 L["blockDispellable"] = "[Bloquear] Dissipável"
 L["blockNoDuration"] = "[Bloquear] Sem Duração"
 L["blockNonPersonal"] = "[Bloquear] Não Pessoal"
 L["blockNotDispellable"] = "[Bloquear] Não Dissipável"
-L["blockMount"] = "[Bloquear] Mount"
-L["Mount"] = true
-L["CastByNPC"] = "Castado por NPC"
-L["CastByPlayers"] = "Castado por Jogador"
-L["CastByUnit"] = "Castado por Unidade"
+L["blockMount"] = "[Bloquear] Montaria"
+L["Mount"] = "Montaria"
+L["CastByNPC"] = "Lançado por NPC"
+L["CastByPlayers"] = "Lançado por Jogador"
+L["CastByUnit"] = "Lançado por Unidade"
 L["Dispellable"] = "Dissipável"
-L["MyPet"] = "MeuPet"
+L["MyPet"] = "MeuMascote"
 L["nonPersonal"] = "Não Pessoal"
-L["notCastByUnit"] = "Não Castado pela Unidade"
+L["notCastByUnit"] = "Não Lançado pela Unidade"
 L["notDispellable"] = "Não Dissipável"
-L["OtherPet"] = "OutroPet"
+L["OtherPet"] = "OutroMascote"
 L["Personal"] = "Pessoal"
 ----------------------------------
 
@@ -1945,26 +1947,26 @@ Example: Interface\AddOns\ElvUI\Core\Media\Textures\Copy
 Para a maioria dos usuários seria mais fácil simplesmente copiar o ficheiro tga na pasta do WoW e depois escrever o nome dele aqui.]=]
 
 ----------  FilterHelp  ----------
-L["*Whitelists:|r ^Boss, Mount, MyPet, OtherPet, Personal, nonPersonal, CastByUnit, notCastByUnit, Dispellable (includes steal-able), notDispellable, CastByNPC, CastByPlayers, BlizzardNameplate|r"] = true
-L["*Blacklists:|r ^blockMount, blockNonPersonal, blockCastByPlayers, blockNoDuration, blockDispellable, blockNotDispellable | A blacklist filter is only effective against filters that come after it in the priority list. It will not block anything from the filters before it.|r"] = true
-L["^A blacklist filter is only effective against filters that come after it in the priority list. It will not block anything from the filters before it."] = true
-L["*Boss:|r ^Auras (debuffs only?) cast by a boss unit.|r"] = true
-L["*Mount:|r ^Auras which are classified as mounts.|r"] = true
-L["*Personal:|r ^Auras cast by yourself.|r"] = true
-L["*nonPersonal:|r ^Auras cast by anyone other than yourself.|r"] = true
-L["*CastByUnit:|r ^Auras cast by the unit of the unitframe or nameplate (so on target frame it only shows auras cast by the target unit).|r"] = true
-L["*notCastByUnit:|r ^Auras cast by anyone other than the unit of the unitframe or nameplate.|r"] = true
-L["*Dispellable:|r ^Auras you can either dispel or spellsteal.|r"] = true
-L["*CastByNPC:|r ^Auras cast by any NPC.|r"] = true
-L["*CastByPlayers:|r ^Auras cast by any player-controlled unit (so no NPCs).|r"] = true
-L["*blockCastByPlayers:|r ^Blocks any aura that is cast by player-controlled units (so will only show auras cast by NPCs).|r"] = true
-L["*blockNoDuration:|r ^Blocks any aura without a duration.|r"] = true
-L["*blockNonPersonal:|r ^Blocks any aura that is not cast by yourself.|r"] = true
-L["*Show Everything:|r ^Set 'Max Duration' to 0 & Leave Priority List Empty or (1) Personal | (2) nonPersonal"] = true
-L["*Block Blacklisted Auras, Show Everything Else:|r ^(1) Blacklist| (2) Personal | (3) nonPersonal"] = true
-L["*Block Auras Without Duration, Show Everything Else:|r ^(1) blockNoDuration | (2) Personal | (3) nonPersonal"] = true
-L["*Block Auras Without Duration, Block Blacklisted Auras, Show Everything Else:|r ^(1) blockNoDuration | (2) Blacklist | (3) Personal | (4) nonPersonal"] = true
-L["*Block Everything, Except Your Own Auras:|r ^(1) Personal"] = true
-L["*Block Everything, Except Whitelisted Auras:|r ^(1) Whitelist"] = true
-L["*Block Everything, Except Whitelisted Auras That Are Cast By Yourself:|r ^(1) blockNonPersonal | (2) Whitelist"] = true
+L["*Whitelists:|r ^Boss, Mount, MyPet, OtherPet, Personal, nonPersonal, CastByUnit, notCastByUnit, Dispellable (includes steal-able), notDispellable, CastByNPC, CastByPlayers, BlizzardNameplate|r"] = "*Lista de Permissão:|r ^Chefe, Montaria, MeuMascote, OutroMascote, Pessoal, Não Pessoal, Lançado por Unidade, Não Lançado pela Unidade, Dissipável (incluindo roubável), não Dissipável, Lançado por NPC, Lançado por Jogador, Placas de identificação Blizzard|r"
+L["*Blacklists:|r ^blockMount, blockNonPersonal, blockCastByPlayers, blockNoDuration, blockDispellable, blockNotDispellable | A blacklist filter is only effective against filters that come after it in the priority list. It will not block anything from the filters before it.|r"] = "*Lista de Bloqueamento:|r ^[Bloquear] Montaria, [Bloquear] Não Pessoal, [Bloquear] Lançado por Jogadores, [Bloquear] Sem Duração, [Bloquear] Dissipável, [Bloquear] Não Dissipável | Um filtro de lista de bloqueamento só é eficaz contra filtros que vem depois dele na lista de prioridade. Ele não vai bloquear nada de filtros antes dele.|r"
+L["^A blacklist filter is only effective against filters that come after it in the priority list. It will not block anything from the filters before it."] =  "^Um filtro de lista de bloqueamento só é eficaz contra filtros que vem depois dele na lista de prioridade. Ele não vai bloquear nada de filtros antes dele."
+L["*Boss:|r ^Auras (debuffs only?) cast by a boss unit.|r"] = "*Chefe:|r ^Auras (apenas penalidades?) lançadas por uma unidade chefe.|r"
+L["*Mount:|r ^Auras which are classified as mounts.|r"] = "*Montaria:|r ^Auras que são classificadas como montarias.|r"
+L["*Personal:|r ^Auras cast by yourself.|r"] = "*Pessoal:|r ^Auras lançadas por você.|r"
+L["*nonPersonal:|r ^Auras cast by anyone other than yourself.|r"] = "*Não Pessoal:|r ^Auras lançadas por outros que não forem você.|r"
+L["*CastByUnit:|r ^Auras cast by the unit of the unitframe or nameplate (so on target frame it only shows auras cast by the target unit).|r"] = "*Lançado por Unidade:|r ^Auras lançadas pela unidade do quadro de unidade ou placa de identificação (então em um quadro de alvo ela apenas mostra auras lançadas pela unidade alvo).|r"
+L["*notCastByUnit:|r ^Auras cast by anyone other than the unit of the unitframe or nameplate.|r"] = "*Não Lançado pela Unidade:|r ^Auras lançadas por qualquer outra unidade que não for a unidade do quadro de unidades ou placa de identificação.|r"
+L["*Dispellable:|r ^Auras you can either dispel or spellsteal.|r"] = "*Dissipável:|r ^Auras que você pode dissipar ou roubar.|r"
+L["*CastByNPC:|r ^Auras cast by any NPC.|r"] = "*Lançado por NPC:|r ^Auras lançadas por qualquer NPC.|r"
+L["*CastByPlayers:|r ^Auras cast by any player-controlled unit (so no NPCs).|r"] = "*Lançado por Jogador:|r ^Auras lançadas por qualquer unidade controlada por jogador (então nenhum NPC).|r"
+L["*blockCastByPlayers:|r ^Blocks any aura that is cast by player-controlled units (so will only show auras cast by NPCs).|r"] = "*[Bloquear] Lançado por Jogadores:|r ^Bloqueia qualquer aura que for lançada por unidade controlada por jogador (então vai mostrar apenas auras lançadas por NPCs).|r"
+L["*blockNoDuration:|r ^Blocks any aura without a duration.|r"] = "*[Bloquear] Sem Duração:|r ^Bloqueia qualquer aura que não tiver duração.|r"
+L["*blockNonPersonal:|r ^Blocks any aura that is not cast by yourself.|r"] = "*[Bloquear] Não Pessoal:|r ^Bloqueia qualquer aura que não for lançada por você.|r"
+L["*Show Everything:|r ^Set 'Max Duration' to 0 & Leave Priority List Empty or (1) Personal | (2) nonPersonal"] = "*Mostrar Tudo:|r ^Configure 'Duração Máxima' para 0 e Deixe a Lista de Prioridades Vazia ou com (1) Pessoal | (2) Não Pessoal"
+L["*Block Blacklisted Auras, Show Everything Else:|r ^(1) Blacklist| (2) Personal | (3) nonPersonal"] = "*Bloquear Auras Bloqueadas, Mostrar Todas as Outras:|r ^(1) Lista de Bloqueamento| (2) Pessoal | (3) Não Pessoal"
+L["*Block Auras Without Duration, Show Everything Else:|r ^(1) blockNoDuration | (2) Personal | (3) nonPersonal"] = "*Bloquear Auras sem Duração, Mostrar Todas as Outras:|r ^(1) [Bloquear] Sem Duração | (2) Pessoal | (3) Não Pessoal"
+L["*Block Auras Without Duration, Block Blacklisted Auras, Show Everything Else:|r ^(1) blockNoDuration | (2) Blacklist | (3) Personal | (4) nonPersonal"] = "*Bloquear Auras sem Duração, Bloquear Auras Bloqueadas, Mostrar Todas as Outraws:|r ^(1) [Bloquear] Sem Duração | (2) Lista de Bloqueamento | (3) Pessoal | (4) Não Pessoal"
+L["*Block Everything, Except Your Own Auras:|r ^(1) Personal"] = "*Bloquear Tudo, Exceto Suas Próprias Auras:|r ^(1) Pessoal"
+L["*Block Everything, Except Whitelisted Auras:|r ^(1) Whitelist"] = "*Bloquear Tudo, Exceto Auras Permitidas:|r ^(1) Lista de Permissão"
+L["*Block Everything, Except Whitelisted Auras That Are Cast By Yourself:|r ^(1) blockNonPersonal | (2) Whitelist"] = "*Bloquear Tudo, Exceto Auras Permitidas Que Forem Lançadas por Você:|r ^(1) [Bloquear] Não Pessoal | (2) Lista de Permissão"
 ----------------------------------
diff --git a/ElvUI_Options/Locales/ruRU.lua b/ElvUI_Options/Locales/ruRU.lua
index 89cb678246..bd5941b640 100644
--- a/ElvUI_Options/Locales/ruRU.lua
+++ b/ElvUI_Options/Locales/ruRU.lua
@@ -16,6 +16,10 @@ L["LEFT"] = "Слева"
 L["RIGHT"] = "Справа"
 L["TOP"] = "Вверху"
 
+L["Primary Unit"] = "Основная цель"
+L["Requires the unit to be the primary target to display."] = "Отображается, когда юнит является основной целью"
+L["Pet Specific"] = "Только для пета"
+L["Use the profile specific filter Aura Indicator (Pet) instead of the global filter Aura Indicator."] = "Использовать зависящий от профиля фильтр Aura Indicator (Pet) вместо глобального фильтра Aura Indicator."
 L["%s and then %s"] = "%s, а затем %s"
 L["24-Hour Time"] = "24х часовой формат"
 L["2D"] = "2D" --Doesn't need translation
@@ -36,13 +40,13 @@ L["Add / Remove"] = "Добавить/Удалить"
 L["Add a Item Name or ID to the list."] = "Добавить название или ID предмета в список."
 L["Add a Name or NPC ID to the list."] = "Добавить имя или ID НИПа в список."
 L["Add a spell to the filter."] = "Добавить заклинание в фильтр"
-L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true
+L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = "Добавьте предмет, перетащив его, через Shift+ЛКМ или введя его ID в это поле."
 L["Add Currency by ID"] = "Добавить ID валюты"
 L["Add Currency"] = "Добавить валюту"
 L["Add Current"] = "Добавить текущее"
 L["Add Instance ID"] = "Добавить ID подземелья"
 L["Add Item Name or ID"] = "Добавить название или ID предмета"
-L["Add Item"] = true
+L["Add Item"] = "Добавить предмет"
 L["Add Map ID"] = "Добавить ID карты"
 L["Add Name or NPC ID"] = "Добавить имя или ID НИПа"
 L["Add Regular Filter"] = "Добавить обычный фильтр"
@@ -598,7 +602,7 @@ L["ENERGY"] = "Энергия"
 L["Energy/Mana Regen Tick"] = "Метка восстановления маны/энергии"
 L["Engineering"] = "Инженерия"
 L["Enhanced PVP Messages"] = "Улучшенные PvP сообщения"
-L["Equipped Item"] = true
+L["Equipped Item"] = "Надетый предмет"
 L["Equipped"] = "Надето"
 L["Error decoding data. Import string may be corrupted!"] = "Ошибка при кодировании. Импортируемая строка может быть повреждена!"
 L["Error exporting profile!"] = "Ошибка при экспорте профиля!"
@@ -606,7 +610,7 @@ L["Event Log"] = "Журнал событий"
 L["Exclude Name"] = "Исключить имя"
 L["Excluded names will not be class colored."] = "Исключенные имена не окрашиваются в цвет класса"
 L["Excluded Names"] = "Исключенные имена"
-L["Expansion Button"] = true
+L["Expansion Button"] = "Кнопка дополнения"
 L["Expansion Landing Page"] = "Страница дополнения"
 L["Expiring"] = "Завершение"
 L["Export Now"] = "Экспортировать"
@@ -746,7 +750,7 @@ L["Height"] = "Высота"
 L["Help Frame"] = "Помощь"
 L["Help"] = "Помощь"
 L["Herbalism"] = "Травы"
-L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true
+L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Здесь вы можете добавить предметы, которые вы хотите исключить из сортировки. Для удаления предмета из списка, кликните по его названию в списке."
 L["HH:MM Threshold"] = "Граница ЧЧ:ММ"
 L["HH:MM"] = "ЧЧ:ММ"
 L["Hide At Max Level"] = "Прятать на максимальном уровне"
@@ -883,8 +887,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac
 L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "Если у Вас установлены плагины, которые поддерживают этот функционал, Вы можете найти их в выпадающем списке справа."
 L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Если Вы разблокируете панели, а затем попытаетесь переместить заклинание, оно может быть применено мгновенно, если включено применение при нажатии."
 L["Ignore mouse events."] = "Игнорировать мышь"
-L["Ignored Items (Global)"] = true
-L["Ignored Items (Profile)"] = true
+L["Ignored Items (Global)"] = "Игнорируемые предметы (Глобально)"
+L["Ignored Items (Profile)"] = "Игнорируемые предметы (Профиль)"
 L["Import Now"] = "Импортировать"
 L["Import Profile"] = "Импорт профиля"
 L["Import"] = "Импорт"
@@ -1631,7 +1635,7 @@ L["Target Indicator Color"] = "Цвет индикатора цели"
 L["Target Info"] = "Информация о цели"
 L["Target Marker Icon"] = "Метка цели"
 L["Target On Mouse-Down"] = "Выделение при нажатии"
-L["Target Reticle"] = true
+L["Target Reticle"] = "Текстура прицеливания"
 L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = "Выделять цели при нажатии, а не отпускании кнопки мыши.\n|cffff3333Внимание:|r Если включен Clique, то опция будет работать только если рамки ElvUI не заигнорены в нем."
 L["Target"] = "Цель"
 L["Target/Low Health Indicator"] = "Индикатор цели"
@@ -1714,7 +1718,7 @@ L["This will pin the voice buttons to the chat's tab panel. Unchecking it will c
 L["This will reset the contents of this filter back to default. Any spell you have added to this filter will be removed."] = "Это сбросит фильтр на значения по умолчанию. Любые заклинания, добавленные в этот фильтр, будут удалены."
 L["This works like a macro, you can run different situations to get the actionbar to page differently.\n Example: '[combat] 2;'"] = "Работает как макрос. Вы можете задать ситуации для показа нужной панели.\n Пример '[combat] 2;'"
 L["This works like a macro, you can run different situations to get the actionbar to show/hide differently.\n Example: '[combat] show;hide'"] = "Работает как в макросах. Вы можете задать различные ситуации, при которых нужно показать/скрыть панель.\n Пример: '[combat] show;hide'"
-L["Threat Display Mode"] = "Режим отображения угрозы"
+L["Display Mode"] = "Режим отображения"
 L["Threat"] = "Угроза"
 L["Threshold (in minutes) before text is shown in the HH:MM format. Set to -1 to never change to this format."] = "Значение (в минутах), после которого текст восстановления перейдет в формат ЧЧ:ММ. Установите на -1, чтобы никогда не использовать данный формат."
 L["Threshold (in seconds) before text is shown in the MM:SS format. Set to -1 to never change to this format."] = "Значение (в секундах), после которого текст восстановления перейдет в формат ММ:СС. Установите на -1, чтобы никогда не использовать данный формат."
@@ -1871,7 +1875,7 @@ L["World Latency"] = "Глобальная задержка"
 L["World Map Coordinates"] = "Координаты карты мира"
 L["WORLD_MAP"] = "Карта мира"
 L["Wrap After"] = "Размер ряда"
-L["Wrapped"] = true
+L["Wrapped"] = "Обычный + Обратный"
 L["X-Offset"] = "Отступ по X"
 L["XP Quest Percent"] = "Процент опыта задания"
 L["Y-Offset"] = "Отступ по Y"
diff --git a/ElvUI_Options/Locales/trTR.lua b/ElvUI_Options/Locales/trTR.lua
index a1ab69d2c6..2f9bf18292 100644
--- a/ElvUI_Options/Locales/trTR.lua
+++ b/ElvUI_Options/Locales/trTR.lua
@@ -16,6 +16,10 @@ L["LEFT"] = true
 L["RIGHT"] = true
 L["TOP"] = true
 
+L["Primary Unit"] = true
+L["Requires the unit to be the primary target to display."] = true
+L["Pet Specific"] = true
+L["Use the profile specific filter Aura Indicator (Pet) instead of the global filter Aura Indicator."] = true
 L["%s and then %s"] = "%s ve ardından %s"
 L["24-Hour Time"] = "24 Saatlik Zaman"
 L["2D"] = true
@@ -1704,7 +1708,7 @@ L["This will pin the voice buttons to the chat's tab panel. Unchecking it will c
 L["This will reset the contents of this filter back to default. Any spell you have added to this filter will be removed."] = "Bu, bu filtrenin icerigini varsayilana sifirlayacaktir. Bu filtreye eklediginiz tum buyuler kaldirilacaktir."
 L["This works like a macro, you can run different situations to get the actionbar to page differently.\n Example: '[combat] 2;'"] = true
 L["This works like a macro, you can run different situations to get the actionbar to show/hide differently.\n Example: '[combat] show;hide'"] = "Bu bir makro gibi calisir, eylem cubugunun farkli sekilde gosterilmesini/gizlenmesini saglamak icin farkli durumlar calistirabilirsiniz.\n ornek: '[catisma] goster;gizle'"
-L["Threat Display Mode"] = "Hiddet Goruntuleme Modu"
+L["Display Mode"] = "Ekran Modu"
 L["Threat"] = "Hiddet"
 L["Threshold (in minutes) before text is shown in the HH:MM format. Set to -1 to never change to this format."] = "Metnin SS:DD biciminde gosterilmesinden onceki esik (dakika cinsinden). Bu bicimi hicbir zaman degistirmemek icin -1'e ayarlayin."
 L["Threshold (in seconds) before text is shown in the MM:SS format. Set to -1 to never change to this format."] = "Metin MM:SS biciminde gosterilmeden onceki esik (saniye cinsinden). Bu bicimi hicbir zaman degistirmemek icin -1'e ayarlayin."
diff --git a/ElvUI_Options/Locales/zhCN.lua b/ElvUI_Options/Locales/zhCN.lua
index c6149b53fd..dc1a349d74 100644
--- a/ElvUI_Options/Locales/zhCN.lua
+++ b/ElvUI_Options/Locales/zhCN.lua
@@ -16,6 +16,10 @@ L["LEFT"] = true
 L["RIGHT"] = true
 L["TOP"] = true
 
+L["Primary Unit"] = true
+L["Requires the unit to be the primary target to display."] = true
+L["Pet Specific"] = true
+L["Use the profile specific filter Aura Indicator (Pet) instead of the global filter Aura Indicator."] = true
 L["%s and then %s"] = "%s 于 %s"
 L["24-Hour Time"] = "24小时制"
 L["2D"] = "2D"
@@ -1704,7 +1708,7 @@ L["This will pin the voice buttons to the chat's tab panel. Unchecking it will c
 L["This will reset the contents of this filter back to default. Any spell you have added to this filter will be removed."] = "这会重置这个过滤器到初始状态. 你添加到这个过滤器的任何技能都会被移除."
 L["This works like a macro, you can run different situations to get the actionbar to page differently.\n Example: '[combat] 2;'"] = true
 L["This works like a macro, you can run different situations to get the actionbar to show/hide differently.\n Example: '[combat] show;hide'"] = "这就像一个宏，你可以运行不同的情况来让动作条以不同的方式显示/隐藏。\n 示例：'[combat] show;hide'"
-L["Threat Display Mode"] = "仇恨显示模式"
+L["Display Mode"] = "显示模式"
 L["Threat"] = "仇恨"
 L["Threshold (in minutes) before text is shown in the HH:MM format. Set to -1 to never change to this format."] = "文字以时:分格式显示的阈值(单位:分). 设为-1以禁用此格式."
 L["Threshold (in seconds) before text is shown in the MM:SS format. Set to -1 to never change to this format."] = "文字以分:秒格式显示的阈值(单位:秒). 设为-1以禁用此格式."
diff --git a/ElvUI_Options/Locales/zhTW.lua b/ElvUI_Options/Locales/zhTW.lua
index 670f4e62c1..f7ddcf7de6 100644
--- a/ElvUI_Options/Locales/zhTW.lua
+++ b/ElvUI_Options/Locales/zhTW.lua
@@ -16,6 +16,10 @@ L["LEFT"] = true
 L["RIGHT"] = true
 L["TOP"] = true
 
+L["Primary Unit"] = true
+L["Requires the unit to be the primary target to display."] = true
+L["Pet Specific"] = true
+L["Use the profile specific filter Aura Indicator (Pet) instead of the global filter Aura Indicator."] = true
 L["%s and then %s"] = "%s 與 %s"
 L["24-Hour Time"] = "24小時制"
 L["2D"] = "2D"
@@ -1703,7 +1707,7 @@ L["This will pin the voice buttons to the chat's tab panel. Unchecking it will c
 L["This will reset the contents of this filter back to default. Any spell you have added to this filter will be removed."] = "這會重置這個過濾器到初始狀態. 你添加到這個過濾器的任何技能都會被刪除."
 L["This works like a macro, you can run different situations to get the actionbar to page differently.\n Example: '[combat] 2;'"] = true
 L["This works like a macro, you can run different situations to get the actionbar to show/hide differently.\n Example: '[combat] show;hide'"] = "這和巨集一樣工作, 能根據不同情況顯示/隱藏快捷列.\n例如: '[combat] show;hide'"
-L["Threat Display Mode"] = "仇恨顯示模式"
+L["Display Mode"] = "顯示模式"
 L["Threat"] = "仇恨"
 L["Threshold (in minutes) before text is shown in the HH:MM format. Set to -1 to never change to this format."] = "低於設定的閾值（單位：分）時, 將會採用 HH:MM 的格式. 設定為 -1 可禁用改格式"
 L["Threshold (in seconds) before text is shown in the MM:SS format. Set to -1 to never change to this format."] = "低於設定的閾值（單位：秒）時, 將會採用 MM:SS 的格式. 設定為 -1 可禁用改格式"