From b5fa56b6f63bd2f3634992e70552fe48576d5328 Mon Sep 17 00:00:00 2001
From: Krowi <Krowi@Home>
Date: Mon, 23 Dec 2024 11:01:06 +0100
Subject: [PATCH] see changelog

---
 .vscode/settings.json                         |   8 +-
 Api/AchievementDataApi.lua                    |  16 +-
 CHANGELOG.md                                  |   1 +
 Changelogs/Changelog.md                       |   7 +
 Changelogs/CurseForge.md                      |   8 +
 Changelogs/Wago.md                            |   7 +
 Changelogs/WowInterface.md                    |   9 +
 .../03_WrathOfTheLichKing/AchievementData.lua |   6 +
 .../04_Cataclysm/AchievementData.lua          |   7 +-
 .../03_WrathOfTheLichKing/AchievementData.lua |   6 +
 .../Retail/04_Cataclysm/AchievementData.lua   |   7 +-
 .../05_MistsOfPandaria/AchievementData.lua    |  29 +-
 .../06_WarlordsOfDaenor/AchievementData.lua   | 226 +++++++++-
 .../Retail/07_Legion/AchievementData.lua      |  59 +++
 .../08_BattleForAzeroth/AchievementData.lua   |  48 ++-
 .../Retail/09_Shadowlands/AchievementData.lua |  56 ++-
 .../10_Dragonflight/AchievementData.lua       | 194 +++++++--
 .../11_TheWarWithin/AchievementData.lua       | 394 +++++++++++++++---
 .../FilterButton/FilterButtonClassicMixin.lua |  11 +
 .../FilterButton/FilterButtonMixin.lua        |  31 +-
 .../FilterButton/FilterButtonModernMixin.lua  |  10 +
 Localization/GlobalStrings.lua                |   8 +-
 Localization/deDE.lua                         |   4 +-
 Localization/enUS.lua                         |  16 +-
 Localization/frFR.lua                         |   4 +-
 Localization/ruRU.lua                         |   4 +-
 Localization/zhCN.lua                         |  14 +-
 27 files changed, 1034 insertions(+), 156 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index f7299c83..ed3621c7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -524,7 +524,13 @@
         "MenuUtil",
         "GameTooltip_AddColoredLine",
         "REPUTATION_SORT_TYPE_ACCOUNT",
-        "EnumUtil"
+        "EnumUtil",
+        "MOUNT",
+        "PET",
+        "TABARDSLOT",
+        "LFG_LIST_TITLE",
+        "TOY",
+        "PERKS_VENDOR_CATEGORY_TRANSMOG"
     ],
     "Lua.diagnostics.disable": [
         "deprecated",
diff --git a/Api/AchievementDataApi.lua b/Api/AchievementDataApi.lua
index af6c1b85..954aba32 100644
--- a/Api/AchievementDataApi.lua
+++ b/Api/AchievementDataApi.lua
@@ -8,15 +8,17 @@ KrowiAF.Enum.Faction = EnumUtil.MakeEnum(
 KrowiAF.Enum.RewardType = EnumUtil.MakeEnum(
     "NotCategorized",
     "Other",
-    "Toy",
-    "Pet",
-    "Title",
+    "AlliedRace",
+    "Garrison",
     "Mount",
-    "Transmog",
-    "Item",
-    "Teleport",
+    "Pet",
     "RemixPandariaBronze",
-    "Tabard"
+    "Tabard",
+    "Teleport",
+    "Title",
+    "Toy",
+    "TradersTender",
+    "Transmog"
 );
 
 KrowiAF.AchievementData = {};
diff --git a/CHANGELOG.md b/CHANGELOG.md
index be2df365..e0a58092 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 - Shadowlands Mythic+ season categories in the Specials tab
 - Achievements can now have multiple moments when they were available to earn
 - Cross-Expansion - Delves category is now moved from The War Within to Cross-Expansion
+- Has Reward filter with additional reward type filters
 
 ### Changed
 - Factions and EventType are now accessible trough the API system
diff --git a/Changelogs/Changelog.md b/Changelogs/Changelog.md
index 355c9181..b118cf03 100644
--- a/Changelogs/Changelog.md
+++ b/Changelogs/Changelog.md
@@ -1,5 +1,12 @@
 ### Added
 - The watch list can now be a mix of account wide achievements for one character, character specific achievements for another character or all account wide or character specific
+- Shadowlands Mythic+ season categories in the Specials tab
+- Achievements can now have multiple moments when they were available to earn
+- Cross-Expansion - Delves category is now moved from The War Within to Cross-Expansion
+- Has Reward filter with additional reward type filters
+
+### Changed
+- Factions and EventType are now accessible trough the API system
 
 ### Fixed
 - When marking an achievement as watched, the view should no longer completely reset
\ No newline at end of file
diff --git a/Changelogs/CurseForge.md b/Changelogs/CurseForge.md
index 650053e6..7d896da5 100644
--- a/Changelogs/CurseForge.md
+++ b/Changelogs/CurseForge.md
@@ -1,6 +1,14 @@
 <p><h3>Added</h3></p>
 <ul>
 <li>The watch list can now be a mix of account wide achievements for one character, character specific achievements for another character or all account wide or character specific</li>
+<li>Shadowlands Mythic+ season categories in the Specials tab</li>
+<li>Achievements can now have multiple moments when they were available to earn</li>
+<li>Cross-Expansion - Delves category is now moved from The War Within to Cross-Expansion</li>
+<li>Has Reward filter with additional reward type filters</li>
+</ul>
+<p><h3>Changed</h3></p>
+<ul>
+<li>Factions and EventType are now accessible trough the API system</li>
 </ul>
 <p><h3>Fixed</h3></p>
 <ul>
diff --git a/Changelogs/Wago.md b/Changelogs/Wago.md
index 355c9181..b118cf03 100644
--- a/Changelogs/Wago.md
+++ b/Changelogs/Wago.md
@@ -1,5 +1,12 @@
 ### Added
 - The watch list can now be a mix of account wide achievements for one character, character specific achievements for another character or all account wide or character specific
+- Shadowlands Mythic+ season categories in the Specials tab
+- Achievements can now have multiple moments when they were available to earn
+- Cross-Expansion - Delves category is now moved from The War Within to Cross-Expansion
+- Has Reward filter with additional reward type filters
+
+### Changed
+- Factions and EventType are now accessible trough the API system
 
 ### Fixed
 - When marking an achievement as watched, the view should no longer completely reset
\ No newline at end of file
diff --git a/Changelogs/WowInterface.md b/Changelogs/WowInterface.md
index bb389acb..8d78461d 100644
--- a/Changelogs/WowInterface.md
+++ b/Changelogs/WowInterface.md
@@ -1,6 +1,15 @@
 [B]Added[/B]
 [LIST]
 [*]The watch list can now be a mix of account wide achievements for one character, character specific achievements for another character or all account wide or character specific
+[*]Shadowlands Mythic+ season categories in the Specials tab
+[*]Achievements can now have multiple moments when they were available to earn
+[*]Cross-Expansion - Delves category is now moved from The War Within to Cross-Expansion
+[*]Has Reward filter with additional reward type filters
+[/LIST]
+
+[B]Changed[/B]
+[LIST]
+[*]Factions and EventType are now accessible trough the API system
 [/LIST]
 
 [B]Fixed[/B]
diff --git a/DataAddons/CataClassic/03_WrathOfTheLichKing/AchievementData.lua b/DataAddons/CataClassic/03_WrathOfTheLichKing/AchievementData.lua
index f6e90a22..2c63b2bc 100644
--- a/DataAddons/CataClassic/03_WrathOfTheLichKing/AchievementData.lua
+++ b/DataAddons/CataClassic/03_WrathOfTheLichKing/AchievementData.lua
@@ -4879,11 +4879,17 @@ KrowiAF.AchievementData["03_01_00"] = {
         3676,
         faction.Alliance,
         3677,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- The Sunreavers
         3677,
         faction.Horde,
         3676,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     {3736}, -- Pony Up!
     { -- Furious Gladiator's Frost Wyrm
diff --git a/DataAddons/CataClassic/04_Cataclysm/AchievementData.lua b/DataAddons/CataClassic/04_Cataclysm/AchievementData.lua
index a4cb3f42..5ee189b6 100644
--- a/DataAddons/CataClassic/04_Cataclysm/AchievementData.lua
+++ b/DataAddons/CataClassic/04_Cataclysm/AchievementData.lua
@@ -1599,7 +1599,12 @@ KrowiAF.AchievementData["04_02_00"] = {
     },
     {5855}, -- Ragnar-O's
     {5858}, -- Bear-ly Made It
-    {5859}, -- Legacy of Leyara
+    { -- Legacy of Leyara
+		5859,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
 	{ -- The 'Unbeatable?' Pterodactyl: BEATEN.
 		5860,
 		{
diff --git a/DataAddons/Retail/03_WrathOfTheLichKing/AchievementData.lua b/DataAddons/Retail/03_WrathOfTheLichKing/AchievementData.lua
index e10ad893..1190f3c3 100644
--- a/DataAddons/Retail/03_WrathOfTheLichKing/AchievementData.lua
+++ b/DataAddons/Retail/03_WrathOfTheLichKing/AchievementData.lua
@@ -4657,11 +4657,17 @@ KrowiAF.AchievementData["03_01_00"] = {
         3676,
         faction.Alliance,
         3677,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- The Sunreavers
         3677,
         faction.Horde,
         3676,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     {3736}, -- Pony Up!
     { -- Furious Gladiator's Frost Wyrm
diff --git a/DataAddons/Retail/04_Cataclysm/AchievementData.lua b/DataAddons/Retail/04_Cataclysm/AchievementData.lua
index 1d7fe631..573af8b2 100644
--- a/DataAddons/Retail/04_Cataclysm/AchievementData.lua
+++ b/DataAddons/Retail/04_Cataclysm/AchievementData.lua
@@ -1532,7 +1532,12 @@ KrowiAF.AchievementData["04_02_00"] = {
     {5851}, -- Gone Fishin'
     {5855}, -- Ragnar-O's
     {5858}, -- Bear-ly Made It
-    {5859}, -- Legacy of Leyara
+    { -- Legacy of Leyara
+		5859,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
 	{ -- The 'Unbeatable?' Pterodactyl: BEATEN.
 		5860,
 		{
diff --git a/DataAddons/Retail/05_MistsOfPandaria/AchievementData.lua b/DataAddons/Retail/05_MistsOfPandaria/AchievementData.lua
index 7310f674..ea10c2dc 100644
--- a/DataAddons/Retail/05_MistsOfPandaria/AchievementData.lua
+++ b/DataAddons/Retail/05_MistsOfPandaria/AchievementData.lua
@@ -57,6 +57,7 @@ KrowiAF.AchievementData["05_00_04"] = {
     { -- Challenge Conqueror: Gold
         6378,
         {
+            RewardType = rewardType.Transmog,
             {"Before", "Version", {6, 0, 2}},
         },
     },
@@ -1180,9 +1181,24 @@ KrowiAF.AchievementData["05_00_04"] = {
     {7379}, -- Pandaren Master of All
     {7380}, -- Double Agent
     {7381}, -- Restore Balance
-    {7382}, -- Dynamic Duo
-    {7383}, -- Terrific Trio
-    {7384}, -- Quintessential Quintet
+    { -- Dynamic Duo
+		7382,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- Terrific Trio
+		7383,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- Quintessential Quintet
+		7384,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
 	{ -- Pub Crawl
 		7385,
 		{
@@ -1406,7 +1422,12 @@ KrowiAF.AchievementData["05_01_00"] = {
             RewardType = rewardType.Mount,
         },
     },
-    {7908}, -- I Choose You
+    { -- I Choose You
+		7908,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
     { -- Operation: Shieldwall Campaign
         7928,
         faction.Alliance,
diff --git a/DataAddons/Retail/06_WarlordsOfDaenor/AchievementData.lua b/DataAddons/Retail/06_WarlordsOfDaenor/AchievementData.lua
index 0c92f83e..4d6631ee 100644
--- a/DataAddons/Retail/06_WarlordsOfDaenor/AchievementData.lua
+++ b/DataAddons/Retail/06_WarlordsOfDaenor/AchievementData.lua
@@ -9,6 +9,9 @@ KrowiAF.AchievementData["06_00_02"] = {
         8671,
         faction.Horde,
         8845,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- You're Really Doing It Wrong (Level 90)
         8812,
@@ -29,6 +32,9 @@ KrowiAF.AchievementData["06_00_02"] = {
         8845,
         faction.Alliance,
         8671,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- Skyreach Challenger
         8871,
@@ -203,6 +209,7 @@ KrowiAF.AchievementData["06_00_02"] = {
     { -- Challenge Warlord: Gold
         8899,
         {
+            RewardType = rewardType.Transmog,
             {"Before", "Version", {7, 0, 3}},
         },
     },
@@ -219,11 +226,17 @@ KrowiAF.AchievementData["06_00_02"] = {
         8919,
         faction.Horde,
         8920,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- Don't Let the Tala-door Hit You on the Way Out
         8920,
         faction.Alliance,
         8919,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- Welcome to Draenor
         8921,
@@ -239,33 +252,56 @@ KrowiAF.AchievementData["06_00_02"] = {
         8923,
         faction.Alliance,
         8924,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- Putting the Gore in Gorgrond
         8924,
         faction.Horde,
         8923,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- Between Arak and a Hard Place
         8925,
         faction.Alliance,
         8926,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- Between Arak and a Hard Place
         8926,
         faction.Horde,
         8925,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- Nagrandeur
         8927,
         faction.Alliance,
         8928,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- Nagrandeur
         8928,
         faction.Horde,
         8927,
+        {
+            RewardType = rewardType.Other,
+        },
     },
-    {8929}, -- The Steel Has Been Brought
+    { -- The Steel Has Been Brought
+		8929,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     {8930}, -- Ya, We've Got Time...
     {8932}, -- Mythic: Flamebender Ka'graz
     {8933}, -- Staying Regular
@@ -530,7 +566,12 @@ KrowiAF.AchievementData["06_00_02"] = {
     {9125}, -- Draftsman
     {9126}, -- Master Draftsman
     {9128}, -- Grand Master Draftsman
-    {9129}, -- Filling the Ranks
+    { -- Filling the Ranks
+		9129,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     {9130}, -- A Rare Friend
     {9131}, -- An Epic Buddy
     { -- Garrison Buddies
@@ -568,6 +609,7 @@ KrowiAF.AchievementData["06_00_02"] = {
         faction.Alliance,
         9173,
         {
+            RewardType = rewardType.Other,
             {"Before", "Version", {7, 0, 3}},
         },
     },
@@ -601,6 +643,7 @@ KrowiAF.AchievementData["06_00_02"] = {
         faction.Horde,
         9169,
         {
+            RewardType = rewardType.Other,
             {"Before", "Version", {7, 0, 3}},
         },
     },
@@ -626,6 +669,7 @@ KrowiAF.AchievementData["06_00_02"] = {
         faction.Alliance,
         9177,
         {
+            RewardType = rewardType.Other,
             {"Before", "Version", {7, 0, 3}},
         },
     },
@@ -634,6 +678,7 @@ KrowiAF.AchievementData["06_00_02"] = {
         faction.Horde,
         9176,
         {
+            RewardType = rewardType.Other,
             {"Before", "Version", {7, 0, 3}},
         },
     },
@@ -825,12 +870,20 @@ KrowiAF.AchievementData["06_00_02"] = {
     },
     {9243}, -- Item Level Force
     {9244}, -- Invasions Are Better with Friends
-    {9246}, -- Master Draenor Crafter
+    { -- Master Draenor Crafter
+		9246,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     { -- Defender of Draenor
         9248,
         faction.Horde,
         9630,
-        true,
+        {
+            RewardType = rewardType.Garrison,
+            IsPvP = true,
+        },
     },
     { -- Flying High
         9250,
@@ -854,6 +907,9 @@ KrowiAF.AchievementData["06_00_02"] = {
         9255,
         faction.Horde,
         9631,
+        {
+            RewardType = rewardType.Garrison,
+        },
     },
     { -- Rescue Operation
         9256,
@@ -867,8 +923,18 @@ KrowiAF.AchievementData["06_00_02"] = {
         9256,
         true,
     },
-    {9264}, -- Draenor Pet Brawler
-    {9265}, -- Master of Apexis
+    { -- Draenor Pet Brawler
+		9264,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
+    { -- Master of Apexis
+		9265,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     { -- It Might Just Save Your Life
         9389,
         {
@@ -905,7 +971,12 @@ KrowiAF.AchievementData["06_00_02"] = {
     {9401}, -- Shredder Maniac
     {9402}, -- Prove Your Strength
     {9405}, -- Working Some Orders
-    {9406}, -- Working More Orders
+    { -- Working More Orders
+		9406,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     {9407}, -- Working Many Orders
     { -- Operation Counterattack
         9408,
@@ -942,7 +1013,12 @@ KrowiAF.AchievementData["06_00_02"] = {
             {"Event", 409},
         },
     },
-    {9429}, -- Upgrading the Mill
+    { -- Upgrading the Mill
+		9429,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     {9432}, -- Would You Like a Pamphlet?
     {9433}, -- A-VOID-ance
     {9434}, -- One of Us! One of Us!
@@ -976,8 +1052,18 @@ KrowiAF.AchievementData["06_00_02"] = {
     {9450}, -- The Trap Game
     {9451}, -- Trapper's Delight
     {9452}, -- Trap Superstar
-    {9453}, -- Draenic Stone Collector
-    {9454}, -- Draenic Seed Collector
+    { -- Draenic Stone Collector
+		9453,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
+    { -- Draenic Seed Collector
+		9454,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     {9455}, -- Fire Ammonite Angler
     {9456}, -- Abyssal Gulper Eel Angler
     {9457}, -- Blackwater Whiptail Angler
@@ -985,15 +1071,30 @@ KrowiAF.AchievementData["06_00_02"] = {
     {9459}, -- Fat Sleeper Angler
     {9460}, -- Jawless Skulker Angler
     {9461}, -- Sea Scorpion Angler
-    {9462}, -- Draenor Angler
-    {9463}, -- Draenic Pet Battler
+    { -- Draenor Angler
+		9462,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
+    { -- Draenic Pet Battler
+		9463,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
 	{ -- Professional Draenor Master
 		9464,
 		{
 			RewardType = rewardType.Title,
 		},
 	},
-    {9468}, -- Salvaging Pays Off
+    { -- Salvaging Pays Off
+		9468,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     {9469}, -- Arakkoa Outcasts
     { -- Council of Exarchs
         9470,
@@ -1032,17 +1133,28 @@ KrowiAF.AchievementData["06_00_02"] = {
         9477,
         faction.Horde,
         9478,
+        {
+            RewardType = rewardType.Garrison,
+        },
     },
     { -- Savage Friends
         9478,
         faction.Alliance,
         9477,
+        {
+            RewardType = rewardType.Garrison,
+        },
     },
     {9479}, -- You Can't Make a Giant Omelette...
     {9481}, -- You Have Been Rylakinated!
     {9483}, -- I Was Framed!
     {9486}, -- Goodness Gracious
-    {9487}, -- Got My Mind On My Draenor Money
+    { -- Got My Mind On My Draenor Money
+		9487,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     { -- The Garrison Campaign
         9491,
         faction.Alliance,
@@ -1058,6 +1170,7 @@ KrowiAF.AchievementData["06_00_02"] = {
     { -- The Bone Collector
         9495,
         {
+            RewardType = rewardType.Garrison,
             IsPvP = true,
         },
     },
@@ -1068,7 +1181,12 @@ KrowiAF.AchievementData["06_00_02"] = {
             {"Never"},
         },
     },
-    {9497}, -- Finding Your Waystones
+    { -- Finding Your Waystones
+		9497,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     {9498}, -- Wingman
     {9499}, -- Wingmen
     {9500}, -- Draenor Cook
@@ -1223,10 +1341,25 @@ KrowiAF.AchievementData["06_00_02"] = {
             IsPvP = true,
         },
     },
-    {9523}, -- Patrolling Draenor
+    { -- Patrolling Draenor
+		9523,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     {9524}, -- Treasure Master
-    {9526}, -- Master of Mounts
-    {9527}, -- Terrific Technology
+    { -- Master of Mounts
+		9526,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
+    { -- Terrific Technology
+		9527,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     { -- On the Shadow's Trail
         9528,
         faction.Alliance,
@@ -1298,7 +1431,12 @@ KrowiAF.AchievementData["06_00_02"] = {
         faction.Alliance,
         9562,
     },
-    {9565}, -- Master Trapper
+    { -- Master Trapper
+		9565,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     { -- Victory in Hillsbrad
         9566,
         faction.Horde,
@@ -1445,12 +1583,18 @@ KrowiAF.AchievementData["06_00_02"] = {
         9630,
         faction.Alliance,
         9248,
-        true,
+        {
+            RewardType = rewardType.Garrison,
+            IsPvP = true,
+        },
     },
     { -- Mythic Draenor Raider
         9631,
         faction.Alliance,
         9255,
+        {
+            RewardType = rewardType.Garrison,
+        },
     },
     {9632}, -- The Power Is Yours
     {9633}, -- Cut off the Head
@@ -1510,6 +1654,7 @@ KrowiAF.AchievementData["06_00_02"] = {
     { -- Time is a Flat Circle
         9680,
         {
+            RewardType = rewardType.Garrison,
             {"Before", "Version", {7, 0, 3}},
         },
     },
@@ -1519,7 +1664,12 @@ KrowiAF.AchievementData["06_00_02"] = {
 			RewardType = rewardType.Pet,
 		},
 	},
-    {9703}, -- Stay Awhile and Listen
+    { -- Stay Awhile and Listen
+		9703,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     { -- Advanced Husbandry
         9705,
         faction.Horde,
@@ -1878,6 +2028,9 @@ KrowiAF.AchievementData["06_01_00"] = {
         9901,
         faction.Horde,
         9928,
+        {
+            RewardType = rewardType.Garrison,
+        },
     },
     {9906}, -- Alt-ernative Lifestyle
     {9908}, -- Ready for Powerleveling
@@ -1927,12 +2080,20 @@ KrowiAF.AchievementData["06_01_00"] = {
         9928,
         faction.Alliance,
         9901,
+        {
+            RewardType = rewardType.Garrison,
+        },
     },
 };
 
 KrowiAF.AchievementData["06_02_00"] = {
     {KrowiAF.SetAchievementPatch, 6, 2, 0},
-    {9972}, -- A Race Against Slime
+    { -- A Race Against Slime
+		9972,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     {9979}, -- Get In My Belly!
     { -- That's Whack!
         9983,
@@ -2031,6 +2192,7 @@ KrowiAF.AchievementData["06_02_00"] = {
         faction.Alliance,
         10148,
         {
+            RewardType = rewardType.Garrison,
             {"Before", "Version", {7, 0, 3}},
         },
     },
@@ -2453,6 +2615,7 @@ KrowiAF.AchievementData["06_02_00"] = {
         faction.Horde,
         10021,
         {
+            RewardType = rewardType.Garrison,
             {"Before", "Version", {7, 0, 3}},
         },
     },
@@ -2485,11 +2648,19 @@ KrowiAF.AchievementData["06_02_00"] = {
     },
     {10168}, -- Naval Armada
     {10169}, -- Naval Fleet
-    {10170}, -- Seaman
+    { -- Seaman
+		10170,
+		{
+			RewardType = rewardType.Garrison,
+		},
+	},
     { -- Petty Officer
         10172,
         faction.Alliance,
         10255,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     { -- Fleet Commander
         10173,
@@ -2507,16 +2678,25 @@ KrowiAF.AchievementData["06_02_00"] = {
         10255,
         faction.Horde,
         10172,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     { -- Charting a Course
         10256,
         faction.Alliance,
         10258,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     { -- Charting a Course
         10258,
         faction.Horde,
         10256,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     {10259}, -- Jungle Hunter
     {10260}, -- Explore Tanaan Jungle
diff --git a/DataAddons/Retail/07_Legion/AchievementData.lua b/DataAddons/Retail/07_Legion/AchievementData.lua
index f546a2ce..c283e65d 100644
--- a/DataAddons/Retail/07_Legion/AchievementData.lua
+++ b/DataAddons/Retail/07_Legion/AchievementData.lua
@@ -211,6 +211,9 @@ KrowiAF.AchievementData["07_00_03"] = {
     },
     { -- Nightfallen But Not Forgotten
         10617,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- Zoom!
         10626,
@@ -220,6 +223,9 @@ KrowiAF.AchievementData["07_00_03"] = {
     },
     { -- Fledgling Hero of Warcraft
         10657,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- Imagined Dragons World Tour
         10663,
@@ -1413,6 +1419,9 @@ KrowiAF.AchievementData["07_00_03"] = {
     },
     { -- Higher Dimensional Learning
         11175,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- Remember to Share
         11176,
@@ -1458,6 +1467,9 @@ KrowiAF.AchievementData["07_00_03"] = {
     },
     { -- Broken Isles Pathfinder, Part One
         11190,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- Cutting Edge: Xavius
         11191,
@@ -1497,13 +1509,19 @@ KrowiAF.AchievementData["07_00_03"] = {
     },
     { -- Fight for the Alliance
         11210,
+        faction.Alliance,
+        11211,
         {
+            RewardType = rewardType.Transmog,
             {"From", "Date", {2016, 5, 25}, "Until", "Date", {2016, 8, 1}},
         },
     },
     { -- Fight for the Horde
         11211,
+        faction.Horde,
+        11210,
         {
+            RewardType = rewardType.Transmog,
             {"From", "Date", {2016, 5, 25}, "Until", "Date", {2016, 8, 1}},
         },
     },
@@ -1771,6 +1789,9 @@ KrowiAF.AchievementData["07_02_00"] = {
     },
     { -- Broken Isles Pathfinder, Part Two
         11446,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- Alive for Five
         11468,
@@ -1875,6 +1896,7 @@ KrowiAF.AchievementData["07_02_00"] = {
         faction.Alliance,
         11564,
         {
+            RewardType = rewardType.Other,
             {"Before", "Version", {8, 0, 1}},
         },
     },
@@ -1883,6 +1905,7 @@ KrowiAF.AchievementData["07_02_00"] = {
         faction.Horde,
         11563,
         {
+            RewardType = rewardType.Other,
             {"Before", "Version", {8, 0, 1}},
         },
     },
@@ -2359,6 +2382,9 @@ KrowiAF.AchievementData["07_02_05"] = {
     },
     { -- I'll Hold These For You Until You Get Out
         11869,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     { -- Ahead of the Curve: Kil'jaeden
         11874,
@@ -2411,6 +2437,9 @@ KrowiAF.AchievementData["07_03_00"] = {
     {KrowiAF.SetAchievementPatch, 7, 3, 0},
     { -- Fisherfriend of the Isles
         11725,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     { -- Don't Play With That In The House
         11913,
@@ -2666,6 +2695,9 @@ KrowiAF.AchievementData["07_03_00"] = {
     },
     { -- Explore Argus
         12069,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- Crucible's Promise
         12071,
@@ -2693,6 +2725,9 @@ KrowiAF.AchievementData["07_03_00"] = {
     },
     { -- Commander of Argus
         12078,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     { -- Raiding with Leashes V: Cuteaclysm
         12079,
@@ -3154,18 +3189,30 @@ KrowiAF.AchievementData["07_03_05"] = {
     { -- Allied Races: Void Elf
         12242,
         faction.Alliance,
+        {
+            RewardType = rewardType.AlliedRace,
+        },
     },
     { -- Allied Races: Lightforged Draenei
         12243,
         faction.Alliance,
+        {
+            RewardType = rewardType.AlliedRace,
+        },
     },
     { -- Allied Races: Nightborne
         12244,
         faction.Horde,
+        {
+            RewardType = rewardType.AlliedRace,
+        },
     },
     { -- Allied Races: Highmountain Tauren
         12245,
         faction.Horde,
+        {
+            RewardType = rewardType.AlliedRace,
+        },
     },
     { -- Mechanical Brawler
         12279,
@@ -3237,6 +3284,9 @@ KrowiAF.AchievementData["07_03_05"] = {
     { -- Heritage of the Void
         12291,
         faction.Alliance,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     { -- Highmountain Tribe
         12292,
@@ -3512,14 +3562,23 @@ KrowiAF.AchievementData["07_03_05"] = {
     { -- Heritage of the Nightborne
         12413,
         faction.Horde,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     { -- Heritage of the Lightforged
         12414,
         faction.Alliance,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     { -- Heritage of Highmountain
         12415,
         faction.Horde,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     { -- The Total Package
         12416,
diff --git a/DataAddons/Retail/08_BattleForAzeroth/AchievementData.lua b/DataAddons/Retail/08_BattleForAzeroth/AchievementData.lua
index d03913a7..0475b66d 100644
--- a/DataAddons/Retail/08_BattleForAzeroth/AchievementData.lua
+++ b/DataAddons/Retail/08_BattleForAzeroth/AchievementData.lua
@@ -105,10 +105,16 @@ KrowiAF.AchievementData["08_00_01"] = {
     { -- Allied Races: Dark Iron Dwarf
         12515,
         faction.Alliance,
+        {
+            RewardType = rewardType.AlliedRace,
+        },
     },
     { -- Allied Races: Mag'har Orc
         12518,
         faction.Horde,
+        {
+            RewardType = rewardType.AlliedRace,
+        },
     },
     {12521}, -- Halls of Containment
     {12522}, -- Crimson Descent
@@ -919,7 +925,12 @@ KrowiAF.AchievementData["08_00_01"] = {
         },
     },
     {12988}, -- Battle for Azeroth Explorer
-    {12989}, -- Battle for Azeroth Pathfinder, Part One
+    { -- Battle for Azeroth Pathfinder, Part One
+		12989,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
     {12990}, -- Catchin' Some Rays
     {12991}, -- New Mog, G'huun This?
 	{ -- Pet Emporium
@@ -1043,10 +1054,16 @@ KrowiAF.AchievementData["08_00_01"] = {
     { -- Heritage of the Dark Iron
         13076,
         faction.Alliance,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     { -- Heritage of the Mag'har
         13077,
         faction.Horde,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     { -- Realm First! Battle for Azeroth Keystone Master
         13078,
@@ -1277,6 +1294,9 @@ KrowiAF.AchievementData["08_01_00"] = {
         13251,
         faction.Alliance,
         13263,
+        {
+            RewardType = rewardType.Other,
+        },
     },
     { -- The Shadow Hunter
         13263,
@@ -1600,10 +1620,16 @@ KrowiAF.AchievementData["08_01_05"] = {
     { -- Allied Races: Zandalari Troll
         13161,
         faction.Horde,
+        {
+            RewardType = rewardType.AlliedRace,
+        },
     },
     { -- Allied Races: Kul Tiran
         13163,
         faction.Alliance,
+        {
+            RewardType = rewardType.AlliedRace,
+        },
     },
     { -- You Are Not Your $#*@! Legplates
         13186,
@@ -1626,6 +1652,7 @@ KrowiAF.AchievementData["08_01_05"] = {
         faction.Alliance,
         13190,
         {
+            RewardType = rewardType.Other,
             {"Before", "Version", {9, 0, 1}},
         },
     },
@@ -1634,6 +1661,7 @@ KrowiAF.AchievementData["08_01_05"] = {
         faction.Horde,
         13189,
         {
+            RewardType = rewardType.Other,
             {"Before", "Version", {9, 0, 1}},
         },
     },
@@ -1721,10 +1749,16 @@ KrowiAF.AchievementData["08_01_05"] = {
     { -- Heritage of the Zandalari
         13503,
         faction.Horde,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     { -- Heritage of the Kul Tirans
         13504,
         faction.Alliance,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     {13506}, -- A Good Eye-dea
     {13512}, -- Master Calligrapher
@@ -2298,6 +2332,9 @@ KrowiAF.AchievementData["08_03_00"] = {
     { -- Allied Races: Vulpera
         13206,
         faction.Horde,
+        {
+            RewardType = rewardType.AlliedRace,
+        },
     },
     { -- Corrupted Gladiator: Battle for Azeroth Season 4
         13957,
@@ -2392,15 +2429,24 @@ KrowiAF.AchievementData["08_03_00"] = {
     { -- Heritage of the Vulpera
         14002,
         faction.Horde,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     {14008}, -- Mana Sponge
     { -- Allied Races: Mechagnome
         14013,
         faction.Alliance,
+        {
+            RewardType = rewardType.AlliedRace,
+        },
     },
     { -- Heritage of the Mechagnome
         14014,
         faction.Alliance,
+        {
+            RewardType = rewardType.Transmog,
+        },
     },
     {14019}, -- Smoke Test
 	{ -- Pet Battle Challenge: Blackrock Depths
diff --git a/DataAddons/Retail/09_Shadowlands/AchievementData.lua b/DataAddons/Retail/09_Shadowlands/AchievementData.lua
index 9e3e7a7c..86addd72 100644
--- a/DataAddons/Retail/09_Shadowlands/AchievementData.lua
+++ b/DataAddons/Retail/09_Shadowlands/AchievementData.lua
@@ -441,7 +441,12 @@ KrowiAF.AchievementData["09_00_01"] = {
     {14760}, -- Recollection Collection
     {14761}, -- Deciphering Death's Intentions
     {14762}, -- Breaking the Stratus Fear
-    {14763}, -- Crypt Couture
+    { -- Crypt Couture
+		14763,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {14764}, -- The Great Luckydo
     {14765}, -- Ramparts Racer
 	{ -- Parasoling
@@ -598,9 +603,24 @@ KrowiAF.AchievementData["09_00_05"] = {
             {"PvE Season", 5},
         },
     },
-    {15023}, -- We Can Rebuild
-    {15024}, -- Denying the Drought
-    {15025}, -- Sanctum Superior
+    { -- We Can Rebuild
+		15023,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- Denying the Drought
+		15024,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- Sanctum Superior
+		15025,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
 };
 
 KrowiAF.AchievementData["09_01_00"] = {
@@ -1201,14 +1221,24 @@ KrowiAF.AchievementData["09_02_00"] = {
     },
     {15386}, -- Shimmering Secrets
     {15391}, -- Adventurer of Zereth Mortis
-    {15392}, -- Dune Dominance
+    { -- Dune Dominance
+		15392,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {15396}, -- We Are All Made of Stars
     {15397}, -- Four Ring Circus
     {15398}, -- Xy Never, Ever Marks the Spot.
     {15399}, -- Coming to Terms
     {15400}, -- Where the Wild Corgis Are
     {15401}, -- Wisdom Comes From the Desert
-    {15402}, -- Cyphers of the First Ones
+    { -- Cyphers of the First Ones
+		15402,
+		{
+			RewardType = rewardType.Mount,
+		},
+	},
     {15404}, -- Cosmic Empowerment
     {15406}, -- Synthesized!
     {15407}, -- Synthe-fived!
@@ -1314,7 +1344,12 @@ KrowiAF.AchievementData["09_02_00"] = {
     },
     {15512}, -- Adventures in Zereth Mortis
     {15513}, -- Curious Collections
-    {15514}, -- Unlocking the Secrets
+    { -- Unlocking the Secrets
+		15514,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
     {15515}, -- Path to Enlightenment
     {15518}, -- A Means to an End
     { -- Solo Aspirations
@@ -1353,7 +1388,12 @@ KrowiAF.AchievementData["09_02_00"] = {
 
 KrowiAF.AchievementData["09_02_05"] = {
     {KrowiAF.SetAchievementPatch, 9, 2, 5},
-    {15579}, -- Return to Lordaeron
+    { -- Return to Lordaeron
+		15579,
+		{
+			RewardType = {rewardType.Title, rewardType.Other},
+		},
+	},
     { -- Fearless Spectator
         15594,
         {
diff --git a/DataAddons/Retail/10_Dragonflight/AchievementData.lua b/DataAddons/Retail/10_Dragonflight/AchievementData.lua
index 13fb536c..4c38a5e0 100644
--- a/DataAddons/Retail/10_Dragonflight/AchievementData.lua
+++ b/DataAddons/Retail/10_Dragonflight/AchievementData.lua
@@ -128,7 +128,12 @@ KrowiAF.AchievementData["10_00_00"] = {
 		},
 	},
     {15938}, -- Thaldraszus Advanced: Gold
-    {15939}, -- Dragon Racing Completionist: Bronze
+    { -- Dragon Racing Completionist: Bronze
+		15939,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
 	{ -- Dragon Racing Completionist: Silver
 		15940,
 		{
@@ -407,7 +412,12 @@ KrowiAF.AchievementData["10_00_00"] = {
 			RewardType = rewardType.Title,
 		},
 	},
-    {16444}, -- Leftovers' Revenge
+    { -- Leftovers' Revenge
+		16444,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {16445}, -- Icy What You Did There
 	{ -- That's Pretty Neat!
 		16446,
@@ -860,7 +870,12 @@ KrowiAF.AchievementData["10_00_02"] = {
     {17110}, -- The Primal Bulwark
     {17111}, -- Caverns of Infusion
     {17112}, -- Fury of the Storm
-    {17119}, -- Deep Cuts From the Vault
+    { -- Deep Cuts From the Vault
+		17119,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {17314}, -- Heroic Edition: Tangled Dreamweaver
     { -- Legend: Dragonflight Season 1
         17339,
@@ -912,7 +927,12 @@ KrowiAF.AchievementData["10_00_05"] = {
 			RewardType = rewardType.Toy,
 		},
 	},
-    {17305}, -- Trading Post: Dragonflight
+    { -- Trading Post: Dragonflight
+		17305,
+		{
+			RewardType = rewardType.TradersTender,
+		},
+	},
     { -- Elders of the Dragon Isles
         17321,
         {
@@ -927,7 +947,12 @@ KrowiAF.AchievementData["10_00_05"] = {
 			RewardType = rewardType.Title,
 		},
 	},
-    {17334}, -- Trading Post Enthusiast
+    { -- Trading Post Enthusiast
+		17334,
+		{
+			RewardType = {rewardType.Transmog, rewardType.TradersTender},
+		},
+	},
     { -- Airborne Tumbler
         17335,
         {
@@ -971,7 +996,12 @@ KrowiAF.AchievementData["10_00_07"] = {
 		},
 	},
     {17315}, -- While We Were Sleeping
-    {17366}, -- Relics of a Fallen Empire
+    { -- Relics of a Fallen Empire
+		17366,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
     {17367}, -- Deadliest Cache
     {17397}, -- Door To Door
     {17398}, -- Dragon Glyphs: Winglord's Perch
@@ -1365,7 +1395,12 @@ KrowiAF.AchievementData["10_01_00"] = {
 	},
     {17977}, -- Stones Can Try To Fly!
     {17978}, -- Stones Can Fly!
-    {18027}, -- Dragonflight Season 2 Master
+    { -- Dragonflight Season 2 Master
+		18027,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
 	{ -- Cavern Clawbbering
 		18100,
 		{
@@ -1455,7 +1490,12 @@ KrowiAF.AchievementData["10_01_00"] = {
 		},
 	},
     {18361}, -- To All the Squirrels Burrowed Beneath
-    {18380}, -- Dragonflight Season 2 Hero
+    { -- Dragonflight Season 2 Hero
+		18380,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     { -- Dragonflight Keystone Master: Season Two
         18542,
         {
@@ -1552,8 +1592,18 @@ KrowiAF.AchievementData["10_01_05"] = {
             {"Event", 324},
         },
     },
-    {18368}, -- Memory of Scholomance
-    {18372}, -- Wards of the Dread Citadel
+    { -- Memory of Scholomance
+		18368,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- Wards of the Dread Citadel
+		18372,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
 	{ -- Hey Nanny Nanny
 		18383,
 		{
@@ -1654,14 +1704,24 @@ KrowiAF.AchievementData["10_01_05"] = {
 			RewardType = rewardType.Title,
 		},
 	},
-    {18643}, -- Community Rumors
+    { -- Community Rumors
+		18643,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
 	{ -- Community Rumor Mill
 		18644,
 		{
 			RewardType = rewardType.Pet,
 		},
 	},
-    {18645}, -- Tools of the Trade
+    { -- Tools of the Trade
+		18645,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
 	{ -- Whodunnit?
 		18646,
 		{
@@ -1676,7 +1736,12 @@ KrowiAF.AchievementData["10_01_05"] = {
 			RewardType = rewardType.Title,
 		},
 	},
-    {18706}, -- Put That Thing Back Where It Came From
+    { -- Put That Thing Back Where It Came From
+		18706,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     { -- Draconically Superior
         18976,
         {
@@ -1806,7 +1871,12 @@ KrowiAF.AchievementData["10_01_07"] = {
 		},
 	},
     {18793}, -- Always Be Camping
-    {18804}, -- Neltharion's Legacy
+    { -- Neltharion's Legacy
+		18804,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {18805}, -- Draconic Phial Cabinet
     {18815}, -- Speed Dreamin'
     {18816}, -- Serious Chef
@@ -1834,7 +1904,12 @@ KrowiAF.AchievementData["10_01_07"] = {
     {18851}, -- Skeletons in the Lockbox
     {18852}, -- Weaponsmithing, Reborn
     {18853}, -- Seething Flames of Hatred
-    {18854}, -- Seeing Red
+    { -- Seeing Red
+		18854,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
     {18855}, -- Portal to Everywhere
     {18856}, -- Just an Ordinary Gas Cloud
     {18857}, -- That's No Ordinary Gas Cloud!
@@ -1886,14 +1961,39 @@ KrowiAF.AchievementData["10_01_07"] = {
     {18898}, -- That's Just Cruel
     {18899}, -- You Saw Nothing
     {18900}, -- Budget Bard
-    {18901}, -- Chromatic Calibration: Holo-Gogs
+    { -- Chromatic Calibration: Holo-Gogs
+		18901,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {18902}, -- Uncertified Nurse
     {18903}, -- Ton of Tops
     {18904}, -- Iron to Vendor Gold
-    {18905}, -- Chromatic Calibration: Retinal Armor
-    {18906}, -- Chromatic Calibration: Cranial Cannons
-    {18907}, -- Chromatic Calibration: Ectoplasmic Specs
-    {18908}, -- Chromatic Calibration: Bio-Optic Killshades
+    { -- Chromatic Calibration: Retinal Armor
+		18905,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
+    { -- Chromatic Calibration: Cranial Cannons
+		18906,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
+    { -- Chromatic Calibration: Ectoplasmic Specs
+		18907,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
+    { -- Chromatic Calibration: Bio-Optic Killshades
+		18908,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {18909}, -- Fantastic Figurines
     {18928}, -- Storm Rider: Bronze
     {18929}, -- Storm Rider: Silver
@@ -2320,7 +2420,12 @@ KrowiAF.AchievementData["10_02_00"] = {
     {19313}, -- Bloom Man Group
     {19315}, -- Dream Chaser
     {19316}, -- Adventurer of the Emerald Dream
-    {19317}, -- Treasures of the Emerald Dream
+    { -- Treasures of the Emerald Dream
+		19317,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
 	{ -- Dream On
 		19318,
 		{
@@ -2334,6 +2439,7 @@ KrowiAF.AchievementData["10_02_00"] = {
     { -- Dreaming of Drakes
         19326,
         {
+            RewardType = rewardType.Other,
             {"PvE Season", 11},
         },
     },
@@ -2379,16 +2485,23 @@ KrowiAF.AchievementData["10_02_00"] = {
     {19390}, -- Memories of Teldrassil
     {19393}, -- Whelp, I'm Lost
     {19394}, -- A Dream Within a Dream
-    {19396}, -- Dragonflight Season 3 Master
+    { -- Dragonflight Season 3 Master
+		19396,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     { -- Dreaming of Wyrms
         19397,
         {
+            RewardType = rewardType.Other,
             {"PvE Season", 11},
         },
     },
     { -- Dreaming of the Aspects
         19398,
         {
+            RewardType = rewardType.Other,
             {"PvE Season", 11},
         },
     },
@@ -2429,7 +2542,12 @@ KrowiAF.AchievementData["10_02_00"] = {
             IsPvP = true,
         },
     },
-    {19420}, -- Dragonflight Season 3 Hero
+    { -- Dragonflight Season 3 Hero
+		19420,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {19442}, -- Fire Catwalk With Me
     { -- Battle Mender: Dragonflight Season 3
         19443,
@@ -2870,7 +2988,12 @@ KrowiAF.AchievementData["10_02_06"] = {
             {"Event", 181},
         },
     },
-    {20481}, -- Dragonflight Season 4 Master
+    { -- Dragonflight Season 4 Master
+		20481,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
 	{ -- Back from the Beyond
 		20501,
 		{
@@ -2909,18 +3032,21 @@ KrowiAF.AchievementData["10_02_07"] = {
     { -- Valley of the Four Winds
         19873,
         {
+            RewardType = rewardType.Transmog,
             {"Event", 1514},
         },
     },
     { -- Krasarang Wilds
         19874,
         {
+            RewardType = rewardType.Transmog,
             {"Event", 1514},
         },
     },
     { -- Kun-Lai Summit
         19875,
         {
+            RewardType = rewardType.Transmog,
             {"Event", 1514},
         },
     },
@@ -2941,24 +3067,28 @@ KrowiAF.AchievementData["10_02_07"] = {
     { -- Dread Wastes
         19878,
         {
+            RewardType = rewardType.Transmog,
             {"Event", 1514},
         },
     },
     { -- Landfall
         19879,
         {
+            RewardType = rewardType.Transmog,
             {"Event", 1514},
         },
     },
     { -- Isle of Thunder
         19880,
         {
+            RewardType = rewardType.Transmog,
             {"Event", 1514},
         },
     },
     { -- Escalation
         19881,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
@@ -3727,18 +3857,21 @@ KrowiAF.AchievementData["10_02_07"] = {
     { -- Heroic: Pandaria Scenarios
         20004,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
     { -- Heroic: Pandaria Dungeons
         20005,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
     { -- Pandaria Raids
         20006,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
@@ -3922,66 +4055,77 @@ KrowiAF.AchievementData["10_02_07"] = {
     { -- Infinite Power I
         20527,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
     { -- Infinite Power II
         20528,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
     { -- Infinite Power III
         20529,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
     { -- Infinite Power IV
         20530,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
     { -- Infinite Power V
         20531,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
     { -- Infinite Power VI
         20532,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
     { -- Infinite Power VII
         20533,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
     { -- Infinite Power VIII
         20534,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
     { -- Infinite Power IX
         20535,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
     { -- Infinite Power X
         20536,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
     { -- Infinite Power XI
         20537,
         {
+            RewardType = rewardType.Other,
             {"Event", 1514},
         },
     },
@@ -4002,7 +4146,7 @@ KrowiAF.AchievementData["10_02_07"] = {
     { -- Timerunner
         40223,
         {
-            RewardType = {rewardType.Title, rewardType.Item},
+            RewardType = {rewardType.Title, rewardType.Other},
             {"Event", 1514},
         },
     },
diff --git a/DataAddons/Retail/11_TheWarWithin/AchievementData.lua b/DataAddons/Retail/11_TheWarWithin/AchievementData.lua
index a3c803cf..9cd316b9 100644
--- a/DataAddons/Retail/11_TheWarWithin/AchievementData.lua
+++ b/DataAddons/Retail/11_TheWarWithin/AchievementData.lua
@@ -11,13 +11,43 @@ KrowiAF.AchievementData["11_00_00"] = {
     {19414}, -- Algari Cook
     {19415}, -- Algari Fisherman
     {19459}, -- Level 80
-    {19460}, -- Two Warband Mentors: The War Within
-    {19470}, -- One Warband Mentor: The War Within
-    {19475}, -- Three Warband Mentors: The War Within
-    {19476}, -- Four Warband Mentors: The War Within
-    {19477}, -- Five Warband Mentors: The War Within
+    { -- Two Warband Mentors: The War Within
+		19460,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- One Warband Mentor: The War Within
+		19470,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- Three Warband Mentors: The War Within
+		19475,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- Four Warband Mentors: The War Within
+		19476,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- Five Warband Mentors: The War Within
+		19477,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
     {19489}, -- Class Connoisseur
-    {19515}, -- Algari Master of Many
+    { -- Algari Master of Many
+		19515,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {19559}, -- Azj-Kahet
     {19560}, -- The Ringing Deeps
     {19704}, -- Overflowing Algari Flasks
@@ -130,7 +160,12 @@ KrowiAF.AchievementData["11_00_00"] = {
     },
     {20594}, -- Flamegard's Hope
     {20595}, -- Sojourner of Isle of Dorn
-    {20596}, -- Loremaster of Khaz Algar
+    { -- Loremaster of Khaz Algar
+		20596,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {20597}, -- The War Within
     {20598}, -- Hallowfall
     {40082}, -- Never Enough
@@ -174,10 +209,30 @@ KrowiAF.AchievementData["11_00_00"] = {
             {"PvE Season", 13},
         },
     },
-    {40107}, -- Harbinger of the Weathered
-    {40115}, -- Harbinger of the Carved
-    {40118}, -- Harbinger of the Runed
-    {40138}, -- Algari Dungeoneer
+    { -- Harbinger of the Weathered
+		40107,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- Harbinger of the Carved
+		40115,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- Harbinger of the Runed
+		40118,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- Algari Dungeoneer
+		40138,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {40139}, -- Algari Dungeon Damage Dealer
     {40140}, -- Algari Dungeon Healer
     {40141}, -- Algari Dungeon Tank
@@ -217,7 +272,12 @@ KrowiAF.AchievementData["11_00_00"] = {
 			RewardType = rewardType.Title,
 		},
 	},
-    {40231}, -- The War Within Pathfinder
+    { -- The War Within Pathfinder
+		40231,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
 	{ -- Glory of the Nerub-ar Raider
 		40232,
 		{
@@ -293,9 +353,19 @@ KrowiAF.AchievementData["11_00_00"] = {
     {40263}, -- Would You Still /love Me if I Was a Worm...
     {40264}, -- Kill Streak
     {40266}, -- Missed 'Em by That Much
-    {40307}, -- Allied Races: Earthen
+    { -- Allied Races: Earthen
+		40307,
+		{
+			RewardType = rewardType.AlliedRace,
+		},
+	},
     {40308}, -- Beacon of Hope
-    {40309}, -- Heritage of the Earthen
+    { -- Heritage of the Earthen
+		40309,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {40311}, -- Sharing the Light
     {40312}, -- Starting the Flames
     {40313}, -- Igniting the Keyflames
@@ -349,7 +419,12 @@ KrowiAF.AchievementData["11_00_00"] = {
 			RewardType = rewardType.Title,
 		},
 	},
-    {40360}, -- Life on the Farm
+    { -- Life on the Farm
+		40360,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {40361}, -- Cinderbrew Meadery
     {40363}, -- Heroic: Cinderbrew Meadery
     {40366}, -- Mythic: Cinderbrew Meadery
@@ -480,7 +555,12 @@ KrowiAF.AchievementData["11_00_00"] = {
     {40427}, -- Darkflame Cleft
     {40428}, -- Heroic: Darkflame Cleft
     {40429}, -- Mythic: Darkflame Cleft
-    {40430}, -- Khaz Algar Flight Master
+    { -- Khaz Algar Flight Master
+		40430,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
     { -- Hunting the Hunter
         40431,
         {
@@ -538,26 +618,126 @@ KrowiAF.AchievementData["11_00_00"] = {
     },
     {40473}, -- Not So Quick Fix
     {40475}, -- To All the Slimes I Love
-    {40476}, -- 10 Algari Seekerthread
-    {40480}, -- 20 Algari Seekerthread
-    {40484}, -- 30 Algari Seekerthread
-    {40485}, -- 40 Algari Seekerthread
-    {40487}, -- 50 Algari Seekerthread
-    {40488}, -- 60 Algari Seekerthread
-    {40489}, -- 70 Algari Seekerthread
-    {40490}, -- 80 Algari Seekerthread
-    {40491}, -- 90 Algari Seekerthread
-    {40492}, -- 100 Algari Seekerthread
-    {40494}, -- 10 Algari Anglerthread
-    {40495}, -- 20 Algari Anglerthread
-    {40496}, -- 60 Algari Anglerthread
-    {40497}, -- 30 Algari Anglerthread
-    {40498}, -- 70 Algari Anglerthread
-    {40499}, -- 40 Algari Anglerthread
-    {40500}, -- 80 Algari Anglerthread
-    {40501}, -- 100 Algari Anglerthread
-    {40502}, -- 50 Algari Anglerthread
-    {40503}, -- 90 Algari Anglerthread
+    { -- 10 Algari Seekerthread
+		40476,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 20 Algari Seekerthread
+		40480,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 30 Algari Seekerthread
+		40484,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 40 Algari Seekerthread
+		40485,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 50 Algari Seekerthread
+		40487,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 60 Algari Seekerthread
+		40488,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 70 Algari Seekerthread
+		40489,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 80 Algari Seekerthread
+		40490,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 90 Algari Seekerthread
+		40491,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 100 Algari Seekerthread
+		40492,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 10 Algari Anglerthread
+		40494,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 20 Algari Anglerthread
+		40495,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 60 Algari Anglerthread
+		40496,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 30 Algari Anglerthread
+		40497,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 70 Algari Anglerthread
+		40498,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 40 Algari Anglerthread
+		40499,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 80 Algari Anglerthread
+		40500,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 100 Algari Anglerthread
+		40501,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 50 Algari Anglerthread
+		40502,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- 90 Algari Anglerthread
+		40503,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
     {40504}, -- Rocked to Sleep
 	{ -- Leave No Treasure Unfound
 		40506,
@@ -566,15 +746,60 @@ KrowiAF.AchievementData["11_00_00"] = {
 		},
 	},
     {40507}, -- Hanging Tight
-    {40512}, -- War Within Delves: Tier 2
-    {40514}, -- War Within Delves: Tier 3
-    {40515}, -- War Within Delves: Tier 4
-    {40516}, -- War Within Delves: Tier 5
-    {40517}, -- War Within Delves: Tier 6
-    {40518}, -- War Within Delves: Tier 7
-    {40519}, -- War Within Delves: Tier 8
-    {40520}, -- War Within Delves: Tier 9
-    {40521}, -- War Within Delves: Tier 10
+    { -- War Within Delves: Tier 2
+		40512,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- War Within Delves: Tier 3
+		40514,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- War Within Delves: Tier 4
+		40515,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- War Within Delves: Tier 5
+		40516,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- War Within Delves: Tier 6
+		40517,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- War Within Delves: Tier 7
+		40518,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- War Within Delves: Tier 8
+		40519,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- War Within Delves: Tier 9
+		40520,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
+    { -- War Within Delves: Tier 10
+		40521,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
     {40523}, -- On Brand
     {40524}, -- Good Deed Delver
     {40525}, -- Fungal Folly Stories
@@ -620,7 +845,12 @@ KrowiAF.AchievementData["11_00_00"] = {
 			RewardType = rewardType.Title,
 		},
 	},
-    {40618}, -- Lost and Found
+    { -- Lost and Found
+		40618,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {40620}, -- Back to the Wall
     {40621}, -- The Rookery
     {40622}, -- Biblo Archivist
@@ -630,7 +860,12 @@ KrowiAF.AchievementData["11_00_00"] = {
     {40628}, -- Notable Machines
     {40629}, -- Bookworm
     {40630}, -- For the Collective
-    {40631}, -- War Within Delves: Tier 1
+    { -- War Within Delves: Tier 1
+		40631,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
     {40632}, -- No Harm Ever Came From Reading A Book
     {40633}, -- The Unseeming
     {40634}, -- You Can't Hang With Us
@@ -641,7 +876,12 @@ KrowiAF.AchievementData["11_00_00"] = {
     {40643}, -- The Stonevault
     {40644}, -- Heroic: The Stonevault
     {40648}, -- Mythic: The Stonevault
-    {40660}, -- The War Within Season 1: Spelunker Supreme
+    { -- The War Within Season 1: Spelunker Supreme
+		40660,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
 	{ -- It's Not Much, But It's Honest Work
 		40662,
 		{
@@ -657,9 +897,19 @@ KrowiAF.AchievementData["11_00_00"] = {
     {40703}, -- The Ringing Deeps Glyph Hunter
     {40704}, -- Hallowfall Glyph Hunter
     {40705}, -- Azj-Kahet Glyph Hunter
-    {40723}, -- Web-Wrapped in the Finest Silks
+    { -- Web-Wrapped in the Finest Silks
+		40723,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {40724}, -- Treasures of The Ringing Deeps
-    {40725}, -- War Within Delves: Endgame
+    { -- War Within Delves: Endgame
+		40725,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
 	{ -- War Within Delves: Tier 11
 		40726,
 		{
@@ -810,8 +1060,18 @@ KrowiAF.AchievementData["11_00_05"] = {
 			RewardType = rewardType.Title,
 		},
 	},
-    {40871}, -- Assistant to the Assistant Guest Relations Manager
-    {40872}, -- I Saved the Party and All I Got Was This Lousy Hat
+    { -- Assistant to the Assistant Guest Relations Manager
+		40871,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
+    { -- I Saved the Party and All I Got Was This Lousy Hat
+		40872,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {40873}, -- Crate Insurance Agent
     {40967}, -- Ratts' Revenge
     { -- A Cool Twenty Years
@@ -921,23 +1181,35 @@ KrowiAF.AchievementData["11_00_05"] = {
         },
     },
     {41000}, -- A Timewalking Journey Back to a Classic Dungeon Time
-    {41013}, -- Upgraded Apparel
+    { -- Upgraded Apparel
+		41013,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
     { -- A Dark Iron Past
         41015,
         {
             {"Event", 1592},
         },
     },
-    {41033}, -- Classy Dresser
+    { -- Classy Dresser
+		41033,
+		{
+			RewardType = rewardType.Other,
+		},
+	},
     { -- Token Collector
         41038,
         {
+            RewardType = rewardType.Other,
             {"Event", 1592},
         },
     },
     { -- Forged Weapons of Conquest
         41044,
         {
+            RewardType = rewardType.Transmog,
             IsPvP = true,
             {"PvP Season", 38},
         },
@@ -984,7 +1256,12 @@ KrowiAF.AchievementData["11_00_07"] = {
     {41045}, -- A Song of Secrets
     {41046}, -- Clean Up on Isle Siren
     {41050}, -- A Choir of Citrines
-    {41052}, -- Lingering Shadows
+    { -- Lingering Shadows
+		41052,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     { -- Master of the Turbulent Timeways II
         41056,
         {
@@ -1055,7 +1332,12 @@ KrowiAF.AchievementData["11_00_07"] = {
     {41166}, -- From Many, One
     {41167}, -- Hallowfall Arathi
     {41168}, -- The Flame Burns Within
-    {41169}, -- Khaz Algar Diplomat
+    { -- Khaz Algar Diplomat
+		41169,
+		{
+			RewardType = rewardType.Transmog,
+		},
+	},
     {41170}, -- Friends in the Plains
     {41171}, -- Friends in the Accord
     {41172}, -- Friends in the Field
diff --git a/Gui/WindowFrames/FilterButton/FilterButtonClassicMixin.lua b/Gui/WindowFrames/FilterButton/FilterButtonClassicMixin.lua
index f6eab13e..47bd48cf 100644
--- a/Gui/WindowFrames/FilterButton/FilterButtonClassicMixin.lua
+++ b/Gui/WindowFrames/FilterButton/FilterButtonClassicMixin.lua
@@ -106,6 +106,17 @@ do -- BuildVersionFilter
     end
 end
 
+function KrowiAF_AchievementFrameFilterButtonClassicMixin:CreateSelectDeselectAllRewards(menu, text, filters, value)
+    menu:AddFull({
+        Text = text,
+        Func = function()
+            self:SetRewardsFilters(filters, value);
+            UIDropDownMenu_RefreshAll(UIDROPDOWNMENU_OPEN_MENU);
+        end,
+        KeepShownOnClick = true
+    });
+end
+
 function KrowiAF_AchievementFrameFilterButtonClassicMixin:CreateSelectDeselectAllFactions(menu, text, filters, value)
     menu:AddFull({
         Text = text,
diff --git a/Gui/WindowFrames/FilterButton/FilterButtonMixin.lua b/Gui/WindowFrames/FilterButton/FilterButtonMixin.lua
index 559278eb..d0351ccb 100644
--- a/Gui/WindowFrames/FilterButton/FilterButtonMixin.lua
+++ b/Gui/WindowFrames/FilterButton/FilterButtonMixin.lua
@@ -189,9 +189,22 @@ do -- BuildVersionFilter
 end
 
 do -- AchievementFilters
+    function KrowiAF_AchievementFrameFilterButtonMixin:SetRewardsFilters(filters, value)
+        self:SetSelected(filters, {"HasReward", "Yes"}, value, true, true);
+        self:SetSelected(filters, {"HasReward", "No"}, value, true, true);
+        for rewardType, _ in next, filters.RewardType do
+            self:SetSelected(filters, {"RewardType", rewardType}, value, true, true);
+        end
+        self:UpdateAchievementFrame();
+    end
+
+    function KrowiAF_AchievementFrameFilterButtonMixin:CreateSelectDeselectAllRewards(menu, text, filters, value)
+        error("The function is not implemented.");
+    end
+
     function KrowiAF_AchievementFrameFilterButtonMixin:SetFactionFilters(filters, value)
-        for _faction, _ in next, filters.Faction do
-            self:SetSelected(filters, {"Faction", _faction}, value, true, true);
+        for faction, _ in next, filters.Faction do
+            self:SetSelected(filters, {"Faction", faction}, value, true, true);
         end
         self:UpdateAchievementFrame();
     end
@@ -224,18 +237,24 @@ do -- AchievementFilters
         self:CreateCheckbox(reward, addon.L["Yes"], filters, {"HasReward", "Yes"}, true);
         self:CreateCheckbox(reward, addon.L["No"], filters, {"HasReward", "No"}, true);
         addon.MenuUtil:CreateDivider(reward);
-        self:CreateCheckbox(reward, addon.L["Title"], filters, {"RewardType", KrowiAF.Enum.RewardType.Title}, true);
-        self:CreateCheckbox(reward, addon.L["Pet"], filters, {"RewardType", KrowiAF.Enum.RewardType.Pet}, true);
+        self:CreateCheckbox(reward, addon.L["Allied Race"], filters, {"RewardType", KrowiAF.Enum.RewardType.AlliedRace}, true);
+        self:CreateCheckbox(reward, addon.L["Garrison"], filters, {"RewardType", KrowiAF.Enum.RewardType.Garrison}, true);
         self:CreateCheckbox(reward, addon.L["Mount"], filters, {"RewardType", KrowiAF.Enum.RewardType.Mount}, true);
-        self:CreateCheckbox(reward, addon.L["Toy"], filters, {"RewardType", KrowiAF.Enum.RewardType.Toy}, true);
+        self:CreateCheckbox(reward, addon.L["Pet"], filters, {"RewardType", KrowiAF.Enum.RewardType.Pet}, true);
+        self:CreateCheckbox(reward, addon.L["Tabard"], filters, {"RewardType", KrowiAF.Enum.RewardType.Tabard}, true);
         self:CreateCheckbox(reward, addon.L["Teleport"], filters, {"RewardType", KrowiAF.Enum.RewardType.Teleport}, true);
+        self:CreateCheckbox(reward, addon.L["Title"], filters, {"RewardType", KrowiAF.Enum.RewardType.Title}, true);
+        self:CreateCheckbox(reward, addon.L["Toy"], filters, {"RewardType", KrowiAF.Enum.RewardType.Toy}, true);
+        self:CreateCheckbox(reward, addon.L["Trader's Tender"], filters, {"RewardType", KrowiAF.Enum.RewardType.TradersTender}, true);
         self:CreateCheckbox(reward, addon.L["Transmog"], filters, {"RewardType", KrowiAF.Enum.RewardType.Transmog}, true);
-        self:CreateCheckbox(reward, addon.L["Tabard"], filters, {"RewardType", KrowiAF.Enum.RewardType.Tabard}, true);
         self:CreateCheckbox(reward, addon.L["Other"], filters, {"RewardType", KrowiAF.Enum.RewardType.Other}, true);
         addon.MenuUtil:CreateDivider(reward);
         self:CreateCheckbox(reward, addon.L["Remix Pandaria Bronze"], filters, {"RewardType", KrowiAF.Enum.RewardType.RemixPandariaBronze}, true);
         addon.MenuUtil:CreateDivider(reward);
         self:CreateCheckbox(reward, addon.L["Not Categorized"], filters, {"RewardType", KrowiAF.Enum.RewardType.NotCategorized}, true);
+        addon.MenuUtil:CreateDivider(reward);
+        self:CreateSelectDeselectAllRewards(reward, addon.L["Select All"], filters, true);
+        self:CreateSelectDeselectAllRewards(reward, addon.L["Deselect All"], filters, false);
         addon.MenuUtil:AddChildMenu(menu, reward);
 
         self:CreateBuildVersionFilter(menu, filters);
diff --git a/Gui/WindowFrames/FilterButton/FilterButtonModernMixin.lua b/Gui/WindowFrames/FilterButton/FilterButtonModernMixin.lua
index c55b463c..dd27c6ec 100644
--- a/Gui/WindowFrames/FilterButton/FilterButtonModernMixin.lua
+++ b/Gui/WindowFrames/FilterButton/FilterButtonModernMixin.lua
@@ -94,6 +94,16 @@ do -- BuildVersionFilter
     end
 end
 
+function KrowiAF_AchievementFrameFilterButtonModernMixin:CreateSelectDeselectAllRewards(menu, text, filters, value)
+    local selectAll = menu:CreateButton(
+        text,
+        function()
+            self:SetRewardsFilters(filters, value);
+        end
+    );
+    selectAll:SetResponse(MenuResponse.Refresh);
+end
+
 function KrowiAF_AchievementFrameFilterButtonModernMixin:CreateSelectDeselectAllFactions(menu, text, filters, value)
     local selectAll = menu:CreateButton(
         text,
diff --git a/Localization/GlobalStrings.lua b/Localization/GlobalStrings.lua
index e2bde17a..91d7bbf1 100644
--- a/Localization/GlobalStrings.lua
+++ b/Localization/GlobalStrings.lua
@@ -134,4 +134,10 @@ L["Friday"] = WEEKDAY_FRIDAY;
 L["Saturday"] = WEEKDAY_SATURDAY;
 L["Warband"] = REPUTATION_SORT_TYPE_ACCOUNT
 L["Yes"] = YES
-L["No"] = NO
\ No newline at end of file
+L["No"] = NO
+L["Mount"] = MOUNT
+L["Pet"] = PET
+L["Tabard"] = TABARDSLOT
+L["Title"] = LFG_LIST_TITLE
+L["Toy"] = TOY
+L["Transmog"] = PERKS_VENDOR_CATEGORY_TRANSMOG
\ No newline at end of file
diff --git a/Localization/deDE.lua b/Localization/deDE.lua
index f8986aee..8a8d8fc4 100644
--- a/Localization/deDE.lua
+++ b/Localization/deDE.lua
@@ -8,7 +8,7 @@ addon.Plugins:LoadLocalization(L);
 -- [[ https://legacy.curseforge.com/wow/addons/krowi-achievement-filter/localization ]] --
 -- [[ Everything after this line is automatically generated from CurseForge and is not meant for manual edit - SOURCETOKEN - AUTOGENTOKEN ]] --
 
--- [[ Exported at 2024-12-20 17-46-23 ]] --
+-- [[ Exported at 2024-12-23 10-59-50 ]] --
 L["%c"] = true
 L["%d/%m/%Y %I:%M %p"] = true
 L["%m/%d/%Y %I:%M %p"] = true
@@ -195,7 +195,6 @@ L["Criteria is Completed"] = "Kriterien erfüllt sind"
 L["Criteria is Completed Desc"] = "Erfolgs-Kriterien anzeigen, auch wenn die Erfolgs-Kriterien bereits erfüllt sind."
 L["Criteria of"] = "Kriterien"
 L["Cross-Expansion"] = "Addon-Übergreifend"
-L["Cross-Expansion - Delves"] = "Addon-Übergreifend - Tiefen"
 L["Ctrl"] = true
 L["Current Obtainable"] = "Aktuell Erreichbar"
 L["Current Zone"] = "Aktuelle Zone"
@@ -572,7 +571,6 @@ L["Login Delay"] = "Login Verzögerung"
 L["Love is in the Air"] = "Liebe liegt in der Luft"
 L["Lucky Yi"] = "Glückspilz Yi"
 L["Lunar Festival"] = "Mondfest"
-L["PvE Season"] = "Mythic+ Saison"
 L["Make windows movable"] = "Fenster verschiebbar machen"
 L["Make windows movable Desc"] = [=[Macht das Erfolgsfenster, die Kalenderansicht und die Charakterübersicht beweglich/nicht beweglich.
 
diff --git a/Localization/enUS.lua b/Localization/enUS.lua
index c60fa83a..9186bba9 100644
--- a/Localization/enUS.lua
+++ b/Localization/enUS.lua
@@ -7,7 +7,7 @@ addon.Plugins:LoadLocalization(L);
 -- [[ https://legacy.curseforge.com/wow/addons/krowi-achievement-filter/localization ]] --
 -- [[ Everything after this line is automatically generated from CurseForge and is not meant for manual edit - SOURCETOKEN - AUTOGENTOKEN ]] --
 
--- [[ Exported at 2024-12-20 17-46-14 ]] --
+-- [[ Exported at 2024-12-23 10-59-30 ]] --
 L["%c"] = true
 L["%d/%m/%Y %I:%M %p"] = true
 L["%m/%d/%Y %I:%M %p"] = true
@@ -56,6 +56,7 @@ L["Add to Watch List"] = "Add to {watchList}"
 L["Added in version"] = true
 L["Adjustable Categories"] = true
 L["Aki the Chosen"] = true
+L["Allied Race"] = true
 L["Alt"] = true
 L["Always Show Completed"] = true
 L["Always show realm"] = true
@@ -585,7 +586,6 @@ L["Login Delay"] = true
 L["Love is in the Air"] = true
 L["Lucky Yi"] = true
 L["Lunar Festival"] = true
-L["PvE Season"] = true
 L["Make windows movable"] = true
 L["Make windows movable Desc"] = [=[Makes the Achievement window Calendar view and Data manager movable/not movable.
 
@@ -661,6 +661,7 @@ L["NONC"] = true
 L["None"] = true
 L["No-No"] = true
 L["Northrend Cup"] = true
+L["Not Categorized"] = true
 L["Not Earned By"] = true
 L["Not earned by:"] = true
 L["Not loaded"] = true
@@ -670,6 +671,7 @@ L["Number of Earned By characters"] = "Number of {earnedBy} characters"
 L["Number of Earned By characters Desc"] = [=[The number of characters that will be displayed that have earned the achievement.
 
 Setting it to 0 will disable this feature.]=]
+L["Number of lines"] = true
 L["Number of Most progress characters"] = true
 L["Number of Most progress characters Desc"] = [=[The number of characters that will be displayed that have progress towards the achievement.
 
@@ -682,6 +684,7 @@ L["Number of search previews"] = true
 L["Number of search previews Desc"] = "The numbers of achievements shown as a preview of the full list of found achievements."
 L["Number of summary achievements"] = true
 L["Number of summary achievements Desc"] = "The number of achievements that will be shown in the summary view of each tab."
+L["Number of Temporarily obtainable lines Desc"] = "The number of lines that will be shown for {temporarilyObtainable} achievements if more than one momment was available to earn the achievement."
 L["N'Zoth (Uldum)"] = true
 L["N'Zoth (Vale of Eternal Blossoms)"] = true
 L["N'Zoth Assaults"] = true
@@ -731,6 +734,7 @@ L["Print map info"] = true
 L["Print map info Desc"] = "Print the map id to chat"
 L["Print map info w/o reload"] = true
 L["Print map info w/o reload Desc"] = "Print it directly without having to reload"
+L["PvE Season"] = true
 L["PvP"] = "Player vs. Player"
 L["PvP Season"] = true
 L["Quick Search"] = true
@@ -765,6 +769,7 @@ L["Related Tab"] = true
 L["Related Tab Desc"] = "Adds an extra bit to the {wowheadLink} so another tab different than the default one will be selected."
 L["Remember frame position"] = "Remember {frame} position"
 L["Remember frame position Desc"] = "Remember the {frame} position. This will keep the {frame} in it's last known position the next time you log in."
+L["Remix Pandaria Bronze"] = true
 L["Remove from Watch List"] = "Remove from {watchList}"
 L["Required for"] = true
 L["Requires"] = true
@@ -947,6 +952,7 @@ L["Siege of Orgrimmar"] = true
 L["Siege on Dragonbane Keep"] = true
 L["Siege on Dragonbane Keep: Active"] = true
 L["Siege on Dragonbane Keep: Gathering"] = true
+L["Siren Isle"] = true
 L["Skitterer Xi'a"] = true
 L["Skoldus Hall"] = true
 L["Skyriding Races"] = true
@@ -988,6 +994,7 @@ L["Tab Priority"] = true
 L["Tab Priority Desc"] = "When enabled, when clicking on an achievement from anywhere to go to the achievement, the prioritized tab will be used first to search for the achievement and open the window to that tab. If the achievement is not present in that tab, default rules will apply."
 L["Tabs"] = true
 L["Ta's Pet Collection"] = true
+L["Teleport"] = true
 L["Temporarily obtainable"] = true
 L["temporarily obtainable"] = true
 L["Temporarily obtainable Header Colors"] = "{tempObt} Header Colors"
@@ -1050,6 +1057,7 @@ L["Track achievement browsing history Desc"] = [=[When enabled, show a back and
 This allows for the navigation of your browsing history of selected achievements just like your internet browser does for visited websites.]=]
 L["Tracking"] = true
 L["Tracking Achievements"] = true
+L["Trader's Tender"] = true
 L["Trading Post"] = true
 L["Transmog Sets"] = true
 L["Truncate"] = true
@@ -1126,6 +1134,4 @@ L["Zaqali Ruin Investigation: Next"] = true
 L["Zaqali Ruin Investigation: Soon"] = true
 L["Zaqali Ruin Investigation: Starting Soon"] = true
 L["Zones"] = true
-L["Zuldazar"] = true
-L["Number of lines"] = true
-L["Number of Temporarily obtainable lines Desc"] = "The number of lines that will be shown for {temporarilyObtainable} achievements if more than one momment was available to earn the achievement."
\ No newline at end of file
+L["Zuldazar"] = true
\ No newline at end of file
diff --git a/Localization/frFR.lua b/Localization/frFR.lua
index 7eee8b11..c2778160 100644
--- a/Localization/frFR.lua
+++ b/Localization/frFR.lua
@@ -8,7 +8,7 @@ addon.Plugins:LoadLocalization(L);
 -- [[ https://legacy.curseforge.com/wow/addons/krowi-achievement-filter/localization ]] --
 -- [[ Everything after this line is automatically generated from CurseForge and is not meant for manual edit - SOURCETOKEN - AUTOGENTOKEN ]] --
 
--- [[ Exported at 2024-12-20 17-46-36 ]] --
+-- [[ Exported at 2024-12-23 11-00-19 ]] --
 L["%c"] = true
 L["%d/%m/%Y %I:%M %p"] = true
 L["%m/%d/%Y %I:%M %p"] = true
@@ -196,7 +196,6 @@ L["Criteria is Completed"] = "Le critère est terminé"
 L["Criteria is Completed Desc"] = "Afficher les critères du Haut-fait même s'il est déjà terminé."
 L["Criteria of"] = "Critère de"
 L["Cross-Expansion"] = "Contenus transversaux"
-L["Cross-Expansion - Delves"] = "Contenus transversaux - Gouffres"
 L["Ctrl"] = true
 L["Current Obtainable"] = "Actuellement disponible"
 L["Current Zone"] = "Zone actuelle"
@@ -570,7 +569,6 @@ L["Login Delay"] = "Délais"
 L["Love is in the Air"] = "De l'amour dans l'air"
 L["Lucky Yi"] = "Yi la Chance"
 L["Lunar Festival"] = "Fête lunaire"
-L["PvE Season"] = "Saison des donjons mythiques+ (M+)"
 L["Make windows movable"] = "Rendre la fenêtre déplaçable"
 L["Make windows movable Desc"] = [=[Rend la fenêtre des Hauts-faits, la vue du calendrier et la fiche personnages mobiles ou immobiles.
 Si cette option est activée, la fenêtre correspondante sera déplacée lorsque le bouton gauche de la souris sera enfoncé. Ceci s'applique à l'en-tête et aux marges.]=]
diff --git a/Localization/ruRU.lua b/Localization/ruRU.lua
index 78425897..22ecca60 100644
--- a/Localization/ruRU.lua
+++ b/Localization/ruRU.lua
@@ -8,7 +8,7 @@ addon.Plugins:LoadLocalization(L);
 -- [[ https://legacy.curseforge.com/wow/addons/krowi-achievement-filter/localization ]] --
 -- [[ Everything after this line is automatically generated from CurseForge and is not meant for manual edit - SOURCETOKEN - AUTOGENTOKEN ]] --
 
--- [[ Exported at 2024-12-20 17-46-41 ]] --
+-- [[ Exported at 2024-12-23 11-00-28 ]] --
 L["%c"] = true
 L["%d/%m/%Y %I:%M %p"] = true
 L["%m/%d/%Y %I:%M %p"] = true
@@ -163,7 +163,6 @@ L["Criteria is Completed"] = "Критерия выполнена"
 L["Criteria is Completed Desc"] = "Отображать критерии достижения, даже если они уже выполнены."
 L["Criteria of"] = "Критерия"
 L["Cross-Expansion"] = "Пересечение дополнений"
-L["Cross-Expansion - Delves"] = "Меж-дополнение - Вылазки"
 L["Ctrl"] = true
 L["Current Obtainable"] = "Доступно сейчас"
 L["Current Zone"] = "Текущее место"
@@ -384,7 +383,6 @@ L["Login Delay"] = "Задержка входа"
 L["Love is in the Air"] = "Любовная лихорадка"
 L["Lucky Yi"] = "Счастливчик И"
 L["Lunar Festival"] = "Лунный Фестиваль"
-L["PvE Season"] = "Сезон М+"
 L["Make windows movable"] = "Сделать окна подвижными"
 L["Make windows movable Desc"] = "Позволяет перемещать/не перемещать окно календаря достижений и диспетчер данных. Если установлен флажок, удерживание нажатой левой кнопки мыши перемещает окно достижений. Это работает с заголовком и границами."
 L["Mantid"] = "Богомол"
diff --git a/Localization/zhCN.lua b/Localization/zhCN.lua
index 415082aa..ae11f070 100644
--- a/Localization/zhCN.lua
+++ b/Localization/zhCN.lua
@@ -8,7 +8,7 @@ addon.Plugins:LoadLocalization(L);
 -- [[ https://legacy.curseforge.com/wow/addons/krowi-achievement-filter/localization ]] --
 -- [[ Everything after this line is automatically generated from CurseForge and is not meant for manual edit - SOURCETOKEN - AUTOGENTOKEN ]] --
 
--- [[ Exported at 2024-12-20 17-46-43 ]] --
+-- [[ Exported at 2024-12-23 11-00-36 ]] --
 L["%c"] = true
 L["%d/%m/%Y %I:%M %p"] = true
 L["%m/%d/%Y %I:%M %p"] = true
@@ -196,7 +196,6 @@ L["Criteria is Completed"] = "要求已达成"
 L["Criteria is Completed Desc"] = "成就要求已达成时仍然显示"
 L["Criteria of"] = "条件信息"
 L["Cross-Expansion"] = "跨资料片"
-L["Cross-Expansion - Delves"] = "跨资料片 - 地下堡"
 L["Ctrl"] = true
 L["Current Obtainable"] = "当前可得"
 L["Current Zone"] = "当前区域"
@@ -501,10 +500,10 @@ L["Go to"] = "前往"
 L["Going away with"] = "即将绝版"
 L["Gorespine"] = "血刺"
 L["Grand Hunts"] = "洪荒狩猎"
-L["Grand Hunts: Ohn'ahran Plains"] = "洪荒狩猎: 欧恩哈拉平原"
-L["Grand Hunts: Thaldraszus"] = "洪荒狩猎: 索德拉苏斯"
-L["Grand Hunts: The Azure Span"] = "洪荒狩猎: 碧蓝林海"
-L["Grand Hunts: The Waking Shore"] = "洪荒狩猎: 觉醒海岸"
+L["Grand Hunts: Ohn'ahran Plains"] = "洪荒狩猎：欧恩哈拉平原"
+L["Grand Hunts: Thaldraszus"] = "洪荒狩猎：索德拉苏斯"
+L["Grand Hunts: The Azure Span"] = "洪荒狩猎：碧蓝林海"
+L["Grand Hunts: The Waking Shore"] = "洪荒狩猎：觉醒海岸"
 L["Green"] = "绿色"
 L["Grey"] = "灰色"
 L["Greyhoof"] = "灰蹄"
@@ -559,7 +558,7 @@ L["Left Alt"] = "左Alt"
 L["Left click"] = "左键"
 L["Left Ctrl"] = "左Ctrl"
 L["Left Shift"] = "左Shift"
-L["Legion Assaults"] = "军团突袭"
+L["Legion Assaults"] = "军团入侵"
 L["Level 80"] = "80级"
 L["Level 85"] = "85级"
 L["Level 90"] = "90级"
@@ -579,7 +578,6 @@ L["Login Delay"] = "登录延迟"
 L["Love is in the Air"] = "情人节"
 L["Lucky Yi"] = "幸运的小艺"
 L["Lunar Festival"] = "春节"
-L["PvE Season"] = "史诗钥石赛季"
 L["Make windows movable"] = "解锁窗口"
 L["Make windows movable Desc"] = [=[解锁/锁定成就界面和成就日历