From 194a48281c99b70152fc0ad9c960fe29df19536a Mon Sep 17 00:00:00 2001
From: Spit <19otari98@gmail.com>
Date: Sun, 20 Oct 2024 18:41:09 +0300
Subject: [PATCH] Added source on tooltip option

---
 Core/AtlasLoot.lua              |  100 +--
 Core/AtlasLoot.xml              |   19 +
 Core/ButtonRegistry.lua         |    6 +-
 Core/Dungeons.lua               |   82 +--
 Core/Tooltip.lua                |  399 ++++++++++
 Core/WorldEvents.lua            |    4 +-
 Crafting/crafting.en.lua        |    8 +-
 Instances/instances.en.lua      |   23 +-
 Locale/locale.cn.lua            |    2 +-
 Locale/locale.de.lua            |    2 +-
 Locale/locale.en.lua            |  135 ++--
 Locale/locale.es.lua            |    2 +-
 Locale/locale.fr.lua            |    2 +-
 Locale/locale.ru.lua            |    2 +-
 Locale/locale.tw.lua            |    2 +-
 PvP/Battlegrounds.en.lua        |    2 +-
 Sets/sets.lua                   |   20 +-
 TableRegister/loottables.en.lua | 1228 +++++++++++++++----------------
 WorldBosses/worldbosses.en.lua  |    8 +-
 19 files changed, 1256 insertions(+), 790 deletions(-)
 create mode 100644 Core/Tooltip.lua

diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua
index 4783a74..5804dab 100644
--- a/Core/AtlasLoot.lua
+++ b/Core/AtlasLoot.lua
@@ -477,6 +477,7 @@ function AtlasLootOptions_Init()
 	AtlasLootOptionsFrameDefaultTT:SetChecked(AtlasLootCharDB.DefaultTT);
 	AtlasLootOptionsFrameLootlinkTT:SetChecked(AtlasLootCharDB.LootlinkTT);
 	AtlasLootOptionsFrameItemSyncTT:SetChecked(AtlasLootCharDB.ItemSyncTT);
+	AtlasLootOptionsFrameShowSource:SetChecked(AtlasLootCharDB.ShowSource);
 	AtlasLootOptionsFrameEquipCompare:SetChecked(AtlasLootCharDB.EquipCompare);
 	AtlasLootOptionsFrameOpaque:SetChecked(AtlasLootCharDB.Opaque);
 	AtlasLootOptionsFrameItemID:SetChecked(AtlasLootCharDB.ItemIDs);
@@ -504,6 +505,7 @@ function AtlasLootOptions_Fresh()
 	AtlasLootCharDB.DefaultTT = true;
 	AtlasLootCharDB.LootlinkTT = false;
 	AtlasLootCharDB.ItemSyncTT = false;
+	AtlasLootCharDB.ShowSource = true;
 	AtlasLootCharDB.EquipCompare = false;
 	AtlasLootCharDB.Opaque = false;
 	AtlasLootCharDB.ItemIDs = false;
@@ -1003,6 +1005,15 @@ function AtlasLootOptions_ItemSyncTTToggle()
 	AtlasLootOptions_Init();
 end
 
+function AtlasLootOptions_ShowSourceToggle()
+	if(AtlasLootCharDB.ShowSource) then
+		AtlasLootCharDB.ShowSource = false;
+	else
+		AtlasLootCharDB.ShowSource = true;
+	end
+	AtlasLootOptions_Init();
+end
+
 --[[
 AtlasLootOptions_EquipCompareToggle:
 Toggles EquipCompare. Adds a tooltip with the equipped item (if it's the case) next to the default one.
@@ -2219,6 +2230,7 @@ function AtlasLootOptions_DefaultSettings()
 	AtlasLootCharDB.DefaultTT = true;
 	AtlasLootCharDB.LootlinkTT = false;
 	AtlasLootCharDB.ItemSyncTT = false;
+	AtlasLootCharDB.ShowSource = true;
 	AtlasLootCharDB.EquipCompare = false;
 	AtlasLootCharDB.Opaque = false;
 	AtlasLootCharDB.ItemIDs = false;
@@ -2304,50 +2316,50 @@ end
 AtlasLoot_HewdropDown = {
 	[1] = {
 		[AL["Dungeons & Raids"]] = {
-			[1] = {{ AL["Ragefire Chasm"], "RagefireChasm", "Submenu" },},
-			[2] = {{ AL["Wailing Caverns"], "WailingCaverns", "Submenu" },},
-			[3] = {{ AL["The Deadmines"], "Deadmines", "Submenu" },},
-			[4] = {{ AL["Shadowfang Keep"], "ShadowfangKeep", "Submenu" },},
-			[5] = {{ AL["Blackfathom Deeps"], "BlackfathomDeeps", "Submenu" },},
-			[6] = {{ AL["The Stockade"], "TheStockade", "Submenu" },},
-			[7] = {{ AL["Gnomeregan"], "Gnomeregan", "Submenu" },},
-			[8] = {{ AL["Razorfen Kraul"], "RazorfenKraul", "Submenu" },},
-			[9] = {{ AL["The Crescent Grove"], "TheCrescentGrove", "Submenu" },},
-			[10] = {[AL["Scarlet Monastery"]] = {
-					{ AL["Scarlet Monastery (Graveyard)"], "SMGraveyard", "Submenu" },
-					{ AL["Scarlet Monastery (Library)"], "SMLibrary", "Submenu" },
-					{ AL["Scarlet Monastery (Armory)"], "SMArmory", "Submenu" },
-					{ AL["Scarlet Monastery (Cathedral)"], "SMCathedral", "Submenu" },
+			[1] = {{ AL["[13-18] Ragefire Chasm"], "RagefireChasm", "Submenu" },},
+			[2] = {{ AL["[17-24] Wailing Caverns"], "WailingCaverns", "Submenu" },},
+			[3] = {{ AL["[17-24] The Deadmines"], "Deadmines", "Submenu" },},
+			[4] = {{ AL["[22-30] Shadowfang Keep"], "ShadowfangKeep", "Submenu" },},
+			[5] = {{ AL["[23-32] Blackfathom Deeps"], "BlackfathomDeeps", "Submenu" },},
+			[6] = {{ AL["[22-30] The Stockade"], "TheStockade", "Submenu" },},
+			[7] = {{ AL["[29-38] Gnomeregan"], "Gnomeregan", "Submenu" },},
+			[8] = {{ AL["[29-38] Razorfen Kraul"], "RazorfenKraul", "Submenu" },},
+			[9] = {{ AL["[32-38] The Crescent Grove"], "TheCrescentGrove", "Submenu" },},
+			[10] = {[AL["[27-45] Scarlet Monastery"]] = {
+					{ AL["[27-36] Scarlet Monastery (Graveyard)"], "SMGraveyard", "Submenu" },
+					{ AL["[28-39] Scarlet Monastery (Library)"], "SMLibrary", "Submenu" },
+					{ AL["[32-41] Scarlet Monastery (Armory)"], "SMArmory", "Submenu" },
+					{ AL["[35-45] Scarlet Monastery (Cathedral)"], "SMCathedral", "Submenu" },
 				},},
-			[11] = {{ AL["Razorfen Downs"], "RazorfenDowns", "Submenu" },},
-			[12] = {{ AL["Uldaman"], "Uldaman", "Submenu" },},
-			[13] = {{ AL["Gilneas City"], "GilneasCity", "Submenu" },},
-			[14] = {{ AL["Maraudon"], "Maraudon", "Submenu" },},
-			[15] = {{ AL["Zul'Farrak"], "ZulFarrak", "Submenu" },},
-			[16] = {{ AL["The Sunken Temple"], "SunkenTemple", "Submenu" },},
-			[17] = {{ AL["Hateforge Quarry"], "HateforgeQuarry", "Submenu" },},
-			[18] = {{ AL["Blackrock Depths"], "BlackrockDepths", "Submenu" },},
-			[19] = {[AL["Dire Maul"]] = {
-					{ AL["Dire Maul (East)"], "DireMaulEast", "Submenu" },
-					{ AL["Dire Maul (West)"], "DireMaulWest", "Submenu" },
-					{ AL["Dire Maul (North)"], "DireMaulNorth", "Submenu" },
+			[11] = {{ AL["[36-46] Razorfen Downs"], "RazorfenDowns", "Submenu" },},
+			[12] = {{ AL["[40-51] Uldaman"], "Uldaman", "Submenu" },},
+			[13] = {{ AL["[42-50] Gilneas City"], "GilneasCity", "Submenu" },},
+			[14] = {{ AL["[45-55] Maraudon"], "Maraudon", "Submenu" },},
+			[15] = {{ AL["[44-54] Zul'Farrak"], "ZulFarrak", "Submenu" },},
+			[16] = {{ AL["[50-60] The Sunken Temple"], "SunkenTemple", "Submenu" },},
+			[17] = {{ AL["[50-60] Hateforge Quarry"], "HateforgeQuarry", "Submenu" },},
+			[18] = {{ AL["[52-60] Blackrock Depths"], "BlackrockDepths", "Submenu" },},
+			[19] = {[AL["[55-60] Dire Maul"]] = {
+					{ AL["[55-60] Dire Maul (East)"], "DireMaulEast", "Submenu" },
+					{ AL["[57-60] Dire Maul (West)"], "DireMaulWest", "Submenu" },
+					{ AL["[57-60] Dire Maul (North)"], "DireMaulNorth", "Submenu" },
 				},},
-			[20] = {{ AL["Scholomance"], "Scholomance", "Submenu" },},
-			[21] = {{ AL["Stratholme"], "Stratholme", "Submenu" },},
-			[22] = {{ AL["Lower Blackrock Spire"], "LowerBlackrock", "Submenu" },},
-			[23] = {{ AL["Upper Blackrock Spire"], "UpperBlackrock", "Submenu" },},
-			[24] = {{ AL["Karazhan Crypt"], "KarazhanCrypt", "Submenu" },},
-			[25] = {{ AL["Caverns of Time: Black Morass"], "CavernsOfTimeBlackMorass", "Submenu" },},
-			[26] = {{ AL["Stormwind Vault"], "StormwindVault", "Submenu" },},
-			[27] = {{ AL["Zul'Gurub"], "ZulGurub", "Submenu" },},
-			[28] = {{ AL["Ruins of Ahn'Qiraj"], "RuinsofAQ", "Submenu" },},
-			[29] = {{ AL["Molten Core"], "MoltenCore", "Submenu" },},
-			[30] = {{ AL["Onyxia's Lair"], "Onyxia", "Submenu" },},
-			[31] = {{ AL["Lower Karazhan Halls"], "LowerKara", "Submenu" },},
-			[32] = {{ AL["Blackwing Lair"], "BlackwingLair", "Submenu" },},
-			[33] = {{ AL["Emerald Sanctum"], "EmeraldSanctum", "Submenu" },},
-			[34] = {{ AL["Temple of Ahn'Qiraj"], "TempleofAQ", "Submenu" },},
-			[35] = {{ AL["Naxxramas"], "Naxxramas", "Submenu" },},
+			[20] = {{ AL["[58-60] Scholomance"], "Scholomance", "Submenu" },},
+			[21] = {{ AL["[58-60] Stratholme"], "Stratholme", "Submenu" },},
+			[22] = {{ AL["[55-60] Lower Blackrock Spire"], "LowerBlackrock", "Submenu" },},
+			[23] = {{ AL["[58-60] Upper Blackrock Spire"], "UpperBlackrock", "Submenu" },},
+			[24] = {{ AL["[58-60] Karazhan Crypt"], "KarazhanCrypt", "Submenu" },},
+			[25] = {{ AL["[60] Caverns of Time: Black Morass"], "CavernsOfTimeBlackMorass", "Submenu" },},
+			[26] = {{ AL["[60] Stormwind Vault"], "StormwindVault", "Submenu" },},
+			[27] = {{ AL["[RAID] Zul'Gurub"], "ZulGurub", "Submenu" },},
+			[28] = {{ AL["[RAID] Ruins of Ahn'Qiraj"], "RuinsofAQ", "Submenu" },},
+			[29] = {{ AL["[RAID] Molten Core"], "MoltenCore", "Submenu" },},
+			[30] = {{ AL["[RAID] Onyxia's Lair"], "Onyxia", "Submenu" },},
+			[31] = {{ AL["[RAID] Lower Karazhan Halls"], "LowerKara", "Submenu" },},
+			[32] = {{ AL["[RAID] Blackwing Lair"], "BlackwingLair", "Submenu" },},
+			[33] = {{ AL["[RAID] Emerald Sanctum"], "EmeraldSanctum", "Submenu" },},
+			[34] = {{ AL["[RAID] Temple of Ahn'Qiraj"], "TempleofAQ", "Submenu" },},
+			[35] = {{ AL["[RAID] Naxxramas"], "Naxxramas", "Submenu" },},
 		},
 	},
 	[2] = { [AL["World Bosses"]] = {
@@ -2433,7 +2445,7 @@ AtlasLoot_HewdropDown = {
 			[2] = {{ AL["Children's Week"], "ChildrensWeek", "Table" },},
 			[3] = {{ AL["Elemental Invasion"], "ElementalInvasion", "Table" },},
 			[4] = {{ AL["Feast of Winter Veil"], "Winterviel1", "Table" },},
-			[5] = {{ AL["Gurubashi Arena Booty Run"], "GurubashiArena", "Table" },},
+			[5] = {{ AL["Gurubashi Arena"], "GurubashiArena", "Table" },},
 			[6] = {{ AL["Hallow's End"], "Halloween1", "Table" },},
 			[7] = {{ AL["Harvest Festival"], "HarvestFestival", "Table" },},
 			[8] = {{ AL["Love is in the Air"], "Valentineday", "Table" },},
@@ -2667,7 +2679,7 @@ AtlasLoot_HewdropDown_SubTables = {
 		{ AL["Trash Mobs"], "SMCTrash" },
 	},
 	["Scholomance"] = {
-		{ AL["Blood Steward of Kirtonos"], "SCHOLOBlood" },
+		--{ AL["Blood Steward of Kirtonos"], "SCHOLOBlood" },
 		{ AL["Kirtonos the Herald"], "SCHOLOKirtonostheHerald" },
 		{ AL["Jandice Barov"], "SCHOLOJandiceBarov" },
 		{ AL["Lord Blackwood"].." ("..AL["Scourge Invasion"]..")", "SCHOLOLordBlackwood" },
diff --git a/Core/AtlasLoot.xml b/Core/AtlasLoot.xml
index 712ce51..f2729e5 100644
--- a/Core/AtlasLoot.xml
+++ b/Core/AtlasLoot.xml
@@ -13,6 +13,7 @@
 	<Script file="Search.lua"/>
 	<Script file="WorldBoss.lua"/>
 	<Script file="Dungeons.lua"/>
+	<Script file="Tooltip.lua"/>
 
 	<Button name="AtlasLootDefaultFrameButtonTemplate" inherits="OptionsButtonTemplate" virtual="true">
 		<Size>
@@ -1473,6 +1474,24 @@
 					</OnClick>
 				</Scripts>
 			</CheckButton>
+			<CheckButton name="$parentShowSource" inherits="OptionsCheckButtonTemplate">
+				<Anchors>
+					<Anchor point="TOPLEFT">
+						<Offset>
+							<AbsDimension x="20" y="-220"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+					<OnLoad>
+						local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
+						getglobal(this:GetName().."Text"):SetText(AL["Show Source on Tooltips"]);
+					</OnLoad>
+					<OnClick>
+						AtlasLootOptions_ShowSourceToggle();
+					</OnClick>
+				</Scripts>
+			</CheckButton>
 			<CheckButton name="$parentEquipCompare" inherits="OptionsCheckButtonTemplate">
 				<Anchors>
 					<Anchor point="TOPLEFT">
diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua
index 3737cfb..cb926d3 100644
--- a/Core/ButtonRegistry.lua
+++ b/Core/ButtonRegistry.lua
@@ -1427,8 +1427,8 @@ AtlasLoot_ButtonRegistry = {
 		Title = AL["Kirtonos the Herald"];
 		Next_Page = "SCHOLOJandiceBarov";
 		Next_Title = AL["Jandice Barov"];
-		Prev_Page = "SCHOLOBlood";
-		Prev_Title = AL["Blood Steward of Kirtonos"];
+		--Prev_Page = "SCHOLOBlood";
+		--Prev_Title = AL["Blood Steward of Kirtonos"];
 		Back_Page = "DUNGEONSMENU1";
 		Back_Title = AL["Dungeons & Raids"];
 	};
@@ -5036,7 +5036,7 @@ AtlasLoot_ButtonRegistry = {
 		Back_Title = AL["World Events"];
 	};
 	["GurubashiArena"] = {
-		Title = AL["Gurubashi Arena Booty Run"];
+		Title = AL["Gurubashi Arena"];
 		Back_Page = "WORLDEVENTMENU";
 		Back_Title = AL["World Events"];
 	};
diff --git a/Core/Dungeons.lua b/Core/Dungeons.lua
index ac2c494..8034dd3 100644
--- a/Core/Dungeons.lua
+++ b/Core/Dungeons.lua
@@ -19,181 +19,181 @@ function AtlasLoot_DungeonsMenu1()
 	getglobal("AtlasLootItemsFrame_PREV"):Hide();
 	getglobal("AtlasLootServerQueryButton"):Hide();
     --RFC
-    AtlasLootMenuItem_1_Name:SetText(AL["Ragefire Chasm"]);
+    AtlasLootMenuItem_1_Name:SetText(AL["[13-18] Ragefire Chasm"]);
 	AtlasLootMenuItem_1_Extra:SetText(AL["Orgrimmar"]);
 	AtlasLootMenuItem_1_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_1.lootpage="RFCTaragaman";
 	AtlasLootMenuItem_1:Show();
     --WC
-    AtlasLootMenuItem_2_Name:SetText(AL["Wailing Caverns"]);
+    AtlasLootMenuItem_2_Name:SetText(AL["[17-24] Wailing Caverns"]);
 	AtlasLootMenuItem_2_Extra:SetText(AL["Barrens"]);
 	AtlasLootMenuItem_2_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_2.lootpage="WCLordCobrahn";
 	AtlasLootMenuItem_2:Show();
 	--DM
-	AtlasLootMenuItem_3_Name:SetText(AL["The Deadmines"]);
+	AtlasLootMenuItem_3_Name:SetText(AL["[17-24] The Deadmines"]);
 	AtlasLootMenuItem_3_Extra:SetText(AL["Westfall"]);
 	AtlasLootMenuItem_3_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_3.lootpage="DMRhahkZor";
 	AtlasLootMenuItem_3:Show();
 	--SFK
-	AtlasLootMenuItem_4_Name:SetText(AL["Shadowfang Keep"]);
+	AtlasLootMenuItem_4_Name:SetText(AL["[22-30] Shadowfang Keep"]);
 	AtlasLootMenuItem_4_Extra:SetText(AL["Silverpine Forest"]);
 	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_4.lootpage="SFKRethilgore";
 	AtlasLootMenuItem_4:Show();
 	--BFD
-	AtlasLootMenuItem_5_Name:SetText(AL["Blackfathom Deeps"]);
+	AtlasLootMenuItem_5_Name:SetText(AL["[23-32] Blackfathom Deeps"]);
 	AtlasLootMenuItem_5_Extra:SetText(AL["Ashenvale"]);
 	AtlasLootMenuItem_5_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_5.lootpage="BFDGhamoora";
 	AtlasLootMenuItem_5:Show();
 	--Stockades
-	AtlasLootMenuItem_6_Name:SetText(AL["The Stockade"]);
+	AtlasLootMenuItem_6_Name:SetText(AL["[22-30] The Stockade"]);
 	AtlasLootMenuItem_6_Extra:SetText(AL["Stormwind"]);
 	AtlasLootMenuItem_6_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_6.lootpage="SWStTargorr";
 	AtlasLootMenuItem_6:Show();
 	--Gnomer
-	AtlasLootMenuItem_7_Name:SetText(AL["Gnomeregan"]);
+	AtlasLootMenuItem_7_Name:SetText(AL["[29-38] Gnomeregan"]);
 	AtlasLootMenuItem_7_Extra:SetText(AL["Dun Morogh"]);
 	AtlasLootMenuItem_7_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_7.lootpage="GnGrubbis";
 	AtlasLootMenuItem_7:Show();
 	--RFK
-	AtlasLootMenuItem_8_Name:SetText(AL["Razorfen Kraul"]);
+	AtlasLootMenuItem_8_Name:SetText(AL["[29-38] Razorfen Kraul"]);
 	AtlasLootMenuItem_8_Extra:SetText(AL["Barrens"]);
 	AtlasLootMenuItem_8_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_8.lootpage="RFKAggem";
 	AtlasLootMenuItem_8:Show();
 	--Crescent Grove
-	AtlasLootMenuItem_9_Name:SetText(AL["The Crescent Grove"]);
+	AtlasLootMenuItem_9_Name:SetText(AL["[32-38] The Crescent Grove"]);
 	AtlasLootMenuItem_9_Extra:SetText(AL["Ashenvale"]);
 	AtlasLootMenuItem_9_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_9.lootpage="TCGGrovetenderEngryss";
 	AtlasLootMenuItem_9:Show();
 	--SM GY
-	AtlasLootMenuItem_10_Name:SetText(AL["Scarlet Monastery (Graveyard)"]);
+	AtlasLootMenuItem_10_Name:SetText(AL["[27-36] Scarlet Monastery (Graveyard)"]);
 	AtlasLootMenuItem_10_Extra:SetText(AL["Tirisfal Glades"]);
 	AtlasLootMenuItem_10_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_10.lootpage="SMVishas";
 	AtlasLootMenuItem_10:Show();
 	--SM Library
-	AtlasLootMenuItem_11_Name:SetText(AL["Scarlet Monastery (Library)"]);
+	AtlasLootMenuItem_11_Name:SetText(AL["[28-39] Scarlet Monastery (Library)"]);
 	AtlasLootMenuItem_11_Extra:SetText(AL["Tirisfal Glades"]);
 	AtlasLootMenuItem_11_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_11.lootpage="SMHoundmasterLoksey";
 	AtlasLootMenuItem_11:Show();
 	--SM Armory
-	AtlasLootMenuItem_12_Name:SetText(AL["Scarlet Monastery (Armory)"]);
+	AtlasLootMenuItem_12_Name:SetText(AL["[32-41] Scarlet Monastery (Armory)"]);
 	AtlasLootMenuItem_12_Extra:SetText(AL["Tirisfal Glades"]);
 	AtlasLootMenuItem_12_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_12.lootpage="SMHerod";
 	AtlasLootMenuItem_12:Show();
 	--SM Cathedral
-	AtlasLootMenuItem_13_Name:SetText(AL["Scarlet Monastery (Cathedral)"]);
+	AtlasLootMenuItem_13_Name:SetText(AL["[35-45] Scarlet Monastery (Cathedral)"]);
 	AtlasLootMenuItem_13_Extra:SetText(AL["Tirisfal Glades"]);
 	AtlasLootMenuItem_13_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_13.lootpage="SMFairbanks";
 	AtlasLootMenuItem_13:Show();
 	--RFD
-	AtlasLootMenuItem_14_Name:SetText(AL["Razorfen Downs"]);
+	AtlasLootMenuItem_14_Name:SetText(AL["[36-46] Razorfen Downs"]);
 	AtlasLootMenuItem_14_Extra:SetText(AL["Barrens"]);
 	AtlasLootMenuItem_14_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_14.lootpage="RFDTutenkash";
 	AtlasLootMenuItem_14:Show();
 	--Uldaman
-	AtlasLootMenuItem_15_Name:SetText(AL["Uldaman"]);
+	AtlasLootMenuItem_15_Name:SetText(AL["[40-51] Uldaman"]);
 	AtlasLootMenuItem_15_Extra:SetText(AL["Badlands"]);
 	AtlasLootMenuItem_15_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_15.lootpage="UldBaelog";
 	AtlasLootMenuItem_15:Show();
 	--Gilneas
-	AtlasLootMenuItem_16_Name:SetText(AL["Gilneas City"]);
+	AtlasLootMenuItem_16_Name:SetText(AL["[42-50] Gilneas City"]);
 	AtlasLootMenuItem_16_Extra:SetText(AL["Gilneas"]);
 	AtlasLootMenuItem_16_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_16.lootpage="GCMatthiasHoltz";
 	AtlasLootMenuItem_16:Show();
 	--Mara
-	AtlasLootMenuItem_17_Name:SetText(AL["Maraudon"]);
+	AtlasLootMenuItem_17_Name:SetText(AL["[45-55] Maraudon"]);
 	AtlasLootMenuItem_17_Extra:SetText(AL["Desolace"]);
 	AtlasLootMenuItem_17_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_17.lootpage="MaraNoxxion";
 	AtlasLootMenuItem_17:Show();
 	--ZF
-	AtlasLootMenuItem_18_Name:SetText(AL["Zul'Farrak"]);
+	AtlasLootMenuItem_18_Name:SetText(AL["[44-54] Zul'Farrak"]);
 	AtlasLootMenuItem_18_Extra:SetText(AL["Tanaris"]);
 	AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_18.lootpage="ZFAntusul";
 	AtlasLootMenuItem_18:Show();
 	--ST
-	AtlasLootMenuItem_19_Name:SetText(AL["The Sunken Temple"]);
+	AtlasLootMenuItem_19_Name:SetText(AL["[50-60] The Sunken Temple"]);
 	AtlasLootMenuItem_19_Extra:SetText(AL["Swamp of Sorrows"]);
 	AtlasLootMenuItem_19_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_19.lootpage="STBalconyMinibosses";
 	AtlasLootMenuItem_19:Show();
 	--HFQ
-	AtlasLootMenuItem_20_Name:SetText(AL["Hateforge Quarry"]);
+	AtlasLootMenuItem_20_Name:SetText(AL["[50-60] Hateforge Quarry"]);
 	AtlasLootMenuItem_20_Extra:SetText(AL["Burning Steppes"]);
 	AtlasLootMenuItem_20_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_20.lootpage="HQHighForemanBargulBlackhammer";
 	AtlasLootMenuItem_20:Show();
 	--BRD
-	AtlasLootMenuItem_21_Name:SetText(AL["Blackrock Depths"]);
+	AtlasLootMenuItem_21_Name:SetText(AL["[52-60] Blackrock Depths"]);
 	AtlasLootMenuItem_21_Extra:SetText(AL["Burning Steppes"]);
 	AtlasLootMenuItem_21_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_21.lootpage="BRDLordRoccor";
 	AtlasLootMenuItem_21:Show();
 	--DME
-	AtlasLootMenuItem_22_Name:SetText(AL["Dire Maul (East)"]);
+	AtlasLootMenuItem_22_Name:SetText(AL["[55-60] Dire Maul (East)"]);
 	AtlasLootMenuItem_22_Extra:SetText(AL["Feralas"]);
 	AtlasLootMenuItem_22_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_22.lootpage="DMEPusillin";
 	AtlasLootMenuItem_22:Show();
 	--DMW
-	AtlasLootMenuItem_23_Name:SetText(AL["Dire Maul (West)"]);
+	AtlasLootMenuItem_23_Name:SetText(AL["[57-60] Dire Maul (West)"]);
 	AtlasLootMenuItem_23_Extra:SetText(AL["Feralas"]);
 	AtlasLootMenuItem_23_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_23.lootpage="DMWTendrisWarpwood";
 	AtlasLootMenuItem_23:Show();
 	--DMN
-	AtlasLootMenuItem_24_Name:SetText(AL["Dire Maul (North)"]);
+	AtlasLootMenuItem_24_Name:SetText(AL["[57-60] Dire Maul (North)"]);
 	AtlasLootMenuItem_24_Extra:SetText(AL["Feralas"]);
 	AtlasLootMenuItem_24_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_24.lootpage="DMNGuardMoldar";
 	AtlasLootMenuItem_24:Show();
 	--Scholo
-	AtlasLootMenuItem_25_Name:SetText(AL["Scholomance"]);
+	AtlasLootMenuItem_25_Name:SetText(AL["[58-60] Scholomance"]);
 	AtlasLootMenuItem_25_Extra:SetText(AL["Western Plaguelands"]);
 	AtlasLootMenuItem_25_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
-	AtlasLootMenuItem_25.lootpage="SCHOLOBlood";
+	AtlasLootMenuItem_25.lootpage="SCHOLOKirtonostheHerald";
 	AtlasLootMenuItem_25:Show();
 	--Strat
-	AtlasLootMenuItem_26_Name:SetText(AL["Stratholme"]);
+	AtlasLootMenuItem_26_Name:SetText(AL["[58-60] Stratholme"]);
 	AtlasLootMenuItem_26_Extra:SetText(AL["Eastern Plaguelands"]);
 	AtlasLootMenuItem_26_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_26.lootpage="STRATSkull";
 	AtlasLootMenuItem_26:Show();
 	--LBRS
-	AtlasLootMenuItem_27_Name:SetText(AL["Lower Blackrock Spire"]);
+	AtlasLootMenuItem_27_Name:SetText(AL["[55-60] Lower Blackrock Spire"]);
 	AtlasLootMenuItem_27_Extra:SetText(AL["Burning Steppes"]);
 	AtlasLootMenuItem_27_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_27.lootpage="LBRSSpirestoneButcher";
 	AtlasLootMenuItem_27:Show();
 	--UBRS
-	AtlasLootMenuItem_28_Name:SetText(AL["Upper Blackrock Spire"]);
+	AtlasLootMenuItem_28_Name:SetText(AL["[58-60] Upper Blackrock Spire"]);
 	AtlasLootMenuItem_28_Extra:SetText(AL["Burning Steppes"]);
 	AtlasLootMenuItem_28_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_28.lootpage="UBRSEmberseer";
 	AtlasLootMenuItem_28:Show();
 	--Kara crypt
-	AtlasLootMenuItem_29_Name:SetText(AL["Karazhan Crypt"]);
+	AtlasLootMenuItem_29_Name:SetText(AL["[58-60] Karazhan Crypt"]);
 	AtlasLootMenuItem_29_Extra:SetText(AL["Deadwind Pass"]);
 	AtlasLootMenuItem_29_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_29.lootpage="KCMarrowspike";
 	AtlasLootMenuItem_29:Show()
 	--CoT:BM
-	AtlasLootMenuItem_30_Name:SetText(AL["Caverns of Time: Black Morass"]);
+	AtlasLootMenuItem_30_Name:SetText(AL["[60] Caverns of Time: Black Morass"]);
 	AtlasLootMenuItem_30_Extra:SetText(AL["Tanaris"]);
 	AtlasLootMenuItem_30_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_30.lootpage="COTBMChronar";
@@ -221,61 +221,61 @@ function AtlasLoot_DungeonsMenu2()
 	getglobal("AtlasLootItemsFrame_PREV"):Show();
 	getglobal("AtlasLootServerQueryButton"):Hide();
 	--SWV
-    AtlasLootMenuItem_1_Name:SetText(AL["Stormwind Vault"]);
+    AtlasLootMenuItem_1_Name:SetText(AL["[60] Stormwind Vault"]);
 	AtlasLootMenuItem_1_Extra:SetText(AL["Stormwind"]);
 	AtlasLootMenuItem_1_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalIronForge");
 	AtlasLootMenuItem_1.lootpage="SWVAszoshGrimflame";
 	AtlasLootMenuItem_1:Show();
 	--ZG
-    AtlasLootMenuItem_3_Name:SetText(AL["Zul'Gurub"]);
+    AtlasLootMenuItem_3_Name:SetText(AL["[RAID] Zul'Gurub"]);
 	AtlasLootMenuItem_3_Extra:SetText(AL["Stranglethorn Vale"]);
 	AtlasLootMenuItem_3_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
 	AtlasLootMenuItem_3.lootpage="ZGJeklik";
 	AtlasLootMenuItem_3:Show();
 	--AQ20
-	AtlasLootMenuItem_4_Name:SetText(AL["Ruins of Ahn'Qiraj"]);
+	AtlasLootMenuItem_4_Name:SetText(AL["[RAID] Ruins of Ahn'Qiraj"]);
 	AtlasLootMenuItem_4_Extra:SetText(AL["Silithus"]);
 	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
 	AtlasLootMenuItem_4.lootpage="AQ20Kurinnaxx";
 	AtlasLootMenuItem_4:Show();
 	--MC
-	AtlasLootMenuItem_5_Name:SetText(AL["Molten Core"]);
+	AtlasLootMenuItem_5_Name:SetText(AL["[RAID] Molten Core"]);
 	AtlasLootMenuItem_5_Extra:SetText(AL["Burning Steppes"]);
 	AtlasLootMenuItem_5_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
 	AtlasLootMenuItem_5.lootpage="MCLucifron";
 	AtlasLootMenuItem_5:Show();
 	--Ony
-	AtlasLootMenuItem_6_Name:SetText(AL["Onyxia's Lair"]);
+	AtlasLootMenuItem_6_Name:SetText(AL["[RAID] Onyxia's Lair"]);
 	AtlasLootMenuItem_6_Extra:SetText(AL["Dustwallow Marsh"]);
 	AtlasLootMenuItem_6_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
 	AtlasLootMenuItem_6.lootpage="Onyxia";
 	AtlasLootMenuItem_6:Show();
 	--LKH
-	AtlasLootMenuItem_7_Name:SetText(AL["Lower Karazhan Halls"]);
+	AtlasLootMenuItem_7_Name:SetText(AL["[RAID] Lower Karazhan Halls"]);
 	AtlasLootMenuItem_7_Extra:SetText(AL["Deadwind Pass"]);
 	AtlasLootMenuItem_7_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
 	AtlasLootMenuItem_7.lootpage="LKHRolfen";
 	AtlasLootMenuItem_7:Show();
 	--BWL
-	AtlasLootMenuItem_8_Name:SetText(AL["Blackwing Lair"]);
+	AtlasLootMenuItem_8_Name:SetText(AL["[RAID] Blackwing Lair"]);
 	AtlasLootMenuItem_8_Extra:SetText(AL["Burning Steppes"]);
 	AtlasLootMenuItem_8_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
 	AtlasLootMenuItem_8.lootpage="BWLRazorgore";
 	AtlasLootMenuItem_8:Show();
 	--ES
-	AtlasLootMenuItem_9_Name:SetText(AL["Emerald Sanctum"]);
+	AtlasLootMenuItem_9_Name:SetText(AL["[RAID] Emerald Sanctum"]);
 	AtlasLootMenuItem_9_Extra:SetText(AL["Hyjal"]);
 	AtlasLootMenuItem_9_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
 	AtlasLootMenuItem_9.lootpage="ESErennius";
 	AtlasLootMenuItem_9:Show();
 	--AQ40
-	AtlasLootMenuItem_10_Name:SetText(AL["Temple of Ahn'Qiraj"]);
+	AtlasLootMenuItem_10_Name:SetText(AL["[RAID] Temple of Ahn'Qiraj"]);
 	AtlasLootMenuItem_10_Extra:SetText(AL["Silithus"]);
 	AtlasLootMenuItem_10_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
 	AtlasLootMenuItem_10.lootpage="AQ40Skeram";
 	AtlasLootMenuItem_10:Show();
 	--Naxx
-	AtlasLootMenuItem_11_Name:SetText(AL["Naxxramas"]);
+	AtlasLootMenuItem_11_Name:SetText(AL["[RAID] Naxxramas"]);
 	AtlasLootMenuItem_11_Extra:SetText(AL["Eastern Plaguelands"]);
 	AtlasLootMenuItem_11_Icon:SetTexture("Interface\\Icons\\Spell_Arcane_PortalOrgrimmar");
 	AtlasLootMenuItem_11.lootpage="NAXPatchwerk";
diff --git a/Core/Tooltip.lua b/Core/Tooltip.lua
new file mode 100644
index 0000000..c5b648a
--- /dev/null
+++ b/Core/Tooltip.lua
@@ -0,0 +1,399 @@
+-- extra info on GameTooltip and ItemRefTooltip
+local AtlasLootTip = CreateFrame("Frame", "AtlasLootTip", GameTooltip)
+local strfind = string.find
+local tonumber = tonumber
+
+local GREY = "|cff999999"
+
+local LastSearchName = nil
+local lastSearchLink = nil
+local function GetItemLinkByName(name)
+	if name ~= LastSearchName then
+    	for itemID = 1, 90000 do
+      		local itemName, hyperLink, itemQuality = GetItemInfo(itemID)
+      		if (itemName and itemName == name) then
+        		local _, _, _, hex = GetItemQualityColor(tonumber(itemQuality))
+        		lastSearchLink = hex.. "|H"..hyperLink.."|h["..itemName.."]|h|r"
+     		end
+    	end
+		LastSearchName = name
+  	end
+	return lastSearchLink
+end
+
+local HookSetItemRef = SetItemRef
+SetItemRef = function(link, text, button)
+    local item, _, id = string.find(link, "item:(%d+):.*")
+	ItemRefTooltip.itemID = id
+    HookSetItemRef(link, text, button)
+    if not IsShiftKeyDown() and not IsControlKeyDown() and item then
+        AtlasLootTip.extendTooltip(ItemRefTooltip, "ItemRefTooltip")
+    end
+end
+
+local HookSetHyperlink = GameTooltip.SetHyperlink
+function GameTooltip.SetHyperlink(self, arg1)
+  if arg1 then
+    local _, _, linktype = string.find(arg1, "^(.-):(.+)$")
+    if linktype == "item" then
+        local _, _, id = string.find(arg1,"item:(%d+):.*")
+  		GameTooltip.itemID = id
+    end
+  end
+  return HookSetHyperlink(self, arg1)
+end
+
+local HookSetBagItem = GameTooltip.SetBagItem
+function GameTooltip.SetBagItem(self, container, slot)
+	if GetContainerItemLink(container, slot) then
+		local _, _, id = string.find(GetContainerItemLink(container, slot),"item:(%d+):.*")
+		GameTooltip.itemID = id
+	end
+  return HookSetBagItem(self, container, slot)
+end
+
+local HookSetLootItem = GameTooltip.SetLootItem
+function GameTooltip.SetLootItem(self, slot)
+	if GetLootSlotLink(slot) then
+		local _, _, id = string.find(GetLootSlotLink(slot),"item:(%d+):.*")
+		GameTooltip.itemID = id
+	end
+ 	HookSetLootItem(self, slot)
+end
+
+local HookSetInboxItem = GameTooltip.SetInboxItem
+function GameTooltip.SetInboxItem(self, mailID, attachmentIndex)
+	local itemName = GetInboxItem(mailID)
+	if itemName then
+		local _, _, id = string.find(GetItemLinkByName(itemName),"item:(%d+):.*")
+		GameTooltip.itemID = id
+	end
+	return HookSetInboxItem(self, mailID, attachmentIndex)
+end
+
+local HookSetInventoryItem = GameTooltip.SetInventoryItem
+function GameTooltip.SetInventoryItem(self, unit, slot)
+	if GetInventoryItemLink(unit, slot) then
+		local _, _, id = string.find(GetInventoryItemLink(unit, slot),"item:(%d+):.*")
+		GameTooltip.itemID = id
+	end
+	return HookSetInventoryItem(self, unit, slot)
+end
+
+local HookSetCraftItem = GameTooltip.SetCraftItem
+function GameTooltip.SetCraftItem(self, skill, slot)
+	if GetCraftReagentItemLink(skill, slot) then
+		local _, _, id = string.find(GetCraftReagentItemLink(skill, slot),"item:(%d+):.*")
+		GameTooltip.itemID = id
+	end
+	return HookSetCraftItem(self, skill, slot)
+end
+
+local HookSetTradeSkillItem = GameTooltip.SetTradeSkillItem
+function GameTooltip.SetTradeSkillItem(self, skillIndex, reagentIndex)
+	if reagentIndex then
+		if GetTradeSkillReagentItemLink(skillIndex, reagentIndex) then
+			local _, _, id = string.find(GetTradeSkillReagentItemLink(skillIndex, reagentIndex),"item:(%d+):.*")
+			GameTooltip.itemID = id
+		end
+	else
+		if GetTradeSkillItemLink(skillIndex) then
+			local _, _, id = string.find(GetTradeSkillItemLink(skillIndex),"item:(%d+):.*")
+			GameTooltip.itemID = id
+		end
+	end
+	return HookSetTradeSkillItem(self, skillIndex, reagentIndex)
+end
+
+local HookSetAuctionItem = GameTooltip.SetAuctionItem
+function GameTooltip.SetAuctionItem(self, atype, index)
+	local itemName = GetAuctionItemInfo(atype, index)
+	if itemName then
+		local _, _, id = string.find(GetItemLinkByName(itemName),"item:(%d+):.*")
+		GameTooltip.itemID = id
+	end
+	return HookSetAuctionItem(self, atype, index)
+end
+
+local HookSetAuctionSellItem = GameTooltip.SetAuctionSellItem
+function GameTooltip.SetAuctionSellItem(self)
+	local itemName = GetAuctionSellItemInfo()
+	if itemName then
+		local _, _, id = string.find(GetItemLinkByName(itemName),"item:(%d+):.*")
+		GameTooltip.itemID = id
+	end
+	return HookSetAuctionSellItem(self)
+end
+
+local HookSetTradePlayerItem = GameTooltip.SetTradePlayerItem
+function GameTooltip.SetTradePlayerItem(self, index)
+	if GetTradePlayerItemLink(index) then
+		local _, _, id = string.find(GetTradePlayerItemLink(index),"item:(%d+):.*")
+		GameTooltip.itemID = id
+	end
+	return HookSetTradePlayerItem(self, index)
+end
+
+local HookSetTradeTargetItem = GameTooltip.SetTradeTargetItem
+function GameTooltip.SetTradeTargetItem(self, index)
+	if GetTradeTargetItemLink(index) then
+		local _, _, id = string.find(GetTradeTargetItemLink(index),"item:(%d+):.*")
+		GameTooltip.itemID = id
+	end
+	return HookSetTradeTargetItem(self, index)
+end
+
+local lastItemName = nil
+local lastItemID = nil
+local lastSourceStr = nil
+local lastDropRate = nil
+function AtlasLootTip.extendTooltip(tooltip, tooltipTypeStr)
+	if AtlasLootCharDB.ShowSource ~= true then return end
+	local originalTooltip = {}
+    local itemName = getglobal(tooltipTypeStr .. "TextLeft1"):GetText()
+	local line2 = getglobal(tooltipTypeStr .. "TextLeft2")
+	if not line2:GetText() then return end
+	local craftSpell = nil
+	local source = nil
+	local sourceStr = nil
+	local dropRate = nil
+	local isCraft = false
+    local isPvP = false
+	local isRepReward = false
+	local isSetPiece = false
+	local isWBLoot = false
+	local isWorldEvent = false
+	if itemName and itemName ~= "Fashion Coin" and tooltip.itemID then
+		if itemName ~= lastItemName or tooltip.itemID ~= lastItemID then
+			for row = 1, 30 do
+				local tooltipRowLeft = getglobal(tooltipTypeStr .. 'TextLeft' .. row)
+				if tooltipRowLeft then
+					local rowtext = tooltipRowLeft:GetText()
+					if rowtext then
+						originalTooltip[row] = {}
+						originalTooltip[row].text = rowtext
+					end
+				end
+			end
+			for row=1, table.getn(originalTooltip) do
+				if strfind(originalTooltip[row].text, "—",1,true) then -- skip items that state which rep they require
+					return
+				end
+			end
+			-- first check if its craftable item
+			for k,v in pairs(GetSpellInfoAtlasLootDB["craftspells"]) do
+				if v["craftItem"] == tonumber(tooltip.itemID) then
+					craftSpell = "s"..tostring(k)
+				end
+			end
+			for k1,v1 in pairs(AtlasLoot_Data["AtlasLootCrafting"]) do
+				for k2,v2 in pairs(AtlasLoot_Data["AtlasLootCrafting"][k1]) do
+					if type(v2[1]) == "string" and v2[1] ~= "" and string.sub(v2[1], 1, 1) ~= "e" then
+						if v2[1] == craftSpell
+						and
+						(strfind(k1, "Apprentice",1,true) or
+						strfind(k1, "Journeyman",1,true) or
+						strfind(k1, "Expert",1,true) or
+						strfind(k1, "Artisan",1,true) or
+						strfind(k1, "Goblin",1,true) or
+						strfind(k1, "Gnomish",1,true) or
+						strfind(k1, "Survival",1,true) or
+						strfind(k1, "Herbalism",1,true) or
+						strfind(k1, "FirstAid",1,true) or
+						strfind(k1, "Poisons",1,true) or
+						strfind(k1, "Mining",1,true) or
+						strfind(k1, "Smelting",1,true) or
+						strfind(k1, "Elemental",1,true) or
+						strfind(k1, "Tribal",1,true) or
+						strfind(k1, "Dragonscale",1,true)or
+						strfind(k1, "Weaponsmith",1,true)or
+						strfind(k1, "Axesmith",1,true)or
+						strfind(k1, "Hammersmith",1,true)or
+						strfind(k1, "Swordsmith",1,true)or
+						strfind(k1, "Armorsmith",1,true))
+						then
+							source = k1
+							isCraft = true
+							lastDropRate = nil
+						end
+					end
+				end
+			end
+			-- check if its world boss loot
+			if not isCraft then
+                for k1,v1 in pairs(AtlasLoot_Data["AtlasLootWBItems"]) do
+					for k2,v2 in pairs(AtlasLoot_Data["AtlasLootWBItems"][k1]) do
+						if v2[1] == tonumber(tooltip.itemID) and strfind(v2[3], itemName, 1, true) then
+							source = k1
+							isWBLoot = true
+                            if v2[5] then
+                                dropRate = v2[5]
+                                lastDropRate = dropRate
+                            else
+                                lastDropRate = nil
+                            end
+						end
+					end
+				end
+			end
+            -- check if its a pvp reward
+            if not isCraft and not isWBLoot then
+                for k1,v1 in pairs(AtlasLoot_Data["AtlasLootGeneralPvPItems"]) do
+					for k2,v2 in pairs(AtlasLoot_Data["AtlasLootGeneralPvPItems"][k1]) do
+						if v2[1] == tonumber(tooltip.itemID) and strfind(v2[3], itemName, 1, true) then
+							source = k1
+							isPvP = true
+                            lastDropRate = nil
+						end
+					end
+				end
+            end
+            -- check if its a rep reward
+            if not isCraft and not isWBLoot and not isPvP then
+                for k1,v1 in pairs(AtlasLoot_Data["AtlasLootBGItems"]) do
+					for k2,v2 in pairs(AtlasLoot_Data["AtlasLootBGItems"][k1]) do
+						if v2[1] == tonumber(tooltip.itemID) and strfind(v2[3], itemName, 1, true) then
+							source = k1
+							isRepReward = true
+							if v2[5] then
+								dropRate = v2[5]
+								lastDropRate = dropRate
+							else
+								lastDropRate = nil
+							end
+						end
+					end
+				end
+                for k1,v1 in pairs(AtlasLoot_Data["AtlasLootRepItems"]) do
+					for k2,v2 in pairs(AtlasLoot_Data["AtlasLootRepItems"][k1]) do
+						if v2[1] == tonumber(tooltip.itemID) and strfind(v2[3], itemName, 1, true) then
+							source = k1
+							isRepReward = true
+							if v2[5] and source ~= "Darkmoon" and not strfind(source, "Cenarion",1,true) then
+								dropRate = v2[5]
+								lastDropRate = dropRate
+							else
+								lastDropRate = nil
+							end
+						end
+					end
+				end
+            end
+            -- check if its a set piece
+			if not isCraft and not isWBLoot and not isPvP and not isRepReward then
+				for k1,v1 in pairs(AtlasLoot_Data["AtlasLootSetItems"]) do
+					for k2,v2 in pairs(AtlasLoot_Data["AtlasLootSetItems"][k1]) do
+						if v2[1] == tonumber(tooltip.itemID) and strfind(v2[3], itemName, 1, true) then
+							source = k1
+							if not (source == "SpiritofEskhandar" or
+									source == "HakkariBlades" or
+									source == "PrimalBlessing" or
+									source == "ShardOfGods" or
+									source == "DalRend" or
+									source == "SpiderKiss" or
+									source == "UnobMounts" or
+									source == "Legendaries" or
+									source == "Artifacts" or
+									source == "ZGRings" or
+									source == "Tabards") then
+								isSetPiece = true
+							end
+							lastDropRate = nil
+						end
+					end
+				end
+			end
+			-- check world events
+			if not isCraft and not isWBLoot and not isPvP and not isRepReward and not isSetPiece then
+				for k1,v1 in pairs(AtlasLoot_Data["AtlasLootWorldEvents"]) do
+					for k2,v2 in pairs(AtlasLoot_Data["AtlasLootWorldEvents"][k1]) do
+						if v2[1] == tonumber(tooltip.itemID) and strfind(v2[3], itemName, 1, true) then
+							source = k1
+							isWorldEvent = true
+							if v2[5] then
+								dropRate = v2[5]
+								lastDropRate = dropRate
+							else
+								lastDropRate = nil
+							end
+						end
+					end
+				end
+			end
+            -- check if its a dungeon/raid loot
+			if not isCraft and not isWBLoot and not isPvP and not isRepReward and not isWorldEvent and not isSetPiece then
+				for k1,v1 in pairs(AtlasLoot_Data["AtlasLootItems"]) do
+					for k2,v2 in pairs(AtlasLoot_Data["AtlasLootItems"][k1]) do
+						if v2[1] ~= 0 then
+							if v2[1] == tonumber(tooltip.itemID) and strfind(v2[3], itemName,1,true) then
+								if k1 ~= "VanillaKeys" then
+									source = k1
+								end
+								if v2[5] then
+									dropRate = v2[5]
+									lastDropRate = dropRate
+								else
+									lastDropRate = nil
+								end
+							end
+						end
+					end
+				end
+			end
+			lastItemName = itemName
+			lastItemID = tooltip.itemID
+			if not source then
+				lastSourceStr = nil
+                return
+			end
+			
+			for k,v in pairs(AtlasLoot_TableNames) do
+				if k == source then
+					sourceStr = AtlasLoot_TableNames[k][1]
+					lastSourceStr = sourceStr
+				end
+			end
+			
+			if not sourceStr then
+				return
+			end
+
+			if line2 and line2:GetText() then
+				if dropRate then
+					line2:SetText(GREY..sourceStr.." ("..dropRate..")|r\n"..line2:GetText())
+				else
+					line2:SetText(GREY..sourceStr.."|r\n"..line2:GetText())
+				end
+			else
+				if dropRate then
+					tooltip:AddLine(GREY..sourceStr.." ("..dropRate..")|r")
+				else
+					tooltip:AddLine(GREY..sourceStr.."|r")
+				end
+			end
+		
+		elseif itemName == lastItemName and tooltip.itemID == lastItemID then
+			if lastSourceStr then
+				if line2:GetText() then
+					if lastDropRate then
+						line2:SetText(GREY..lastSourceStr.." ("..lastDropRate..")|r\n"..line2:GetText())
+					else
+						line2:SetText(GREY..lastSourceStr.."|r\n"..line2:GetText())
+					end
+				end
+			end
+		end
+		tooltip:Show()
+	end
+end
+
+AtlasLootTip:SetScript("OnHide", function()
+	GameTooltip.itemID = nil
+	ItemRefTooltip.itemID = nil
+end)
+
+AtlasLootTip:SetScript("OnShow", function()
+	if GameTooltip.itemID then
+		AtlasLootTip.extendTooltip(GameTooltip, "GameTooltip")
+	end
+end)
diff --git a/Core/WorldEvents.lua b/Core/WorldEvents.lua
index 1c4f66d..8c9c912 100644
--- a/Core/WorldEvents.lua
+++ b/Core/WorldEvents.lua
@@ -76,8 +76,8 @@ function AtlasLootWorldEventMenu()
 	AtlasLootMenuItem_7_Icon:SetTexture("Interface\\Icons\\INV_Egg_03");
 	AtlasLootMenuItem_7.lootpage="Noblegarden";
 	AtlasLootMenuItem_7:Show();
-	--Gurubashi Arena Booty Run
-	AtlasLootMenuItem_4_Name:SetText(AL["Gurubashi Arena Booty Run"]);
+	--Gurubashi Arena
+	AtlasLootMenuItem_4_Name:SetText(AL["Gurubashi Arena"]);
 	AtlasLootMenuItem_4_Extra:SetText(ORANGE..AL["Stranglethorn Vale"]);
 	AtlasLootMenuItem_4_Icon:SetTexture("Interface\\Icons\\INV_Misc_ArmorKit_04");
 	AtlasLootMenuItem_4.lootpage="GurubashiArena";
diff --git a/Crafting/crafting.en.lua b/Crafting/crafting.en.lua
index 64187fd..69724ef 100644
--- a/Crafting/crafting.en.lua
+++ b/Crafting/crafting.en.lua
@@ -2976,7 +2976,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = {
 		{ "s12907", "inv_helmet_49", "=q2=Gnomish Mind Control Cap", "=ds=#sr# =so1=235 =so2=255 =so3=265 =so4=275" },
 		{ "s12759", "inv_gizmo_08", "=q1=Gnomish Death Ray", "=ds=#sr# =so1=240 =so2=260 =so3=270 =so4=280" },
 		{ "s23129", "inv_misc_enggizmos_08", "=q2=World Enlarger", "=ds=#sr# =so1=260 =so2=260 =so3=265 =so4=270" },
-		{ "s23489", "inv_misc_enggizmos_12", "=q2=Ultrasafe Transporter - Gadgetzan", "=ds=#sr# =so1=260 =so2=285 =so3=295 =so4=305" },
+		{ "s23489", "inv_misc_enggizmos_12", "=q2=Ultrasafe Transporter: Gadgetzan", "=ds=#sr# =so1=260 =so2=285 =so3=295 =so4=305" },
 		{ "s23096", "inv_misc_enggizmos_13", "=q1=Alarm-O-Bot", "=ds=#sr# =so1=265 =so2=275 =so3=280 =so4=285" },
 	};
 
@@ -2993,7 +2993,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = {
 		{ "s12754", "inv_misc_bomb_04", "=q1=The Big One", "=ds=#sr# =so1=235 =so2=235 =so3=255 =so4=275" },
 		{ "s12908", "spell_fire_flamebolt", "=q1=Goblin Dragon Gun", "=ds=#sr# =so1=240 =so2=260 =so3=270 =so4=280" },
 		{ "s12758", "inv_helmet_49", "=q2=Goblin Rocket Helmet", "=ds=#sr# =so1=245 =so2=265 =so3=275 =so4=285" },
-		{ "s23486", "inv_misc_enggizmos_07", "=q2=Dimensional Ripper - Everlook", "=ds=#sr# =so1=260 =so2=285 =so3=295 =so4=305" },
+		{ "s23486", "inv_misc_enggizmos_07", "=q2=Dimensional Ripper: Everlook", "=ds=#sr# =so1=260 =so2=285 =so3=295 =so4=305" },
 		{ "s23078", "inv_misc_enggizmos_11", "=q1=Goblin Jumper Cables XL", "=ds=#sr# =so1=265 =so2=285 =so3=295 =so4=305" },
 	};
 	EngineeringEquipment1 = {
@@ -3391,8 +3391,8 @@ AtlasLoot_Data["AtlasLootCrafting"] = {
 		{ "s24801", "inv_misc_food_64", "=q1=Smoked Desert Dumplings", "=ds=#sr# =so1=285 =so2=325 =so3=345 =so4=365" },
 		{ "s25659", "inv_misc_food_65", "=q1=Dirge's Kickin' Chimaerok Chops", "=ds=#sr# =so1=300 =so2=325 =so3=345 =so4=365" },
 		{ "s57031", "inv_misc_food_09", "=q1=Danonzo's Tel'Abim Surprise", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" },
-		{ "s57032", "inv_misc_food_08", "=q1=Danonzo's Tel'abim Medley", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" },
-		{ "s57033", "inv_drink_17", "=q1=Danonzo's Tel'abim Delight", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" },
+		{ "s57032", "inv_misc_food_08", "=q1=Danonzo's Tel'Abim Medley", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" },
+		{ "s57033", "inv_drink_17", "=q1=Danonzo's Tel'Abim Delight", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" },
 		{ "s46085", "inv_misc_food_64", "=q1=Gurubashi Gumbo", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" },
 		{ "s45625", "INV_Misc_Fishe_Au_Chocolate", "=q1=Le Fishe Au Chocolat", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" },
 	};
diff --git a/Instances/instances.en.lua b/Instances/instances.en.lua
index ef631a7..e4d17f7 100644
--- a/Instances/instances.en.lua
+++ b/Instances/instances.en.lua
@@ -963,7 +963,7 @@ AtlasLootBossButtons = {
 -- ItemIDs (default english)
 --------------------------------------------------------------------------------
 AtlasLoot_Data["AtlasLootItems"] = {
-	EmptyInstance = {};
+	--EmptyInstance = {};
 	VanillaKeys = {
 		{ 0, "INV_Box_01", "=q6=#e14#", "" },
 		{ 16309, "INV_Jewelry_Talisman_11", "=q3=Drakefire Amulet", "=ds=#s2#" },
@@ -3163,13 +3163,13 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 61027, "INV_shoulder_24", "=q3=Epaulets of the Forgotten Past", "=ds=#s3#, #a1#", "33%" },
 		{ 61040, "INV_gauntlets_05", "=q3=Gloves of the Unknown", "=ds=#s9#, #a1#", "33%" },
 		{ 0, "", "", "" },
-		{ 61014, "INV_Enchant_ShardBrilliantLarge", "Shard of Eternity", "=ds=#s14#", "1%" },
+		{ 61014, "INV_Enchant_ShardBrilliantLarge", "Temporal Anomaly", "=ds=#s14#", "1%" },
 		{ 61043, "Spell_Shadow_SoulGem", "=q4=Eye of the Abyss", "=ds=#s2#", "1.1%" },
 		{ 51044, "INV_misc_head_dragon_black", "=q1=Antnormi's Head", "=ds=#m3#", "100%" },
 		{ 0, "", "", "", "" },
 		{ 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#, Quantity of 2", "100%" },
 	};
-	COTBMInfiniteChromie = {
+	--[[COTBMInfiniteChromie = {
 		{ 50203, "INV_enchant_dustsoul", "=q2=Corrupted Sand", "=ds=#m3#, 17-23", "100%" },
 		{ 0, "", "", "" },
 		{ 50431, "INV_bracer_13", "=q3=Extremely Well Crafted Cuffs", "=ds=#s8#, #a1#", "12%" },
@@ -3182,7 +3182,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 61056, "INV_boots_07", "=q3=Arcanoweave Boots", "=ds=#s12#, #a1#", "12%" },
 		{ 0, "", "", "" },
 		{ 61043, "spell_shadow_soulgem", "=q4=Eye of the Abyss", "=ds=#s2#", "1%" },
-	};
+	};]]
 	COTTrash = {
 		{ 50203, "INV_enchant_dustsoul", "=q2=Corrupted Sand", "=ds=#m3#" },
 		{ 0, "", "", "" },
@@ -4630,10 +4630,6 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 18298, "INV_Pants_11", "=q3=Unbridled Leggings", "=ds=#s11#, #a2#", "0.75%" },
 		{ 18295, "INV_Boots_06", "=q3=Phasing Boots", "=ds=#s12#, #a1# =q2=#e32#", "0.58%" },
 		{ 0, "", "", "" },
-		{ 18333,"INV_Misc_Book_04","=q2=Libram of Focus","=ds=#e20#", "2%" },
-		{ 18334,"INV_Misc_Book_11","=q2=Libram of Protection","=ds=#e20#", "2%" },
-		{ 18332,"INV_Misc_Book_02","=q2=Libram of Rapidity","=ds=#e20#", "2%" },
-		{ 0, "", "", "" },
 		{ 18255, "INV_Misc_Food_55", "=q1=Runn Tum Tuber", "=ds=#e2#", "0.3%" },
 		{ 18297, "INV_Enchant_ShardGlimmeringSmall", "=q1=Thornling Seed", "=ds=#e15# =q7=#cb30#", "0.5%" },
 	};
@@ -4820,11 +4816,6 @@ AtlasLoot_Data["AtlasLootItems"] = {
 	};
 	DMNTrash = {
 		{ 18250, "INV_Misc_Key_11", "=q2=Gordok Shackle Key", "=ds=#e14#", "4%, 13%, 25%" },
-		{ 0, "", "", "" },
-		{ 18333,"INV_Misc_Book_04","=q2=Libram of Focus","=ds=#e20#", "1%, 2%" },
-		{ 18334,"INV_Misc_Book_11","=q2=Libram of Protection","=ds=#e20#", "1%, 2%" },
-		{ 18332,"INV_Misc_Book_02","=q2=Libram of Rapidity","=ds=#e20#", "1%, 2%" },
-		{ 0, "", "", "" },
 		{ 18640, "INV_Ammo_Bullet_02", "=q1=Happy Fun Rock", "=ds=#m33#", "2%" },
 	};
 	DMNTRIBUTERUN = {
@@ -4945,10 +4936,6 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 18340, "INV_Jewelry_Talisman_14", "=q3=Eidolon Talisman", "=ds=#s2#", "0.9-1.4%" },
 		{ 18344, "INV_Gauntlets_23", "=q3=Stonebark Gauntlets", "=ds=#s9#, #a2#", "0.29-0.66%" },
 		{ 18338, "INV_Wand_02", "=q3=Wand of Arcane Potency", "=ds=#w12#", "1.6-2%" },
-		{ 0, "", "", "" },
-		{ 18333,"INV_Misc_Book_04","=q2=Libram of Focus","=ds=#e20#", "1-2%" },
-		{ 18334,"INV_Misc_Book_11","=q2=Libram of Protection","=ds=#e20#", "1-2%" },
-		{ 18332,"INV_Misc_Book_02","=q2=Libram of Rapidity","=ds=#e20#", "1-2%" },
 	};
 	DMNBooks = {
 		{ 18401,"INV_Misc_Book_11","=q4=Foror's Compendium of Dragon Slaying","=ds=#e20# =q17=#c9#=ds=, =q16=#c4#" },
@@ -6618,7 +6605,7 @@ AtlasLoot_Data["AtlasLootItems"] = {
 		{ 92002, "INV_Misc_Book_07", "=q3=Tome of Portals: Theramore", "=ds=Alliance, #e20# =q10=#c3#" , "0.32%" },
 		{ 92004, "INV_Misc_Book_07", "=q3=Tome of Portals: Stonard", "=ds=Horde, #e20# =q10=#c3#", "0.32%" },
 		{ 0, "", "", "" },
-		{ 8547, "INV_Scroll_05", "=q3=Formula: Powerful Smelling Salts", "=ds=#p6# #m14#", "0.03%" },
+		{ 8547, "INV_Scroll_05", "=q3=Formula: Powerful Smelling Salts ", "=ds=#p6# #m14#", "0.03%" },
 		{ 61177, "INV_Scroll_05", "=q3=Recipe: Potion of Quickness", "=ds=#p1# #m14#", "0.03%" },
 		{ 61178, "INV_Scroll_05", "=q3=Plans: Thorium Spurs", "=ds=#p2# #m14#", "0.03%" },
 		{ 61180, "INV_Misc_Note_01", "=q3=Formula: Enchant Cloak - Greater Arcane Resistance", "=ds=#p4# #m14#", "0.03%" },
diff --git a/Locale/locale.cn.lua b/Locale/locale.cn.lua
index ce63018..6fbee31 100644
--- a/Locale/locale.cn.lua
+++ b/Locale/locale.cn.lua
@@ -979,7 +979,7 @@ AL:RegisterTranslations("zhCN", function() return {
 	["Elemental Invasion"] = "元素入侵",
 	["Ethereum Prison"] = "复仇军监狱",
 	["Feast of Winter Veil"] = "冬幕节",
-	["Gurubashi Arena Booty Run"] = "古拉巴什竞技场",
+	["Gurubashi Arena"] = "古拉巴什竞技场",
 	["Hallow's End"] = "万圣节",
 	["Harvest Festival"] = "收获节",
 	["Love is in the Air"] = "情人节",
diff --git a/Locale/locale.de.lua b/Locale/locale.de.lua
index 2526113..9bc702d 100644
--- a/Locale/locale.de.lua
+++ b/Locale/locale.de.lua
@@ -961,7 +961,7 @@ AL:RegisterTranslations("deDE", function() return {
 	["Elemental Invasion"] = "Invasion der Elementare",
 	["Ethereum Prison"] = "Gefängnis des Astraleums",
 	["Feast of Winter Veil"] = "Winterhauchfest",
-	["Gurubashi Arena Booty Run"] = "Gurubashiarena",
+	["Gurubashi Arena"] = "Gurubashiarena",
 	["Hallow's End"] = "Schlotternächte",
 	["Harvest Festival"] = "Erntedankfest",
 	["Love is in the Air"] = "Herzklopfen",
diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua
index d5775dd..59352c9 100644
--- a/Locale/locale.en.lua
+++ b/Locale/locale.en.lua
@@ -494,6 +494,7 @@ AL:RegisterTranslations("enUS", function() return {
 	["AQ40 Class Sets"] = true,
 	["Ruins of Ahn'Qiraj Sets"] = true,
 	["AQ20 Class Sets"] = true,
+	["AQ20 Set"] = true,
 	["AQ Enchants"] = true,
 	["AQ Opening Quest Chain"] = true,
 	["Sets"] = true,
@@ -506,10 +507,12 @@ AL:RegisterTranslations("enUS", function() return {
 	["Dungeon Set 1"] = true,
 	["Dungeon 1 Set"] = true,
 	["Dungeon 2 Set"] = true,
+	["Dungeon Set"] = true,
 	["D2 Summonable"] = true,
 	["Tier 1 Sets"] = true,
 	["Tier 2 Sets"] = true,
 	["Tier 3 Sets"] = true,
+	["Tier 2.5"] = true,
 	["PvP Sets"] = true,
 	["PvP Rewards (Level 60)"] = true,
 	["PvP Accessories (Level 60)"] = true,
@@ -528,6 +531,7 @@ AL:RegisterTranslations("enUS", function() return {
 	["Dire Maul Books"] = true,
 	["Random Boss Loot"] = true,
 	["Class Set Pieces"] = true,
+	["Class Set"] = true,
 	["Epic Set"] = true,
 	["Rare Set"] = true,
 	["Legendary Items"] = true,
@@ -574,7 +578,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["Scarshield Warlock"] = true,
 	["Olaf"] = true,
 	["Eric 'The Swift'"] = true,
-	["The Sunken Temple"] = "|cffffffff[50-60]|cffffd200 The Sunken Temple",
+	["[50-60] The Sunken Temple"] = "|cffffffff[50-60]|cffffd200 The Sunken Temple",
+	["The Sunken Temple"] = true,
 	["Spawn of Hakkar"] = true,
 	["Balcony Minibosses"] = true,
 	["Shadow of Doom"] = true,
@@ -755,7 +760,7 @@ AL:RegisterTranslations("enUS", function() return {
 	["Children's Week"] = true,
 	["Elemental Invasion"] = true,
 	["Feast of Winter Veil"] = true,
-	["Gurubashi Arena Booty Run"] = true,
+	["Gurubashi Arena"] = true,
 	["Hallow's End"] = true,
 	["Harvest Festival"] = true,
 	["Love is in the Air"] = true,
@@ -769,7 +774,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["Noth the Plaguebringer"] = true,
 	["Heigan the Unclean"] = true,
 	["Keys"] = true, 
-	["Blackfathom Deeps"] = "|cffffffff[23-32]|cffffd200 Blackfathom Deeps",
+	["[23-32] Blackfathom Deeps"] = "|cffffffff[23-32]|cffffd200 Blackfathom Deeps",
+	["Blackfathom Deeps"] = true,
 	["Lady Sarevess"] = true,
 	["Gelihast"] = true,
 	["Ghamoo-ra"] = true,
@@ -793,8 +799,10 @@ AL:RegisterTranslations("enUS", function() return {
 	["Magmus"] = true,
 	["Princess Moira Bronzebeard"] = true,
 	["Emperor Dagran Thaurissan"] = true,
-	["Blackrock Depths"] = "|cffffffff[52-60]|cffffd200 Blackrock Depths",
-	["Lower Blackrock Spire"] = "|cffffffff[55-60]|cffffd200 Lower Blackrock Spire",
+	["[52-60] Blackrock Depths"] = "|cffffffff[52-60]|cffffd200 Blackrock Depths",
+	["Blackrock Depths"] = true,
+	["[55-60] Lower Blackrock Spire"] = "|cffffffff[55-60]|cffffd200 Lower Blackrock Spire",
+	["Lower Blackrock Spire"] = true,
 	["Spirestone Butcher"] = true,
 	["Highlord Omokk"] = true,
 	["Spirestone Battle Lord"] = true,
@@ -814,7 +822,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["Burning Felguard"] = true,
 	["Pyroguard Emberseer"] = true,
 	["Solakar Flamewreath"] = true,
-	["Upper Blackrock Spire"] = "|cffffffff[58-60]|cffffd200 Upper Blackrock Spire",
+	["[58-60] Upper Blackrock Spire"] = "|cffffffff[58-60]|cffffd200 Upper Blackrock Spire",
+	["Upper Blackrock Spire"] = true,
 	["Jed Runewatcher"] = true,
 	["Goraluk Anvilcrack"] = true,
 	["Warchief Rend Blackhand"] = true,
@@ -830,20 +839,24 @@ AL:RegisterTranslations("enUS", function() return {
 	["Flamegor"] = true,
 	["Chromaggus"] = true,
 	["Nefarian"] = true,
-	["Blackwing Lair"] = "|cffff0000[RAID]|cffffd200 Blackwing Lair",
-	["Hateforge Quarry"] = "|cffffffff[50-60]|cffffd200 Hateforge Quarry",
+	["[RAID] Blackwing Lair"] = "|cffff0000[RAID]|cffffd200 Blackwing Lair",
+	["Blackwing Lair"] = true,
+	["[50-60] Hateforge Quarry"] = "|cffffffff[50-60]|cffffd200 Hateforge Quarry",
+	["Hateforge Quarry"] = true,
 	["High Foreman Bargul Blackhammer"] = true,
 	["Engineer Figgles"] = true,
 	["Corrosis"] = true,
 	["Hatereaver Annihilator"] = true,
 	["Hargesh Doomcaller"] = true,
-	["The Crescent Grove"] = "|cffffffff[32-38]|cffffd200 The Crescent Grove",
+	["[32-38] The Crescent Grove"] = "|cffffffff[32-38]|cffffd200 The Crescent Grove",
+	["The Crescent Grove"] = true,
 	["Grovetender Engryss"] = true,
 	["Keeper Ranathos"] = true,
 	["High Priestess A'lathea"] = true,
 	["Fenektis the Deceiver"] = true,
 	["Master Raxxieth"] = true,
-	["Karazhan Crypt"] = "|cffffffff[58-60]|cffffd200 Karazhan Crypt",
+	["[58-60] Karazhan Crypt"] = "|cffffffff[58-60]|cffffd200 Karazhan Crypt",
+	["Karazhan Crypt"] = true,
 	["Marrowspike"] = true,
 	["Hivaxxis"] = true,
 	["Corpsemuncher"] = true,
@@ -852,7 +865,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["Commander Andreon"] = true,
 	["Alarus"] = true,
 	["Half-Buried Treasure Chest"] = true,
-	["Caverns of Time: Black Morass"] = "|cffffffff[60]|cffffd200 Caverns of Time: Black Morass",
+	["[60] Caverns of Time: Black Morass"] = "|cffffffff[60]|cffffd200 Caverns of Time: Black Morass",
+	["Caverns of Time: Black Morass"] = true,
 	["Chronar"] = true,
 	["Epidamu"] = true,
 	["Drifting Avatar of Time"] = true,
@@ -861,14 +875,16 @@ AL:RegisterTranslations("enUS", function() return {
 	["Rotmaw"] = true,
 	["Antnormi"] = true,
 	["Infinite Chromie"] = true,
-	["Stormwind Vault"] = "|cffffffff[60]|cffffd200 Stormwind Vault",
+	["[60] Stormwind Vault"] = "|cffffffff[60]|cffffd200 Stormwind Vault",
+	["Stormwind Vault"] = true,
 	["Aszosh Grimflame"] = true,
 	["Tham'Grarr"] = true,
 	["Black Bride"] = true,
 	["Damian"] = true,
 	["Volkan Cruelblade"] = true,
 	["Arc'tiras / Vault Armory Equipment"] = true,
-	["The Deadmines"] = "|cffffffff[17-24]|cffffd200 The Deadmines",
+	["[17-24] The Deadmines"] = "|cffffffff[17-24]|cffffd200 The Deadmines",
+	["The Deadmines"] = true,
 	["Pusillin"] = true,
 	["Zevrim Thornhoof"] = true,
 	["Hydrospawn"] = true,
@@ -876,8 +892,10 @@ AL:RegisterTranslations("enUS", function() return {
 	["Pimgib"] = true,
 	["Alzzin the Wildshaper"] = true,
 	["Isalien"] = true,
-	["Dire Maul (East)"] = "|cffffffff[55-60]|cffffd200 Dire Maul (East)",
-	["Dire Maul (North)"] = "|cffffffff[57-60]|cffffd200 Dire Maul (North)",
+	["[55-60] Dire Maul (East)"] = "|cffffffff[55-60]|cffffd200 Dire Maul (East)",
+	["Dire Maul (East)"] = true,
+	["[57-60] Dire Maul (North)"] = "|cffffffff[57-60]|cffffd200 Dire Maul (North)",
+	["Dire Maul (North)"] = true,
 	["Guard Mol'dar"] = true,
 	["Stomper Kreeg"] = true,
 	["Guard Fengus"] = true,
@@ -892,7 +910,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["Immol'thar"] = true,
 	["Lord Hel'nurath"] = true,
 	["Prince Tortheldrin"] = true,
-	["Dire Maul (West)"] = "|cffffffff[57-60]|cffffd200 Dire Maul (West)",
+	["[57-60] Dire Maul (West)"] = "|cffffffff[57-60]|cffffd200 Dire Maul (West)",
+	["Dire Maul (West)"] = true,
 	["Techbot"] = true,
 	["Grubbis"] = true,
 	["Viscous Fallout"] = true,
@@ -900,7 +919,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["Crowd Pummeler 9-60"] = true,
 	["Dark Iron Ambassador"] = true,
 	["Mekgineer Thermaplugg"] = true,
-	["Gnomeregan"] = "|cffffffff[29-38]|cffffd200 Gnomeregan",
+	["[29-38] Gnomeregan"] = "|cffffffff[29-38]|cffffd200 Gnomeregan",
+	["Gnomeregan"] = true,
 	["Kolk"] = true,
 	["Gelk"] = true,
 	["Magra"] = true,
@@ -915,7 +935,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["Tinkerer Gizlock"] = true,
 	["Rotgrip"] = true,
 	["Princess Theradras"] = true,
-	["Maraudon"] = "|cffffffff[45-55]|cffffd200 Maraudon",
+	["[45-55] Maraudon"] = "|cffffffff[45-55]|cffffd200 Maraudon",
+	["Maraudon"] = true,
 	["Lucifron"] = true,
 	["Magmadar"] = true,
 	["Gehennas"] = true,
@@ -926,7 +947,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["Sulfuron Harbinger"] = true,
 	["Majordomo Executus"] = true,
 	["Ragnaros"] = true,
-	["Molten Core"] = "|cffff0000[RAID]|cffffd200 Molten Core",
+	["[RAID] Molten Core"] = "|cffff0000[RAID]|cffffd200 Molten Core",
+	["Molten Core"] = true,
 	["Patchwerk"] = true,
 	["Grobbulus"] = true,
 	["Gluth"] = true,
@@ -942,25 +964,31 @@ AL:RegisterTranslations("enUS", function() return {
 	["Loatheb"] = true,
 	["Sapphiron"] = true,
 	["Kel'Thuzad"] = true,
-	["Naxxramas"] = "|cffff0000[RAID]|cffffd200 Naxxramas",
+	["[RAID] Naxxramas"] = "|cffff0000[RAID]|cffffd200 Naxxramas",
+	["Naxxramas"] = true,
 	["Onyxia"] = true,
-	["Onyxia's Lair"] = "|cffff0000[RAID]|cffffd200 Onyxia's Lair",
-	["Ragefire Chasm"] = "|cffffffff[13-18]|cffffd200 Ragefire Chasm",
+	["[RAID] Onyxia's Lair"] = "|cffff0000[RAID]|cffffd200 Onyxia's Lair",
+	["Onyxia's Lair"] = true,
+	["[13-18] Ragefire Chasm"] = "|cffffffff[13-18]|cffffd200 Ragefire Chasm",
+	["Ragefire Chasm"] = true,
 	["Tuten'kash"] = true,
 	["Mordresh Fire Eye"] = true,
 	["Glutton"] = true,
 	["Ragglesnout"] = true,
 	["Amnennar the Coldbringer"] = true,
 	["Plaguemaw the Rotting"] = true,
-	["Razorfen Downs"] = "|cffffffff[36-46]|cffffd200 Razorfen Downs",
+	["[36-46] Razorfen Downs"] = "|cffffffff[36-46]|cffffd200 Razorfen Downs",
+	["Razorfen Downs"] = true,
 	["Death Speaker Jargba"] = true,
 	["Overlord Ramtusk"] = true,
 	["Agathelos the Raging"] = true,
 	["Blind Hunter"] = true,
 	["Charlga Razorflank"] = true,
 	["Earthcaller Halmgar"] = true,
-	["Razorfen Kraul"] = "|cffffffff[29-38]|cffffd200 Razorfen Kraul",
-	["Ruins of Ahn'Qiraj"] = "|cffff0000[RAID]|cffffd200 Ruins of Ahn'Qiraj",
+	["[29-38] Razorfen Kraul"] = "|cffffffff[29-38]|cffffd200 Razorfen Kraul",
+	["Razorfen Kraul"] = true,
+	["[RAID] Ruins of Ahn'Qiraj"] = "|cffff0000[RAID]|cffffd200 Ruins of Ahn'Qiraj",
+	["Ruins of Ahn'Qiraj"] = true,
 	["Kurinnaxx"] = true,
 	["Lieutenant General Andorov"] = true,
 	["General Rajaxx"] = true,
@@ -969,7 +997,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["Ayamiss the Hunter"] = true,
 	["Ossirian the Unscarred"] = true,
 	["Herod"] = true,
-	["Scarlet Monastery"] = "|cffffffff[27-45]|cffffd200 Scarlet Monastery",
+	["[27-45] Scarlet Monastery"] = "|cffffffff[27-45]|cffffd200 Scarlet Monastery",
+	["Scarlet Monastery"] = true,
 	["High Inquisitor Fairbanks"] = true,
 	["Scarlet Commander Mograine"] = true,
 	["High Inquisitor Whitemane"] = true,
@@ -996,7 +1025,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["Lord Alexei Barov"] = true,
 	["Lady Illucia Barov"] = true,
 	["Darkmaster Gandling"] = true,
-	["Scholomance"] = "|cffffffff[58-60]|cffffd200 Scholomance",
+	["[58-60] Scholomance"] = "|cffffffff[58-60]|cffffd200 Scholomance",
+	["Scholomance"] = true,
 	["Razorclaw the Butcher"] = true,
 	["Baron Silverlaine"] = true,
 	["Commander Springvale"] = true,
@@ -1006,8 +1036,10 @@ AL:RegisterTranslations("enUS", function() return {
 	["Wolf Master Nandos"] = true,
 	["Archmage Arugal"] = true,
 	["Deathsworn Captain"] = true,
-	["Shadowfang Keep"] = "|cffffffff[22-30]|cffffd200 Shadowfang Keep",
-	["The Stockade"] = "|cffffffff[22-30]|cffffd200 The Stockade",
+	["[22-30] Shadowfang Keep"] = "|cffffffff[22-30]|cffffd200 Shadowfang Keep",
+	["Shadowfang Keep"] = true,
+	["[22-30] The Stockade"] = "|cffffffff[22-30]|cffffd200 The Stockade",
+	["The Stockade"] = true,
 	["Skul"] = true,
 	["Fras Siabi"] = true,
 	["Hearthsinger Forresten"] = true,
@@ -1025,7 +1057,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["Magistrate Barthilas"] = true,
 	["Ramstein the Gorger"] = true,
 	["Baron Rivendare"] = true,
-	["Stratholme"] = "|cffffffff[58-60]|cffffd200 Stratholme",
+	["[58-60] Stratholme"] = "|cffffffff[58-60]|cffffd200 Stratholme",
+	["Stratholme"] = true,
 	["Atal'alarion"] = true,
 	["Dreamscythe"] = true,
 	["Weaver"] = true,
@@ -1036,7 +1069,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["Hazzas"] = true,
 	["Shade of Eranikus"] = true,
 	["The Temple of Atal'Hakkar"] = true,
-	["Temple of Ahn'Qiraj"] = "|cffff0000[RAID]|cffffd200 Temple of Ahn'Qiraj",
+	["[RAID] Temple of Ahn'Qiraj"] = "|cffff0000[RAID]|cffffd200 Temple of Ahn'Qiraj",
+	["Temple of Ahn'Qiraj"] = true,
 	["The Prophet Skeram"] = true,
 	["The Bug Family"] = true,
 	["Battleguard Sartura"] = true,
@@ -1055,8 +1089,10 @@ AL:RegisterTranslations("enUS", function() return {
 	["Galgann Firehammer"] = true,
 	["Grimlok"] = true,
 	["Archaedas"] = true,
-	["Uldaman"] = "|cffffffff[40-51]|cffffd200 Uldaman",
-	["Wailing Caverns"] = "|cffffffff[17-24]|cffffd200 Wailing Caverns",
+	["[40-51] Uldaman"] = "|cffffffff[40-51]|cffffd200 Uldaman",
+	["Uldaman"] = true,
+	["[17-24] Wailing Caverns"] = "|cffffffff[17-24]|cffffd200 Wailing Caverns",
+	["Wailing Caverns"] = true,
 	["Mad Magglish"] = true,
 	["Trigore the Lasher"] = true,
 	["Boahn"] = true,
@@ -1081,7 +1117,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["Gahz'rilla"] = true,
 	["Chief Ukorz Sandscalp"] = true,
 	["Zerillis"] = true,
-	["Zul'Farrak"] = "|cffffffff[44-54]|cffffd200 Zul'Farrak",
+	["[44-54] Zul'Farrak"] = "|cffffffff[44-54]|cffffd200 Zul'Farrak",
+	["Zul'Farrak"] = true,
 	["High Priestess Jeklik"] = true,
 	["High Priest Venoxis"] = true,
 	["High Priestess Mar'li"] = true,
@@ -1095,7 +1132,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["High Priestess Arlokk"] = true,
 	["Jin'do the Hexxer"] = true,
 	["Hakkar"] = true,
-	["Zul'Gurub"] = "|cffff0000[RAID]|cffffd200 Zul'Gurub",
+	["[RAID] Zul'Gurub"] = "|cffff0000[RAID]|cffffd200 Zul'Gurub",
+	["Zul'Gurub"] = true,
 	["Emerald Dragons"] = true,
 	["Druid"] = true,
 	["Hunter"] = true,
@@ -1224,10 +1262,14 @@ AL:RegisterTranslations("enUS", function() return {
 	["Silithus"] = true,
 	["Azeroth"] = true,
 	["Outland"] = true,
-	["Scarlet Monastery (Graveyard)"] = "|cffffffff[27-36]|cffffd200 Scarlet Monastery (Graveyard)",
-	["Scarlet Monastery (Armory)"] = "|cffffffff[32-41]|cffffd200 Scarlet Monastery (Armory)",
-	["Scarlet Monastery (Cathedral)"] = "|cffffffff[35-45]|cffffd200 Scarlet Monastery (Cathedral)",
-	["Scarlet Monastery (Library)"] = "|cffffffff[28-39]|cffffd200 Scarlet Monastery (Library)",
+	["[27-36] Scarlet Monastery (Graveyard)"] = "|cffffffff[27-36]|cffffd200 Scarlet Monastery (Graveyard)",
+	["Scarlet Monastery (Graveyard)"] = true,
+	["[32-41] Scarlet Monastery (Armory)"] = "|cffffffff[32-41]|cffffd200 Scarlet Monastery (Armory)",
+	["Scarlet Monastery (Armory)"] = true,
+	["[35-45] Scarlet Monastery (Cathedral)"] = "|cffffffff[35-45]|cffffd200 Scarlet Monastery (Cathedral)",
+	["Scarlet Monastery (Cathedral)"] = true,
+	["[28-39] Scarlet Monastery (Library)"] = "|cffffffff[28-39]|cffffd200 Scarlet Monastery (Library)",
+	["Scarlet Monastery (Library)"] = true,
 	["Blade's Edge Mountains"] = true,
 	["Stranglethorn Vale"] = true,
 	["Spirit of Azuregos"] = true,
@@ -1376,7 +1418,8 @@ AL:RegisterTranslations("enUS", function() return {
 	["Leather"] = true,
 	["Mail"] = true,
 	["Plate"] = true,
-	["Dire Maul"] = "|cffffffff[55-60]|cffffd200 Dire Maul",
+	["[55-60] Dire Maul"] = "|cffffffff[55-60]|cffffd200 Dire Maul",
+	["Dire Maul"] = true,
 	["Auchindoun"] = true,
 	["Coilfang Reservoir"] = true,
 	["Hellfire Citadel"] = true,
@@ -1474,9 +1517,12 @@ AL:RegisterTranslations("enUS", function() return {
 	["Silverpine Forest"] = true,
 	["Ashenvale"] = true,
 	["Thunder Bluff"] = true,
-	["Lower Karazhan Halls"] = "|cffff0000[RAID]|cffffd200 Lower Karazhan Halls",
-	["Emerald Sanctum"] = "|cffff0000[RAID]|cffffd200 Emerald Sanctum",
-	["Gilneas City"] = "|cffffffff[42-50]|cffffd200 Gilneas City",
+	["[RAID] Lower Karazhan Halls"] = "|cffff0000[RAID]|cffffd200 Lower Karazhan Halls",
+	["Lower Karazhan Halls"] = true,
+	["[RAID] Emerald Sanctum"] = "|cffff0000[RAID]|cffffd200 Emerald Sanctum",
+	["Emerald Sanctum"] = true,
+	["[42-50] Gilneas City"] = "|cffffffff[42-50]|cffffd200 Gilneas City",
+	["Gilneas City"] = true,
 	["Matthias Holtz"] = true,
 	["Packmaster Ragetooth"] = true,
 	["Judge Sutherland"] = true,
@@ -1489,6 +1535,7 @@ AL:RegisterTranslations("enUS", function() return {
 	["Solnius the Awakener"] = true,
 	["Solnius the Awakener (Page 2)"] = true,
 	["Favor of Erennius (ES Hard Mode)"] = true,
+	["Favor of Erennius"] = true,
 	["Master Blacksmith Rolfen"] = true,
 	["Brood Queen Araxxna"] = true,
 	["Lord Blackwald II"] = true,
@@ -1534,6 +1581,7 @@ AL:RegisterTranslations("enUS", function() return {
 	["Rank 11"] = true,
 	["Rank 14"] = true,
 	["Rank 2-9"] = true,
+	["Rank"] = true,
 	["Donation Rewards"] = true,
 	["Fashion"] = true,
 	["Dun Morogh"] = true,
@@ -1547,5 +1595,6 @@ AL:RegisterTranslations("enUS", function() return {
 	["Hyjal"] = true,
 	["Dustwallow Marsh"] = true,
 	["Mooncloth Regalia"] = true,
+	["Show Source on Tooltips"] = true,
 	} 
 end)
diff --git a/Locale/locale.es.lua b/Locale/locale.es.lua
index e87c4ef..962d936 100644
--- a/Locale/locale.es.lua
+++ b/Locale/locale.es.lua
@@ -964,7 +964,7 @@ AL:RegisterTranslations("esES", function() return {
 	["Elemental Invasion"] = "Invasión de elementales",
 	["Ethereum Prison"] = "Prisión de los Etereum",
 	["Feast of Winter Veil"] = "Festival de Invierno",
-	["Gurubashi Arena Booty Run"] = "El cofre pirata de Gurubashi",
+	["Gurubashi Arena"] = "El cofre pirata de Gurubashi",
 	["Hallow's End"] = "Halloween",
 	["Harvest Festival"] = "Festival de la Cosecha",
 	["Love is in the Air"] = "Amor en el aire",
diff --git a/Locale/locale.fr.lua b/Locale/locale.fr.lua
index 369de41..ffe6c38 100644
--- a/Locale/locale.fr.lua
+++ b/Locale/locale.fr.lua
@@ -983,7 +983,7 @@ AL:RegisterTranslations("frFR", function() return {
 	["Elemental Invasion"] = "Invasions élémentaires",
 	["Ethereum Prison"] = "Prison de l'Ethereum",
 	["Feast of Winter Veil"] = "La fête du Voile d'hiver",
-	["Gurubashi Arena Booty Run"] = "Le coffre pirate de Gurubashi",
+	["Gurubashi Arena"] = "Le coffre pirate de Gurubashi",
 	["Hallow's End"] = "La Sanssaint",
 	["Harvest Festival"] = "La Fête des moissons",
 	["Love is in the Air"] = "De l'amour dans l'air",
diff --git a/Locale/locale.ru.lua b/Locale/locale.ru.lua
index eed01ce..11be537 100644
--- a/Locale/locale.ru.lua
+++ b/Locale/locale.ru.lua
@@ -955,7 +955,7 @@ AL:RegisterTranslations("ruRU", function() return {
 	["Elemental Invasion"] = "Elemental Invasion",
 	["Ethereum Prison"] = "Ethereum Prison",
 	["Feast of Winter Veil"] = "Feast of Winter Veil",
-	["Gurubashi Arena Booty Run"] = "Gurubashi Arena Booty Run",
+	["Gurubashi Arena"] = "Gurubashi Arena",
 	["Hallow's End"] = "Hallow's End",
 	["Harvest Festival"] = "Harvest Festival",
 	["Love is in the Air"] = "Love is in the Air",
diff --git a/Locale/locale.tw.lua b/Locale/locale.tw.lua
index 6f613e9..3cd875f 100644
--- a/Locale/locale.tw.lua
+++ b/Locale/locale.tw.lua
@@ -973,7 +973,7 @@ AL:RegisterTranslations("zhTW", function() return {
 	["Elemental Invasion"] = "元素入侵",
 	["Ethereum Prison"] = "伊斯利恩監獄",
 	["Feast of Winter Veil"] = "冬幕節",
-	["Gurubashi Arena Booty Run"] = "古拉巴什競技場藏寶競技",
+	["Gurubashi Arena"] = "古拉巴什競技場藏寶競技",
 	["Hallow's End"] = "復活節",
 	["Harvest Festival"] = "收穫節",
 	["Love is in the Air"] = "愛就在你我身邊",
diff --git a/PvP/Battlegrounds.en.lua b/PvP/Battlegrounds.en.lua
index c2fe7a9..e10f4e7 100644
--- a/PvP/Battlegrounds.en.lua
+++ b/PvP/Battlegrounds.en.lua
@@ -1581,6 +1581,6 @@ AtlasLoot_Data["AtlasLootGeneralPvPItems"] = {
 		{ 18245, "Ability_Mount_Blackdirewolf", "=q4=Horn of the Black War Wolf", "=ds=#e7#" },
 		{ 18247, "Ability_Mount_Kodo_03", "=q4=Black War Kodo", "=ds=#e7#" },
 		{ 18246, "Ability_Mount_Raptor", "=q4=Whistle of the Black War Raptor", "=ds=#e7#" },
-		{ 18248, "Ability_Mount_Undeadhorse", "=q4=Red Skeletal Warhorse", "=ds=#e7#" },
+		{ 18248, "Ability_Mount_Undeadhorse", "=q4=Armored Red Deathcharger", "=ds=#e7#" },
 	};
 };
diff --git a/Sets/sets.lua b/Sets/sets.lua
index a6664e7..4d481a2 100644
--- a/Sets/sets.lua
+++ b/Sets/sets.lua
@@ -1200,13 +1200,13 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 20132, "INV_Shirt_GuildTabard_01", "=q1=Arathor Battle Tabard", "PvP =q8=#m7#" },
 		{ 19032, "INV_Shirt_GuildTabard_01", "=q1=Stormpike Battle Tabard", "PvP =q8=#m7#" },
 		{ 0, "", "", "" },
-		{ 5976, "INV_Shirt_GuildTabard_01", "Guild Tabard", "Vendor" },
+		{ 5976, "INV_Shirt_GuildTabard_01", "=q1=Guild Tabard", "Vendor" },
 		{ 19160, "INV_Shirt_GuildTabard_01", "=q1=Contest Winner's Tabard", "Slow & Steady Challenge" },
 		{ 80187, "INV_Shirt_GuildTabard_01", "=q1=Contest Winner's Tabard", "Hardcore Challenge" },
-		{ 61369, "INV_Shirt_GuildTabard_01", "Ravenshire Tabard", "#m4#" },
+		{ 61369, "INV_Shirt_GuildTabard_01", "=q1=Ravenshire Tabard", "#m4#" },
 		{ 23192, "INV_Misc_Cape_18", "=q2=Tabard of the Scarlet Crusade", "Drop" },
-		{ 61368, "INV_Shirt_GuildTabard_01", "Greymane Tabard", "Drop" },
-		{ 22999, "INV_Shirt_GuildTabard_01", "=q1=Tabard of the Agent Dawn", "Vendor" },
+		{ 61368, "INV_Shirt_GuildTabard_01", "=q2=Greymane Tabard", "Drop" },
+		{ 22999, "INV_Shirt_GuildTabard_01", "=q1=Tabard of the Argent Dawn", "Vendor" },
 		{ 0, "", "", "" },
 		{ 0, "", "", "" },
 		{ 15197, "INV_Misc_TabardPVP_02", "=q1=Scout's Tabard", "PvP =q6=#m6#" },
@@ -1355,7 +1355,7 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 81204, "INV_Misc_TabardPVP_02", "=q1=Illidari Tabard", "Donation Reward" },
 		{ 81088, "INV_Shirt_GuildTabard_01", "=q1=Tabard of Summer Skies", "Donation Reward" },
 		{ 81087, "INV_Shirt_GuildTabard_01", "=q1=Tabard of Summer Flames", "Donation Reward" },
-		{ 50092, "INV_Misc_TabardPVP_01", "=q1=Crimson Legion Tabard", "Donation Reward" },
+		{ 50092, "INV_Misc_TabardPVP_01", "=q1=Tabard of the Crimson Legion", "Donation Reward" },
 		{ 81203, "INV_Misc_TabardPVP_01", "=q1=Violet Eye Tabard", "Donation Reward" },
 		{ 50086, "INV_Misc_TabardPVP_01", "=q1=Stromgarde Tabard", "Donation Reward" },
 		{ 50376, "INV_Misc_TabardPVP_01", "=q1=Hillsbrad Tabard", "Donation Reward" },
@@ -1391,12 +1391,12 @@ AtlasLoot_Data["AtlasLootSetItems"] = {
 		{ 69132, "INV_Chest_Cloth_31", "=q1=Blooming Wisteria Robes", "Donation Reward" },
 		{ 41091, "INV_Chest_Cloth_07", "=q1=Apparel of the Bells", "Donation Reward" },
 		{ 41092, "INV_Chest_Cloth_07", "=q1=Jingle Belle Frock", "Donation Reward" },
-		{ 83479, "INV_Chest_Cloth_09", "=q1=Romantic Pink Corset Dress", "Donation Reward" },
+		{ 83479, "INV_Chest_Cloth_09", "=q1=Romantic Pink  Corset Dress", "Donation Reward" },
 		{ 83478, "INV_Chest_Cloth_09", "=q1=Romantic Red Corset Dress", "Donation Reward" },
 		{ 69152, "INV_Boots_Fabric_01", "=q1=Silver Star Sandals", "Donation Reward" },
-		{ 69101, "Spell_Shadow_Metamorphosis", "=q1=Blood Illidari Tatoos", "Donation Reward" },
-		{ 69103, "Spell_Shadow_Metamorphosis", "=q1=Nether Illidari Tatoos", "Donation Reward" },
-		{ 69100, "Spell_Shadow_Metamorphosis", "=q1=Illidari Tatoos", "Donation Reward" },
-		{ 69102, "Spell_Shadow_Metamorphosis", "=q1=Void Illidari Tatoos", "Donation Reward" },
+		{ 69101, "Spell_Shadow_Metamorphosis", "=q1=Blood Illidari Tattoos", "Donation Reward" },
+		{ 69103, "Spell_Shadow_Metamorphosis", "=q1=Nether Illidari Tattoos", "Donation Reward" },
+		{ 69100, "Spell_Shadow_Metamorphosis", "=q1=Illidari Tattoos", "Donation Reward" },
+		{ 69102, "Spell_Shadow_Metamorphosis", "=q1=Void Illidari Tattoos", "Donation Reward" },
 	},
 };
diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua
index 33ac2ef..e382e4d 100644
--- a/TableRegister/loottables.en.lua
+++ b/TableRegister/loottables.en.lua
@@ -13,524 +13,524 @@ AtlasLoot_TableNames = {
 	--Keys
 	["VanillaKeys"] = { AL["Keys"], "AtlasLootItems" },
 	--Blackfathom Deeps
-	["BFDGhamoora"] = { AL["Ghamoo-ra"], "AtlasLootItems" },
-	["BFDLadySarevess"] = { AL["Lady Sarevess"], "AtlasLootItems" },
-	["BFDGelihast"] = { AL["Gelihast"], "AtlasLootItems" },
-	["BFDBaronAquanis"] = { AL["Baron Aquanis"], "AtlasLootItems" },
-	["BFDTwilightLordKelris"] = { AL["Twilight Lord Kelris"], "AtlasLootItems" },
-	["BFDOldSerrakis"] = { AL["Old Serra'kis"], "AtlasLootItems" },
-	["BFDAkumai"] = { AL["Aku'mai"], "AtlasLootItems" },
-	["BFDTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Blackfathom Deeps"] .. ")", "AtlasLootItems" },
+	["BFDGhamoora"] = { AL["Blackfathom Deeps"].." - "..AL["Ghamoo-ra"], "AtlasLootItems" },
+	["BFDLadySarevess"] = { AL["Blackfathom Deeps"].." - "..AL["Lady Sarevess"], "AtlasLootItems" },
+	["BFDGelihast"] = { AL["Blackfathom Deeps"].." - "..AL["Gelihast"], "AtlasLootItems" },
+	["BFDBaronAquanis"] = { AL["Blackfathom Deeps"].." - "..AL["Baron Aquanis"], "AtlasLootItems" },
+	["BFDTwilightLordKelris"] = { AL["Blackfathom Deeps"].." - "..AL["Twilight Lord Kelris"], "AtlasLootItems" },
+	["BFDOldSerrakis"] = { AL["Blackfathom Deeps"].." - "..AL["Old Serra'kis"], "AtlasLootItems" },
+	["BFDAkumai"] = { AL["Blackfathom Deeps"].." - "..AL["Aku'mai"], "AtlasLootItems" },
+	["BFDTrash"] = { AL["Blackfathom Deeps"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Blackrock Mountain
 	["BRMScarshieldQuartermaster"] = { AL["Scarshield Quartermaster"], "AtlasLootItems" },
 	--Blackrock Depths
-	["BRDPyron"] = { AL["Overmaster Pyron"], "AtlasLootItems" },
-	["BRDLordRoccor"] = { AL["Lord Roccor"], "AtlasLootItems" },
-	["BRDHighInterrogatorGerstahn"] = { AL["High Interrogator Gerstahn"], "AtlasLootItems" },
-	["BRDAnubshiah"] = { AL["Anub'shiah"], "AtlasLootItems" },
-	["BRDEviscerator"] = { AL["Eviscerator"], "AtlasLootItems" },
-	["BRDGorosh"] = { AL["Gorosh the Dervish"], "AtlasLootItems" },
-	["BRDGrizzle"] = { AL["Grizzle"], "AtlasLootItems" },
-	["BRDHedrum"] = { AL["Hedrum the Creeper"], "AtlasLootItems" },
-	["BRDOkthor"] = { AL["Ok'thor the Breaker"], "AtlasLootItems" },
-	["BRDTheldren"] = { AL["Theldren"], "AtlasLootItems" },
-	["BRDHoundmaster"] = { AL["Houndmaster Grebmar"], "AtlasLootItems" },
-	["BRDForgewright"] = { AL["Monument of Franclorn Forgewright"], "AtlasLootItems" },
-	["BRDPyromancerLoregrain"] = { AL["Pyromancer Loregrain"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["BRDTheVault"] = { AL["The Vault"], "AtlasLootItems" },
-	["BRDWarderStilgiss"] = { AL["Warder Stilgiss"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["BRDVerek"] = { AL["Verek"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["BRDFineousDarkvire"] = { AL["Fineous Darkvire"], "AtlasLootItems" },
-	["BRDLordIncendius"] = { AL["Lord Incendius"], "AtlasLootItems" },
-	["BRDBaelGar"] = { AL["Bael'Gar"], "AtlasLootItems" },
-	["BRDGeneralAngerforge"] = { AL["General Angerforge"], "AtlasLootItems" },
-	["BRDGolemLordArgelmach"] = { AL["Golem Lord Argelmach"], "AtlasLootItems" },
-	["BRDGuzzler"] = { AL["The Grim Guzzler"], "AtlasLootItems" },
-	["BRDFlamelash"] = { AL["Ambassador Flamelash"], "AtlasLootItems" },
-	["BRDPanzor"] = { AL["Panzor the Invincible"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["BRDTomb"] = { "Summoner's Tomb", "AtlasLootItems" },
-	["BRDLyceum"] = { AL["Shadowforge Flame Keeper"], "AtlasLootItems" },
-	["BRDMagmus"] = { AL["Magmus"], "AtlasLootItems" },
-	["BRDPrincess"] = { AL["Princess Moira Bronzebeard"], "AtlasLootItems" },
-	["BRDEmperorDagranThaurissan"] = { AL["Emperor Dagran Thaurissan"], "AtlasLootItems" },
-	["BRDBSPlans"] = { "Blacksmith Plans" .. " (" .. AL["Blackrock Depths"] .. ")", "AtlasLootItems" },
-	["BRDTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Blackrock Depths"] .. ")", "AtlasLootItems" },
+	["BRDPyron"] = { AL["Blackrock Depths"].." - "..AL["Overmaster Pyron"], "AtlasLootItems" },
+	["BRDLordRoccor"] = { AL["Blackrock Depths"].." - "..AL["Lord Roccor"], "AtlasLootItems" },
+	["BRDHighInterrogatorGerstahn"] = { AL["Blackrock Depths"].." - "..AL["High Interrogator Gerstahn"], "AtlasLootItems" },
+	["BRDAnubshiah"] = { AL["Blackrock Depths"].." - "..AL["Anub'shiah"], "AtlasLootItems" },
+	["BRDEviscerator"] = { AL["Blackrock Depths"].." - "..AL["Eviscerator"], "AtlasLootItems" },
+	["BRDGorosh"] = { AL["Blackrock Depths"].." - "..AL["Gorosh the Dervish"], "AtlasLootItems" },
+	["BRDGrizzle"] = { AL["Blackrock Depths"].." - "..AL["Grizzle"], "AtlasLootItems" },
+	["BRDHedrum"] = { AL["Blackrock Depths"].." - "..AL["Hedrum the Creeper"], "AtlasLootItems" },
+	["BRDOkthor"] = { AL["Blackrock Depths"].." - "..AL["Ok'thor the Breaker"], "AtlasLootItems" },
+	["BRDTheldren"] = { AL["Blackrock Depths"].." - "..AL["Theldren"], "AtlasLootItems" },
+	["BRDHoundmaster"] = { AL["Blackrock Depths"].." - "..AL["Houndmaster Grebmar"], "AtlasLootItems" },
+	["BRDForgewright"] = { AL["Blackrock Depths"].." - "..AL["Monument of Franclorn Forgewright"], "AtlasLootItems" },
+	["BRDPyromancerLoregrain"] = { AL["Blackrock Depths"].." - "..AL["Pyromancer Loregrain"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["BRDTheVault"] = { AL["Blackrock Depths"].." - "..AL["The Vault"], "AtlasLootItems" },
+	["BRDWarderStilgiss"] = { AL["Blackrock Depths"].." - "..AL["Warder Stilgiss"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["BRDVerek"] = { AL["Blackrock Depths"].." - "..AL["Verek"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["BRDFineousDarkvire"] = { AL["Blackrock Depths"].." - "..AL["Fineous Darkvire"], "AtlasLootItems" },
+	["BRDLordIncendius"] = { AL["Blackrock Depths"].." - "..AL["Lord Incendius"], "AtlasLootItems" },
+	["BRDBaelGar"] = { AL["Blackrock Depths"].." - "..AL["Bael'Gar"], "AtlasLootItems" },
+	["BRDGeneralAngerforge"] = { AL["Blackrock Depths"].." - "..AL["General Angerforge"], "AtlasLootItems" },
+	["BRDGolemLordArgelmach"] = { AL["Blackrock Depths"].." - "..AL["Golem Lord Argelmach"], "AtlasLootItems" },
+	["BRDGuzzler"] = { AL["Blackrock Depths"].." - "..AL["The Grim Guzzler"], "AtlasLootItems" },
+	["BRDFlamelash"] = { AL["Blackrock Depths"].." - "..AL["Ambassador Flamelash"], "AtlasLootItems" },
+	["BRDPanzor"] = { AL["Blackrock Depths"].." - "..AL["Panzor the Invincible"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["BRDTomb"] = { AL["Blackrock Depths"].." - ".."Summoner's Tomb", "AtlasLootItems" },
+	["BRDLyceum"] = { AL["Blackrock Depths"].." - "..AL["Shadowforge Flame Keeper"], "AtlasLootItems" },
+	["BRDMagmus"] = { AL["Blackrock Depths"].." - "..AL["Magmus"], "AtlasLootItems" },
+	["BRDPrincess"] = { AL["Blackrock Depths"].." - "..AL["Princess Moira Bronzebeard"], "AtlasLootItems" },
+	["BRDEmperorDagranThaurissan"] = { AL["Blackrock Depths"].." - "..AL["Emperor Dagran Thaurissan"], "AtlasLootItems" },
+	["BRDBSPlans"] = { AL["Blackrock Depths"].." - ".."Blacksmith Plans", "AtlasLootItems" },
+	["BRDTrash"] = { AL["Blackrock Depths"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Lower Blackrock Spire
-	["LBRSSpirestoneButcher"] = { AL["Spirestone Butcher"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["LBRSPike"] = { AL["Roughshod Pike"], "AtlasLootItems" },
-	["LBRSOmokk"] = { AL["Highlord Omokk"], "AtlasLootItems" },
-	["LBRSSpirestoneBattleLord"] = { AL["Spirestone Battle Lord"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["LBRSSpirestoneLordMagus"] = { AL["Spirestone Lord Magus"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["LBRSVosh"] = { AL["Shadow Hunter Vosh'gajin"], "AtlasLootItems" },
-	["LBRSVoone"] = { AL["War Master Voone"], "AtlasLootItems" },
-	["LBRSGrayhoof"] = { AL["Mor Grayhoof"] .. " (" .. AL["Summon"] .. ")", "AtlasLootItems" },
-	["LBRSGrimaxe"] = { AL["Bannok Grimaxe"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["LBRSSmolderweb"] = { AL["Mother Smolderweb"], "AtlasLootItems" },
-	["LBRSCrystalFang"] = { AL["Crystal Fang"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["LBRSHumanRemains"] = { AL["Human Remains"], "AtlasLootItems" },
-	["LBRSDoomhowl"] = { AL["Urok Doomhowl"] .. " (" .. AL["Summon"] .. ")", "AtlasLootItems" },
-	["LBRSZigris"] = { AL["Quartermaster Zigris"], "AtlasLootItems" },
-	["LBRSHalycon"] = { AL["Halycon"], "AtlasLootItems" },
-	["LBRSSlavener"] = { AL["Gizrul the Slavener"], "AtlasLootItems" },
-	["LBRSBashguud"] = { AL["Ghok Bashguud"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["LBRSWyrmthalak"] = { AL["Overlord Wyrmthalak"], "AtlasLootItems" },
-	["LBRSFelguard"] = { AL["Burning Felguard"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["LBRSTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Lower Blackrock Spire"] .. ")", "AtlasLootItems" },
+	["LBRSSpirestoneButcher"] = { AL["Lower Blackrock Spire"].." - "..AL["Spirestone Butcher"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["LBRSPike"] = { AL["Lower Blackrock Spire"].." - "..AL["Roughshod Pike"], "AtlasLootItems" },
+	["LBRSOmokk"] = { AL["Lower Blackrock Spire"].." - "..AL["Highlord Omokk"], "AtlasLootItems" },
+	["LBRSSpirestoneBattleLord"] = { AL["Lower Blackrock Spire"].." - "..AL["Spirestone Battle Lord"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["LBRSSpirestoneLordMagus"] = { AL["Lower Blackrock Spire"].." - "..AL["Spirestone Lord Magus"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["LBRSVosh"] = { AL["Lower Blackrock Spire"].." - "..AL["Shadow Hunter Vosh'gajin"], "AtlasLootItems" },
+	["LBRSVoone"] = { AL["Lower Blackrock Spire"].." - "..AL["War Master Voone"], "AtlasLootItems" },
+	["LBRSGrayhoof"] = { AL["Lower Blackrock Spire"].." - "..AL["Mor Grayhoof"] .. " (" .. AL["Summon"] .. ")", "AtlasLootItems" },
+	["LBRSGrimaxe"] = { AL["Lower Blackrock Spire"].." - "..AL["Bannok Grimaxe"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["LBRSSmolderweb"] = { AL["Lower Blackrock Spire"].." - "..AL["Mother Smolderweb"], "AtlasLootItems" },
+	["LBRSCrystalFang"] = { AL["Lower Blackrock Spire"].." - "..AL["Crystal Fang"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["LBRSHumanRemains"] = { AL["Lower Blackrock Spire"].." - "..AL["Human Remains"], "AtlasLootItems" },
+	["LBRSDoomhowl"] = { AL["Lower Blackrock Spire"].." - "..AL["Urok Doomhowl"] .. " (" .. AL["Summon"] .. ")", "AtlasLootItems" },
+	["LBRSZigris"] = { AL["Lower Blackrock Spire"].." - "..AL["Quartermaster Zigris"], "AtlasLootItems" },
+	["LBRSHalycon"] = { AL["Lower Blackrock Spire"].." - "..AL["Halycon"], "AtlasLootItems" },
+	["LBRSSlavener"] = { AL["Lower Blackrock Spire"].." - "..AL["Gizrul the Slavener"], "AtlasLootItems" },
+	["LBRSBashguud"] = { AL["Lower Blackrock Spire"].." - "..AL["Ghok Bashguud"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["LBRSWyrmthalak"] = { AL["Lower Blackrock Spire"].." - "..AL["Overlord Wyrmthalak"], "AtlasLootItems" },
+	["LBRSFelguard"] = { AL["Lower Blackrock Spire"].." - "..AL["Burning Felguard"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["LBRSTrash"] = { AL["Lower Blackrock Spire"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Upper Blackrock Spire
-	["UBRSEmberseer"] = { AL["Pyroguard Emberseer"], "AtlasLootItems" },
-	["UBRSSolakar"] = { AL["Solakar Flamewreath"], "AtlasLootItems" },
-	["UBRSFlame"] = { AL["Father Flame"], "AtlasLootItems" },
-	["UBRSRunewatcher"] = { AL["Jed Runewatcher"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["UBRSAnvilcrack"] = { AL["Goraluk Anvilcrack"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["UBRSRend"] = { AL["Warchief Rend Blackhand"], "AtlasLootItems" },
-	["UBRSGyth"] = { AL["Gyth"], "AtlasLootItems" },
-	["UBRSBeast"] = { AL["The Beast"], "AtlasLootItems" },
-	["UBRSValthalak"] = { AL["Lord Valthalak"] .. " (" .. AL["Summon"] .. ")", "AtlasLootItems" },
-	["UBRSDrakkisath"] = { AL["General Drakkisath"], "AtlasLootItems" },
-	["UBRSTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Upper Blackrock Spire"] .. ")", "AtlasLootItems" },
+	["UBRSEmberseer"] = { AL["Upper Blackrock Spire"].." - "..AL["Pyroguard Emberseer"], "AtlasLootItems" },
+	["UBRSSolakar"] = { AL["Upper Blackrock Spire"].." - "..AL["Solakar Flamewreath"], "AtlasLootItems" },
+	["UBRSFlame"] = { AL["Upper Blackrock Spire"].." - "..AL["Father Flame"], "AtlasLootItems" },
+	["UBRSRunewatcher"] = { AL["Upper Blackrock Spire"].." - "..AL["Jed Runewatcher"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["UBRSAnvilcrack"] = { AL["Upper Blackrock Spire"].." - "..AL["Goraluk Anvilcrack"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["UBRSRend"] = { AL["Upper Blackrock Spire"].." - "..AL["Warchief Rend Blackhand"], "AtlasLootItems" },
+	["UBRSGyth"] = { AL["Upper Blackrock Spire"].." - "..AL["Gyth"], "AtlasLootItems" },
+	["UBRSBeast"] = { AL["Upper Blackrock Spire"].." - "..AL["The Beast"], "AtlasLootItems" },
+	["UBRSValthalak"] = { AL["Upper Blackrock Spire"].." - "..AL["Lord Valthalak"] .. " (" .. AL["Summon"] .. ")", "AtlasLootItems" },
+	["UBRSDrakkisath"] = { AL["Upper Blackrock Spire"].." - "..AL["General Drakkisath"], "AtlasLootItems" },
+	["UBRSTrash"] = { AL["Upper Blackrock Spire"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Blackwing Lair
-	["BWLRazorgore"] = { AL["Razorgore the Untamed"], "AtlasLootItems" },
-	["BWLVaelastrasz"] = { AL["Vaelastrasz the Corrupt"], "AtlasLootItems" },
-	["BWLLashlayer"] = { AL["Broodlord Lashlayer"], "AtlasLootItems" },
-	["BWLFiremaw"] = { AL["Firemaw"], "AtlasLootItems" },
-	["BWLEbonroc"] = { AL["Ebonroc"], "AtlasLootItems" },
-	["BWLFlamegor"] = { AL["Flamegor"], "AtlasLootItems" },
-	["BWLChromaggus"] = { AL["Chromaggus"], "AtlasLootItems" },
-	["BWLNefarian"] = { AL["Nefarian"], "AtlasLootItems" },
-	["BWLTrashMobs"] = { AL["Trash Mobs"] .. " (" .. AL["Blackwing Lair"] .. ")", "AtlasLootItems" },
+	["BWLRazorgore"] = { AL["Blackwing Lair"].." - "..AL["Razorgore the Untamed"], "AtlasLootItems" },
+	["BWLVaelastrasz"] = { AL["Blackwing Lair"].." - "..AL["Vaelastrasz the Corrupt"], "AtlasLootItems" },
+	["BWLLashlayer"] = { AL["Blackwing Lair"].." - "..AL["Broodlord Lashlayer"], "AtlasLootItems" },
+	["BWLFiremaw"] = { AL["Blackwing Lair"].." - "..AL["Firemaw"], "AtlasLootItems" },
+	["BWLEbonroc"] = { AL["Blackwing Lair"].." - "..AL["Ebonroc"], "AtlasLootItems" },
+	["BWLFlamegor"] = { AL["Blackwing Lair"].." - "..AL["Flamegor"], "AtlasLootItems" },
+	["BWLChromaggus"] = { AL["Blackwing Lair"].." - "..AL["Chromaggus"], "AtlasLootItems" },
+	["BWLNefarian"] = { AL["Blackwing Lair"].." - "..AL["Nefarian"], "AtlasLootItems" },
+	["BWLTrashMobs"] = { AL["Blackwing Lair"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--The Deadmines
-	["DMMarisaduPaige"] = { AL["Marisa du'Paige"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["DMBrainwashedNoble"] = { AL["Brainwashed Noble"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["DMForemanThistlenettle"] = { AL["Foreman Thistlenettle"], "AtlasLootItems" },
-	["DMRhahkZor"] = { AL["Rhahk'Zor"], "AtlasLootItems" },
-	["DMMinerJohnson"] = { AL["Miner Johnson"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["DMSneed"] = { AL["Sneed"], "AtlasLootItems" },
-	["DMSneedsShredder"] = { AL["Sneed's Shredder"], "AtlasLootItems" },
-	["DMGilnid"] = { AL["Gilnid"], "AtlasLootItems" },
-	["DMDefiasGunpowder"] = { AL["Defias Gunpowder"], "AtlasLootItems" },
-	["DMMrSmite"] = { AL["Mr. Smite"], "AtlasLootItems" },
-	["DMCookie"] = { AL["Cookie"], "AtlasLootItems" },
-	["DMCaptainGreenskin"] = { AL["Captain Greenskin"], "AtlasLootItems" },
-	["DMVanCleef"] = { AL["Edwin VanCleef"], "AtlasLootItems" },
-	["DMTrash"] = { AL["Trash Mobs"] .. " (" .. AL["The Deadmines"] .. ")", "AtlasLootItems" },
+	["DMMarisaduPaige"] = { AL["The Deadmines"].." - "..AL["Marisa du'Paige"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["DMBrainwashedNoble"] = { AL["The Deadmines"].." - "..AL["Brainwashed Noble"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["DMForemanThistlenettle"] = { AL["The Deadmines"].." - "..AL["Foreman Thistlenettle"], "AtlasLootItems" },
+	["DMRhahkZor"] = { AL["The Deadmines"].." - "..AL["Rhahk'Zor"], "AtlasLootItems" },
+	["DMMinerJohnson"] = { AL["The Deadmines"].." - "..AL["Miner Johnson"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["DMSneed"] = { AL["The Deadmines"].." - "..AL["Sneed"], "AtlasLootItems" },
+	["DMSneedsShredder"] = { AL["The Deadmines"].." - "..AL["Sneed's Shredder"], "AtlasLootItems" },
+	["DMGilnid"] = { AL["The Deadmines"].." - "..AL["Gilnid"], "AtlasLootItems" },
+	["DMDefiasGunpowder"] = { AL["The Deadmines"].." - "..AL["Defias Gunpowder"], "AtlasLootItems" },
+	["DMMrSmite"] = { AL["The Deadmines"].." - "..AL["Mr. Smite"], "AtlasLootItems" },
+	["DMCookie"] = { AL["The Deadmines"].." - "..AL["Cookie"], "AtlasLootItems" },
+	["DMCaptainGreenskin"] = { AL["The Deadmines"].." - "..AL["Captain Greenskin"], "AtlasLootItems" },
+	["DMVanCleef"] = { AL["The Deadmines"].." - "..AL["Edwin VanCleef"], "AtlasLootItems" },
+	["DMTrash"] = { AL["The Deadmines"].." - "..AL["Trash Mobs"] .. " (" .. AL["The Deadmines"] .. ")", "AtlasLootItems" },
 	--Dire Maul East
-	["DMEPusillin"] = { AL["Pusillin"], "AtlasLootItems" },
-	["DMEZevrimThornhoof"] = { AL["Zevrim Thornhoof"], "AtlasLootItems" },
-	["DMEHydro"] = { AL["Hydrospawn"], "AtlasLootItems" },
-	["DMELethtendris"] = { AL["Lethtendris"], "AtlasLootItems" },
-	["DMEPimgib"] = { AL["Pimgib"], "AtlasLootItems" },
-	["DMEAlzzin"] = { AL["Alzzin the Wildshaper"], "AtlasLootItems" },
-	["DMEIsalien"] = { AL["Isalien"], "AtlasLootItems" },
-	["DMETrash"] = { AL["Trash Mobs"] .. " (" .. AL["Dire Maul (East)"] .. ")", "AtlasLootItems" },
-	["DMEShard"] = { AL["Felvine Shard"], "AtlasLootItems" },
-	["DMTome"] = { AL["A Dusty Tome"], "AtlasLootItems" },
-	["DMEBooks"] = { "Dire Maul Books", "AtlasLootItems" },
+	["DMEPusillin"] = { AL["Dire Maul (East)"].." - "..AL["Pusillin"], "AtlasLootItems" },
+	["DMEZevrimThornhoof"] = { AL["Dire Maul (East)"].." - "..AL["Zevrim Thornhoof"], "AtlasLootItems" },
+	["DMEHydro"] = { AL["Dire Maul (East)"].." - "..AL["Hydrospawn"], "AtlasLootItems" },
+	["DMELethtendris"] = { AL["Dire Maul (East)"].." - "..AL["Lethtendris"], "AtlasLootItems" },
+	["DMEPimgib"] = { AL["Dire Maul (East)"].." - "..AL["Pimgib"], "AtlasLootItems" },
+	["DMEAlzzin"] = { AL["Dire Maul (East)"].." - "..AL["Alzzin the Wildshaper"], "AtlasLootItems" },
+	["DMEIsalien"] = { AL["Dire Maul (East)"].." - "..AL["Isalien"], "AtlasLootItems" },
+	["DMETrash"] = { AL["Dire Maul (East)"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
+	["DMEShard"] = { AL["Dire Maul (East)"].." - "..AL["Felvine Shard"], "AtlasLootItems" },
+	["DMTome"] = { AL["Dire Maul"].." - "..AL["A Dusty Tome"], "AtlasLootItems" },
+	["DMEBooks"] = {"Dire Maul Books", "AtlasLootItems" },
 	--Dire Maul North
-	["DMNGuardMoldar"] = { AL["Guard Mol'dar"], "AtlasLootItems" },
-	["DMNStomperKreeg"] = { AL["Stomper Kreeg"], "AtlasLootItems" },
-	["DMNGuardFengus"] = { AL["Guard Fengus"], "AtlasLootItems" },
-	["DMNThimblejack"] = { AL["Knot Thimblejack"], "AtlasLootItems" },
-	["DMNGuardSlipkik"] = { AL["Guard Slip'kik"], "AtlasLootItems" },
-	["DMNCaptainKromcrush"] = { AL["Captain Kromcrush"], "AtlasLootItems" },
-	["DMNChoRush"] = { AL["Cho'Rush the Observer"], "AtlasLootItems" },
-	["DMNKingGordok"] = { AL["King Gordok"], "AtlasLootItems" },
-	["DMNTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Dire Maul (North)"] .. ")", "AtlasLootItems" },
-	["DMNTRIBUTERUN"] = { AL["DM North Tribute Chest"], "AtlasLootItems" },
+	["DMNGuardMoldar"] = { AL["Dire Maul (North)"].." - "..AL["Guard Mol'dar"].."/"..AL["Guard Slip'kik"], "AtlasLootItems" },
+	["DMNStomperKreeg"] = { AL["Dire Maul (North)"].." - "..AL["Stomper Kreeg"], "AtlasLootItems" },
+	["DMNGuardFengus"] = { AL["Dire Maul (North)"].." - "..AL["Guard Fengus"], "AtlasLootItems" },
+	["DMNThimblejack"] = { AL["Dire Maul (North)"].." - "..AL["Knot Thimblejack"], "AtlasLootItems" },
+	["DMNGuardSlipkik"] = { AL["Dire Maul (North)"].." - "..AL["Guard Slip'kik"].."/"..AL["Guard Mol'dar"], "AtlasLootItems" },
+	["DMNCaptainKromcrush"] = { AL["Dire Maul (North)"].." - "..AL["Captain Kromcrush"], "AtlasLootItems" },
+	["DMNChoRush"] = { AL["Dire Maul (North)"].." - "..AL["Cho'Rush the Observer"], "AtlasLootItems" },
+	["DMNKingGordok"] = { AL["Dire Maul (North)"].." - "..AL["King Gordok"], "AtlasLootItems" },
+	["DMNTrash"] = { AL["Dire Maul (North)"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
+	["DMNTRIBUTERUN"] = { AL["Dire Maul (North)"].." - ".."Tribute Chest", "AtlasLootItems" },
 	["DMNBooks"] = { "Dire Maul Books", "AtlasLootItems" },
 	--Dire Maul West
-	["DMWTendrisWarpwood"] = { AL["Tendris Warpwood"], "AtlasLootItems" },
-	["DMWIllyannaRavenoak"] = { AL["Illyanna Ravenoak"], "AtlasLootItems" },
-	["DMWMagisterKalendris"] = { AL["Magister Kalendris"], "AtlasLootItems" },
-	["DMWTsuzee"] = { AL["Tsu'zee"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["DMWRevanchion"] = { AL["Revanchion"] .. " (" .. AL["Scourge Invasion"] .. ")", "AtlasLootItems" },
-	["DMWImmolthar"] = { AL["Immol'thar"], "AtlasLootItems" },
-	["DMWHelnurath"] = { AL["Lord Hel'nurath"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["DMWPrinceTortheldrin"] = { AL["Prince Tortheldrin"], "AtlasLootItems" },
-	["DMWShendralarProvisioner"] = { AL["Shen'dralar Provisioner"], "AtlasLootItems" },
-	["DMWTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Dire Maul (West)"] .. ")", "AtlasLootItems" },
+	["DMWTendrisWarpwood"] = { AL["Dire Maul (West)"].." - "..AL["Tendris Warpwood"], "AtlasLootItems" },
+	["DMWIllyannaRavenoak"] = { AL["Dire Maul (West)"].." - "..AL["Illyanna Ravenoak"], "AtlasLootItems" },
+	["DMWMagisterKalendris"] = { AL["Dire Maul (West)"].." - "..AL["Magister Kalendris"], "AtlasLootItems" },
+	["DMWTsuzee"] = { AL["Dire Maul (West)"].." - "..AL["Tsu'zee"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["DMWRevanchion"] = { AL["Dire Maul (West)"].." - "..AL["Revanchion"] .. " (" .. AL["Scourge Invasion"] .. ")", "AtlasLootItems" },
+	["DMWImmolthar"] = { AL["Dire Maul (West)"].." - "..AL["Immol'thar"], "AtlasLootItems" },
+	["DMWHelnurath"] = { AL["Dire Maul (West)"].." - "..AL["Lord Hel'nurath"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["DMWPrinceTortheldrin"] = { AL["Dire Maul (West)"].." - "..AL["Prince Tortheldrin"], "AtlasLootItems" },
+	["DMWShendralarProvisioner"] = { AL["Dire Maul (West)"].." - "..AL["Shen'dralar Provisioner"], "AtlasLootItems" },
+	["DMWTrash"] = { AL["Dire Maul (West)"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	["DMWBooks"] = { "Dire Maul Books", "AtlasLootItems" },
 	--Gnomeregan
-	["GnNamdoBizzfizzle"] = { AL["Namdo Bizzfizzle"], "AtlasLootItems" },
-	["GnTechbot"] = { AL["Techbot"], "AtlasLootItems" },
-	["GnGrubbis"] = { AL["Grubbis"], "AtlasLootItems" },
-	["GnViscousFallout"] = { AL["Viscous Fallout"], "AtlasLootItems" },
-	["GnElectrocutioner6000"] = { AL["Electrocutioner 6000"], "AtlasLootItems" },
-	["GnCrowdPummeler960"] = { AL["Crowd Pummeler 9-60"], "AtlasLootItems" },
-	["GnDIAmbassador"] = { AL["Dark Iron Ambassador"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["GnMekgineerThermaplugg"] = { AL["Mekgineer Thermaplugg"], "AtlasLootItems" },
-	["GnTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Gnomeregan"] .. ")", "AtlasLootItems" },
-	["GnOutsideTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Gnomeregan"] .. " " .. AL["Entrance"] .. ")", "AtlasLootItems" },
-	["GnPunchographA"] = { AL["Matrix Punchograph 3005-A"], "AtlasLootItems" },
-	["GnPunchographB"] = { AL["Matrix Punchograph 3005-B"], "AtlasLootItems" },
-	["GnPunchographC"] = { AL["Matrix Punchograph 3005-C"], "AtlasLootItems" },
-	["GnPunchographD"] = { AL["Matrix Punchograph 3005-D"], "AtlasLootItems" },
+	["GnNamdoBizzfizzle"] = { AL["Gnomeregan"].." - "..AL["Namdo Bizzfizzle"], "AtlasLootItems" },
+	["GnTechbot"] = { AL["Gnomeregan"].." - "..AL["Techbot"], "AtlasLootItems" },
+	["GnGrubbis"] = { AL["Gnomeregan"].." - "..AL["Grubbis"], "AtlasLootItems" },
+	["GnViscousFallout"] = { AL["Gnomeregan"].." - "..AL["Viscous Fallout"], "AtlasLootItems" },
+	["GnElectrocutioner6000"] = { AL["Gnomeregan"].." - "..AL["Electrocutioner 6000"], "AtlasLootItems" },
+	["GnCrowdPummeler960"] = { AL["Gnomeregan"].." - "..AL["Crowd Pummeler 9-60"], "AtlasLootItems" },
+	["GnDIAmbassador"] = { AL["Gnomeregan"].." - "..AL["Dark Iron Ambassador"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["GnMekgineerThermaplugg"] = { AL["Gnomeregan"].." - "..AL["Mekgineer Thermaplugg"], "AtlasLootItems" },
+	["GnTrash"] = { AL["Gnomeregan"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
+	["GnOutsideTrash"] = { AL["Gnomeregan"].." - "..AL["Trash Mobs"].." (" .. AL["Entrance"] .. ")", "AtlasLootItems" },
+	["GnPunchographA"] = { AL["Gnomeregan"].." - "..AL["Matrix Punchograph 3005-A"], "AtlasLootItems" },
+	["GnPunchographB"] = { AL["Gnomeregan"].." - "..AL["Matrix Punchograph 3005-B"], "AtlasLootItems" },
+	["GnPunchographC"] = { AL["Gnomeregan"].." - "..AL["Matrix Punchograph 3005-C"], "AtlasLootItems" },
+	["GnPunchographD"] = { AL["Gnomeregan"].." - "..AL["Matrix Punchograph 3005-D"], "AtlasLootItems" },
 	--Maraudon
-	["MaraNamelesProphet"] = { AL["The Nameles Prophet"], "AtlasLootItems" },
-	["MaraKhanKolk"] = { AL["Kolk"] .. " (The First Khan)", "AtlasLootItems" },
-	["MaraKhanGelk"] = { AL["Gelk"] .. " (The Second Khan)", "AtlasLootItems" },
-	["MaraKhanMagra"] = { AL["Magra"] .. " (The Third Khan)", "AtlasLootItems" },
-	["MaraKhanVeng"] = { AL["Veng"] .. " (The Fifth Khan)", "AtlasLootItems" },
-	["MaraNoxxion"] = { AL["Noxxion"], "AtlasLootItems" },
-	["MaraRazorlash"] = { AL["Razorlash"], "AtlasLootItems" },
-	["MaraKhanMaraudos"] = { AL["Maraudos"] .. " (The Forth Khan)", "AtlasLootItems" },
-	["MaraLordVyletongue"] = { AL["Lord Vyletongue"], "AtlasLootItems" },
-	["MaraMeshlok"] = { AL["Meshlok the Harvester"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["MaraCelebras"] = { AL["Celebras the Cursed"], "AtlasLootItems" },
-	["MaraLandslide"] = { AL["Landslide"], "AtlasLootItems" },
-	["MaraTinkererGizlock"] = { AL["Tinkerer Gizlock"], "AtlasLootItems" },
-	["MaraRotgrip"] = { AL["Rotgrip"], "AtlasLootItems" },
-	["MaraPrincessTheradras"] = { AL["Princess Theradras"], "AtlasLootItems" },
-	["MaraTrash"] = { AL["Trash Mobs"], "AtlasLootItems" },
+	["MaraNamelesProphet"] = { AL["Maraudon"].." - "..AL["The Nameles Prophet"], "AtlasLootItems" },
+	["MaraKhanKolk"] = { AL["Maraudon"].." - "..AL["Kolk"] .. " (The First Khan)", "AtlasLootItems" },
+	["MaraKhanGelk"] = { AL["Maraudon"].." - "..AL["Gelk"] .. " (The Second Khan)", "AtlasLootItems" },
+	["MaraKhanMagra"] = { AL["Maraudon"].." - "..AL["Magra"] .. " (The Third Khan)", "AtlasLootItems" },
+	["MaraKhanVeng"] = { AL["Maraudon"].." - "..AL["Veng"] .. " (The Fifth Khan)", "AtlasLootItems" },
+	["MaraNoxxion"] = { AL["Maraudon"].." - "..AL["Noxxion"], "AtlasLootItems" },
+	["MaraRazorlash"] = { AL["Maraudon"].." - "..AL["Razorlash"], "AtlasLootItems" },
+	["MaraKhanMaraudos"] = { AL["Maraudon"].." - "..AL["Maraudos"] .. " (The Forth Khan)", "AtlasLootItems" },
+	["MaraLordVyletongue"] = { AL["Maraudon"].." - "..AL["Lord Vyletongue"], "AtlasLootItems" },
+	["MaraMeshlok"] = { AL["Maraudon"].." - "..AL["Meshlok the Harvester"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["MaraCelebras"] = { AL["Maraudon"].." - "..AL["Celebras the Cursed"], "AtlasLootItems" },
+	["MaraLandslide"] = { AL["Maraudon"].." - "..AL["Landslide"], "AtlasLootItems" },
+	["MaraTinkererGizlock"] = { AL["Maraudon"].." - "..AL["Tinkerer Gizlock"], "AtlasLootItems" },
+	["MaraRotgrip"] = { AL["Maraudon"].." - "..AL["Rotgrip"], "AtlasLootItems" },
+	["MaraPrincessTheradras"] = { AL["Maraudon"].." - "..AL["Princess Theradras"], "AtlasLootItems" },
+	["MaraTrash"] = { AL["Maraudon"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Molten Core
-	["MCLucifron"] = { AL["Lucifron"], "AtlasLootItems" },
-	["MCMagmadar"] = { AL["Magmadar"], "AtlasLootItems" },
-	["MCGehennas"] = { AL["Gehennas"], "AtlasLootItems" },
-	["MCGarr"] = { AL["Garr"], "AtlasLootItems" },
-	["MCShazzrah"] = { AL["Shazzrah"], "AtlasLootItems" },
-	["MCGeddon"] = { AL["Baron Geddon"], "AtlasLootItems" },
-	["MCGolemagg"] = { AL["Golemagg the Incinerator"], "AtlasLootItems" },
-	["MCSulfuron"] = { AL["Sulfuron Harbinger"], "AtlasLootItems" },
-	["MCMajordomo"] = { AL["Majordomo Executus"], "AtlasLootItems" },
-	["MCRagnaros"] = { AL["Ragnaros"], "AtlasLootItems" },
-	["MCRANDOMBOSSDROPS"] = { "Random Boss Drops", "AtlasLootItems" },
-	["MCTrashMobs"] = { AL["Trash Mobs"] .. " (" .. AL["Molten Core"] .. ")", "AtlasLootItems" },
+	["MCLucifron"] = { AL["Molten Core"].." - "..AL["Lucifron"], "AtlasLootItems" },
+	["MCMagmadar"] = { AL["Molten Core"].." - "..AL["Magmadar"], "AtlasLootItems" },
+	["MCGehennas"] = { AL["Molten Core"].." - "..AL["Gehennas"], "AtlasLootItems" },
+	["MCGarr"] = { AL["Molten Core"].." - "..AL["Garr"], "AtlasLootItems" },
+	["MCShazzrah"] = { AL["Molten Core"].." - "..AL["Shazzrah"], "AtlasLootItems" },
+	["MCGeddon"] = { AL["Molten Core"].." - "..AL["Baron Geddon"], "AtlasLootItems" },
+	["MCGolemagg"] = { AL["Molten Core"].." - "..AL["Golemagg the Incinerator"], "AtlasLootItems" },
+	["MCSulfuron"] = { AL["Molten Core"].." - "..AL["Sulfuron Harbinger"], "AtlasLootItems" },
+	["MCMajordomo"] = { AL["Molten Core"].." - "..AL["Majordomo Executus"], "AtlasLootItems" },
+	["MCRagnaros"] = { AL["Molten Core"].." - "..AL["Ragnaros"], "AtlasLootItems" },
+	["MCRANDOMBOSSDROPS"] = { AL["Molten Core"].." - ".."Random Boss Drops", "AtlasLootItems" },
+	["MCTrashMobs"] = { AL["Molten Core"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Naxxramas
-	["NAXPatchwerk"] = { AL["Patchwerk"], "AtlasLootItems" },
-	["NAXGrobbulus"] = { AL["Grobbulus"], "AtlasLootItems" },
-	["NAXGluth"] = { AL["Gluth"], "AtlasLootItems" },
-	["NAXThaddius"] = { AL["Thaddius"], "AtlasLootItems" },
-	["NAXAnubRekhan"] = { AL["Anub'Rekhan"], "AtlasLootItems" },
-	["NAXGrandWidowFaerlina"] = { AL["Grand Widow Faerlina"], "AtlasLootItems" },
-	["NAXMaexxna"] = { AL["Maexxna"], "AtlasLootItems" },
-	["NAXInstructorRazuvious"] = { AL["Instructor Razuvious"], "AtlasLootItems" },
-	["NAXGothiktheHarvester"] = { AL["Gothik the Harvester"], "AtlasLootItems" },
-	["NAXTheFourHorsemen"] = { AL["The Four Horsemen"], "AtlasLootItems" },
-	["NAXNoththePlaguebringer"] = { AL["Noth the Plaguebringer"], "AtlasLootItems" },
-	["NAXHeigantheUnclean"] = { AL["Heigan the Unclean"], "AtlasLootItems" },
-	["NAXLoatheb"] = { AL["Loatheb"], "AtlasLootItems" },
-	["NAXSapphiron"] = { AL["Sapphiron"], "AtlasLootItems" },
-	["NAXKelThuzard"] = { AL["Kel'Thuzad"], "AtlasLootItems" },
-	["NAXTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Naxxramas"] .. ")", "AtlasLootItems" },
+	["NAXPatchwerk"] = { AL["Naxxramas"].." - "..AL["Patchwerk"], "AtlasLootItems" },
+	["NAXGrobbulus"] = { AL["Naxxramas"].." - "..AL["Grobbulus"], "AtlasLootItems" },
+	["NAXGluth"] = { AL["Naxxramas"].." - "..AL["Gluth"], "AtlasLootItems" },
+	["NAXThaddius"] = { AL["Naxxramas"].." - "..AL["Thaddius"], "AtlasLootItems" },
+	["NAXAnubRekhan"] = { AL["Naxxramas"].." - "..AL["Anub'Rekhan"], "AtlasLootItems" },
+	["NAXGrandWidowFaerlina"] = { AL["Naxxramas"].." - "..AL["Grand Widow Faerlina"], "AtlasLootItems" },
+	["NAXMaexxna"] = { AL["Naxxramas"].." - "..AL["Maexxna"], "AtlasLootItems" },
+	["NAXInstructorRazuvious"] = { AL["Naxxramas"].." - "..AL["Instructor Razuvious"], "AtlasLootItems" },
+	["NAXGothiktheHarvester"] = { AL["Naxxramas"].." - "..AL["Gothik the Harvester"], "AtlasLootItems" },
+	["NAXTheFourHorsemen"] = { AL["Naxxramas"].." - "..AL["The Four Horsemen"], "AtlasLootItems" },
+	["NAXNoththePlaguebringer"] = { AL["Naxxramas"].." - "..AL["Noth the Plaguebringer"], "AtlasLootItems" },
+	["NAXHeigantheUnclean"] = { AL["Naxxramas"].." - "..AL["Heigan the Unclean"], "AtlasLootItems" },
+	["NAXLoatheb"] = { AL["Naxxramas"].." - "..AL["Loatheb"], "AtlasLootItems" },
+	["NAXSapphiron"] = { AL["Naxxramas"].." - "..AL["Sapphiron"], "AtlasLootItems" },
+	["NAXKelThuzard"] = { AL["Naxxramas"].." - "..AL["Kel'Thuzad"], "AtlasLootItems" },
+	["NAXTrash"] = { AL["Naxxramas"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Onyxia's Lair
-	["Onyxia"] = { AL["Onyxia"], "AtlasLootItems" },
+	["Onyxia"] = { AL["Onyxia's Lair"].." - "..AL["Onyxia"], "AtlasLootItems" },
 	--Ragefire Chasm
-	["RFCBazzalan"] = { AL["Bazzalan"], "AtlasLootItems" },
-	["RFCOggleflint"] = { AL["Oggleflint"], "AtlasLootItems" },
-	["RFCTaragaman"] = { AL["Taragaman the Hungerer"], "AtlasLootItems" },
-	["RFCJergosh"] = { AL["Jergosh the Invoker"], "AtlasLootItems" },
+	["RFCBazzalan"] = { AL["Ragefire Chasm"].." - "..AL["Bazzalan"], "AtlasLootItems" },
+	["RFCOggleflint"] = { AL["Ragefire Chasm"].." - "..AL["Oggleflint"], "AtlasLootItems" },
+	["RFCTaragaman"] = { AL["Ragefire Chasm"].." - "..AL["Taragaman the Hungerer"], "AtlasLootItems" },
+	["RFCJergosh"] = { AL["Ragefire Chasm"].." - "..AL["Jergosh the Invoker"], "AtlasLootItems" },
 	--Razorfen Downs
-	["RFDTutenkash"] = { AL["Tuten'kash"], "AtlasLootItems" },
-	["RFDHenryStern"] = { AL["Henry Stern"], "AtlasLootItems" },
-	["RFDLadyF"] = { AL["Lady Falther'ess"] .. " (" .. AL["Scourge Invasion"] .. ")", "AtlasLootItems" },
-	["RFDMordreshFireEye"] = { AL["Mordresh Fire Eye"], "AtlasLootItems" },
-	["RFDGlutton"] = { AL["Glutton"], "AtlasLootItems" },
-	["RFDRagglesnout"] = { AL["Ragglesnout"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["RFDAmnennar"] = { AL["Amnennar the Coldbringer"], "AtlasLootItems" },
-	["RFDPlaguemaw"] = { AL["Plaguemaw the Rotting"], "AtlasLootItems" },
-	["RFDTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Razorfen Downs"] .. ")", "AtlasLootItems" },
+	["RFDTutenkash"] = { AL["Razorfen Downs"].." - "..AL["Tuten'kash"], "AtlasLootItems" },
+	["RFDHenryStern"] = { AL["Razorfen Downs"].." - "..AL["Henry Stern"], "AtlasLootItems" },
+	["RFDLadyF"] = { AL["Razorfen Downs"].." - "..AL["Lady Falther'ess"] .. " (" .. AL["Scourge Invasion"] .. ")", "AtlasLootItems" },
+	["RFDMordreshFireEye"] = { AL["Razorfen Downs"].." - "..AL["Mordresh Fire Eye"], "AtlasLootItems" },
+	["RFDGlutton"] = { AL["Razorfen Downs"].." - "..AL["Glutton"], "AtlasLootItems" },
+	["RFDRagglesnout"] = { AL["Razorfen Downs"].." - "..AL["Ragglesnout"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["RFDAmnennar"] = { AL["Razorfen Downs"].." - "..AL["Amnennar the Coldbringer"], "AtlasLootItems" },
+	["RFDPlaguemaw"] = { AL["Razorfen Downs"].." - "..AL["Plaguemaw the Rotting"], "AtlasLootItems" },
+	["RFDTrash"] = { AL["Razorfen Downs"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Razorfen Kraul
-	["RFKAggem"] = { AL["Aggem Thorncurse"], "AtlasLootItems" },
-	["RFKDeathSpeakerJargba"] = { AL["Death Speaker Jargba"], "AtlasLootItems" },
-	["RFKRazorfenSpearhide"] = { AL["Razorfen Spearhide"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["RFKOverlordRamtusk"] = { AL["Overlord Ramtusk"], "AtlasLootItems" },
-	["RFKAgathelos"] = { AL["Agathelos the Raging"], "AtlasLootItems" },
-	["RFKBlindHunter"] = { AL["Blind Hunter"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["RFKCharlgaRazorflank"] = { AL["Charlga Razorflank"], "AtlasLootItems" },
-	["RFKEarthcallerHalmgar"] = { AL["Earthcaller Halmgar"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["RFKRoogug"] = { AL["Roogug"], "AtlasLootItems" },
-	["RFKTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Razorfen Kraul"] .. ")", "AtlasLootItems" },
+	["RFKAggem"] = { AL["Razorfen Kraul"].." - "..AL["Aggem Thorncurse"], "AtlasLootItems" },
+	["RFKDeathSpeakerJargba"] = { AL["Razorfen Kraul"].." - "..AL["Death Speaker Jargba"], "AtlasLootItems" },
+	["RFKRazorfenSpearhide"] = { AL["Razorfen Kraul"].." - "..AL["Razorfen Spearhide"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["RFKOverlordRamtusk"] = { AL["Razorfen Kraul"].." - "..AL["Overlord Ramtusk"], "AtlasLootItems" },
+	["RFKAgathelos"] = { AL["Razorfen Kraul"].." - "..AL["Agathelos the Raging"], "AtlasLootItems" },
+	["RFKBlindHunter"] = { AL["Razorfen Kraul"].." - "..AL["Blind Hunter"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["RFKCharlgaRazorflank"] = { AL["Razorfen Kraul"].." - "..AL["Charlga Razorflank"], "AtlasLootItems" },
+	["RFKEarthcallerHalmgar"] = { AL["Razorfen Kraul"].." - "..AL["Earthcaller Halmgar"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["RFKRoogug"] = { AL["Razorfen Kraul"].." - "..AL["Roogug"], "AtlasLootItems" },
+	["RFKTrash"] = { AL["Razorfen Kraul"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--The Ruins of Ahn'Qiraj
-	["AQ20Kurinnaxx"] = { AL["Kurinnaxx"], "AtlasLootItems" },
-	["AQ20Andorov"] = { AL["Lieutenant General Andorov"], "AtlasLootItems" },
-	["AQ20CAPTAIN"] = { AL["Rajaxx's Captains"], "AtlasLootItems" },
-	["AQ20Rajaxx"] = { AL["General Rajaxx"], "AtlasLootItems" },
-	["AQ20Moam"] = { AL["Moam"], "AtlasLootItems" },
-	["AQ20Buru"] = { AL["Buru the Gorger"], "AtlasLootItems" },
-	["AQ20Ayamiss"] = { AL["Ayamiss the Hunter"], "AtlasLootItems" },
-	["AQ20Ossirian"] = { AL["Ossirian the Unscarred"], "AtlasLootItems" },
-	["AQ20Trash"] = { AL["Trash Mobs"] .. " (AQ20)", "AtlasLootItems" },
-	["AQ20ClassBooks"] = { "AQ Class Books", "AtlasLootItems" },
-	["AQ20Enchants"] = { "AQ Enchants", "AtlasLootItems" },
+	["AQ20Kurinnaxx"] = { AL["Ruins of Ahn'Qiraj"].." - "..AL["Kurinnaxx"], "AtlasLootItems" },
+	["AQ20Andorov"] = { AL["Ruins of Ahn'Qiraj"].." - "..AL["Lieutenant General Andorov"], "AtlasLootItems" },
+	["AQ20CAPTAIN"] = { AL["Ruins of Ahn'Qiraj"].." - "..AL["Rajaxx's Captains"], "AtlasLootItems" },
+	["AQ20Rajaxx"] = { AL["Ruins of Ahn'Qiraj"].." - "..AL["General Rajaxx"], "AtlasLootItems" },
+	["AQ20Moam"] = { AL["Ruins of Ahn'Qiraj"].." - "..AL["Moam"], "AtlasLootItems" },
+	["AQ20Buru"] = { AL["Ruins of Ahn'Qiraj"].." - "..AL["Buru the Gorger"], "AtlasLootItems" },
+	["AQ20Ayamiss"] = { AL["Ruins of Ahn'Qiraj"].." - "..AL["Ayamiss the Hunter"], "AtlasLootItems" },
+	["AQ20Ossirian"] = { AL["Ruins of Ahn'Qiraj"].." - "..AL["Ossirian the Unscarred"], "AtlasLootItems" },
+	["AQ20Trash"] = { AL["Ruins of Ahn'Qiraj"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
+	["AQ20ClassBooks"] = { AL["Ruins of Ahn'Qiraj"].." - ".."AQ Class Books", "AtlasLootItems" },
+	["AQ20Enchants"] = { AL["Ruins of Ahn'Qiraj"].." - ".."AQ Enchants", "AtlasLootItems" },
 	--Scarlet Monestery - Armory
-	["SMHerod"] = { AL["Herod"], "AtlasLootItems" },
-	["SMATrash"] = { AL["Trash Mobs"] .. " (" .. AL["Scarlet Monastery (Armory)"] .. ")", "AtlasLootItems" },
+	["SMHerod"] = { AL["Scarlet Monastery (Armory)"].." - "..AL["Herod"], "AtlasLootItems" },
+	["SMATrash"] = { AL["Scarlet Monastery (Armory)"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Scarlet Monestery - Cathedral
-	["SMFairbanks"] = { AL["High Inquisitor Fairbanks"], "AtlasLootItems" },
-	["SMMograine"] = { AL["Scarlet Commander Mograine"], "AtlasLootItems" },
-	["SMWhitemane"] = { AL["High Inquisitor Whitemane"], "AtlasLootItems" },
-	["SMCTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Scarlet Monastery (Cathedral)"] .. ")", "AtlasLootItems" },
+	["SMFairbanks"] = { AL["Scarlet Monastery (Cathedral)"].." - "..AL["High Inquisitor Fairbanks"], "AtlasLootItems" },
+	["SMMograine"] = { AL["Scarlet Monastery (Cathedral)"].." - "..AL["Scarlet Commander Mograine"], "AtlasLootItems" },
+	["SMWhitemane"] = { AL["Scarlet Monastery (Cathedral)"].." - "..AL["High Inquisitor Whitemane"], "AtlasLootItems" },
+	["SMCTrash"] = { AL["Scarlet Monastery (Cathedral)"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Scarlet Monestery - Graveyard
-	["SMVishas"] = { AL["Interrogator Vishas"], "AtlasLootItems" },
-	["SMScorn"] = { AL["Scorn"] .. " (" .. AL["Scourge Invasion"] .. ")", "AtlasLootItems" },
-	["SMIronspine"] = { AL["Ironspine"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["SMAzshir"] = { AL["Azshir the Sleepless"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["SMFallenChampion"] = { AL["Fallen Champion"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["SMBloodmageThalnos"] = { AL["Bloodmage Thalnos"], "AtlasLootItems" },
-	["SMGTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Scarlet Monastery (Graveyard)"] .. ")", "AtlasLootItems" },
+	["SMVishas"] = { AL["Scarlet Monastery (Graveyard)"].." - "..AL["Interrogator Vishas"], "AtlasLootItems" },
+	["SMScorn"] = { AL["Scarlet Monastery (Graveyard)"].." - "..AL["Scorn"] .. " (" .. AL["Scourge Invasion"] .. ")", "AtlasLootItems" },
+	["SMIronspine"] = { AL["Scarlet Monastery (Graveyard)"].." - "..AL["Ironspine"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["SMAzshir"] = { AL["Scarlet Monastery (Graveyard)"].." - "..AL["Azshir the Sleepless"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["SMFallenChampion"] = { AL["Scarlet Monastery (Graveyard)"].." - "..AL["Fallen Champion"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["SMBloodmageThalnos"] = { AL["Scarlet Monastery (Graveyard)"].." - "..AL["Bloodmage Thalnos"], "AtlasLootItems" },
+	["SMGTrash"] = { AL["Scarlet Monastery (Graveyard)"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Scarlet Monestery - Library
-	["SMHoundmasterLoksey"] = { AL["Houndmaster Loksey"], "AtlasLootItems" },
-	["SMDoan"] = { AL["Arcanist Doan"], "AtlasLootItems" },
-	["SMDoansBox"] = { AL["Doan's Strongbox"], "AtlasLootItems" },
-	["SMLTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Scarlet Monastery (Library)"] .. ")", "AtlasLootItems" },
+	["SMHoundmasterLoksey"] = { AL["Scarlet Monastery (Library)"].." - "..AL["Houndmaster Loksey"], "AtlasLootItems" },
+	["SMDoan"] = { AL["Scarlet Monastery (Library)"].." - "..AL["Arcanist Doan"], "AtlasLootItems" },
+	["SMDoansBox"] = { AL["Scarlet Monastery (Library)"].." - "..AL["Doan's Strongbox"], "AtlasLootItems" },
+	["SMLTrash"] = { AL["Scarlet Monastery (Library)"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Scholomance
-	["SCHOLOBlood"] = { AL["Blood Steward of Kirtonos"], "AtlasLootItems" },
-	["SCHOLOKirtonostheHerald"] = { AL["Kirtonos the Herald"], "AtlasLootItems" },
-	["SCHOLOJandiceBarov"] = { AL["Jandice Barov"], "AtlasLootItems" },
-	["SCHOLOLordBlackwood"] = { AL["Lord Blackwood"] .. " (" .. AL["Scourge Invasion"] .. ")", "AtlasLootItems" },
-	["SCHOLORattlegore"] = { AL["Rattlegore"], "AtlasLootItems" },
-	["SCHOLODeathKnight"] = { AL["Death Knight Darkreaver"], "AtlasLootItems" },
-	["SCHOLOMarduk"] = { AL["Marduk Blackpool"], "AtlasLootItems" },
-	["SCHOLOVectus"] = { AL["Vectus"], "AtlasLootItems" },
-	["SCHOLORasFrostwhisper"] = { AL["Ras Frostwhisper"], "AtlasLootItems" },
-	["SCHOLOKormok"] = { AL["Kormok"], "AtlasLootItems" },
-	["SCHOLOInstructorMalicia"] = { AL["Instructor Malicia"], "AtlasLootItems" },
-	["SCHOLODoctorTheolenKrastinov"] = { AL["Doctor Theolen Krastinov"], "AtlasLootItems" },
-	["SCHOLOLorekeeperPolkelt"] = { AL["Lorekeeper Polkelt"], "AtlasLootItems" },
-	["SCHOLOTheRavenian"] = { AL["The Ravenian"], "AtlasLootItems" },
-	["SCHOLOLordAlexeiBarov"] = { AL["Lord Alexei Barov"], "AtlasLootItems" },
-	["SCHOLOLadyIlluciaBarov"] = { AL["Lady Illucia Barov"], "AtlasLootItems" },
-	["SCHOLODarkmasterGandling"] = { AL["Darkmaster Gandling"], "AtlasLootItems" },
-	["SCHOLOTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Scholomance"] .. ")", "AtlasLootItems" },
+	["SCHOLOBlood"] = { AL["Scholomance"].." - "..AL["Blood Steward of Kirtonos"], "AtlasLootItems" },
+	["SCHOLOKirtonostheHerald"] = { AL["Scholomance"].." - "..AL["Scholomance"].." - "..AL["Kirtonos the Herald"], "AtlasLootItems" },
+	["SCHOLOJandiceBarov"] = { AL["Scholomance"].." - "..AL["Jandice Barov"], "AtlasLootItems" },
+	["SCHOLOLordBlackwood"] = { AL["Scholomance"].." - "..AL["Lord Blackwood"] .. " (" .. AL["Scourge Invasion"] .. ")", "AtlasLootItems" },
+	["SCHOLORattlegore"] = { AL["Scholomance"].." - "..AL["Rattlegore"], "AtlasLootItems" },
+	["SCHOLODeathKnight"] = { AL["Scholomance"].." - "..AL["Death Knight Darkreaver"], "AtlasLootItems" },
+	["SCHOLOMarduk"] = { AL["Scholomance"].." - "..AL["Marduk Blackpool"], "AtlasLootItems" },
+	["SCHOLOVectus"] = { AL["Scholomance"].." - "..AL["Vectus"], "AtlasLootItems" },
+	["SCHOLORasFrostwhisper"] = { AL["Scholomance"].." - "..AL["Ras Frostwhisper"], "AtlasLootItems" },
+	["SCHOLOKormok"] = { AL["Scholomance"].." - "..AL["Kormok"], "AtlasLootItems" },
+	["SCHOLOInstructorMalicia"] = { AL["Scholomance"].." - "..AL["Instructor Malicia"], "AtlasLootItems" },
+	["SCHOLODoctorTheolenKrastinov"] = { AL["Scholomance"].." - "..AL["Doctor Theolen Krastinov"], "AtlasLootItems" },
+	["SCHOLOLorekeeperPolkelt"] = { AL["Scholomance"].." - "..AL["Lorekeeper Polkelt"], "AtlasLootItems" },
+	["SCHOLOTheRavenian"] = { AL["Scholomance"].." - "..AL["The Ravenian"], "AtlasLootItems" },
+	["SCHOLOLordAlexeiBarov"] = { AL["Scholomance"].." - "..AL["Lord Alexei Barov"], "AtlasLootItems" },
+	["SCHOLOLadyIlluciaBarov"] = { AL["Scholomance"].." - "..AL["Lady Illucia Barov"], "AtlasLootItems" },
+	["SCHOLODarkmasterGandling"] = { AL["Scholomance"].." - "..AL["Darkmaster Gandling"], "AtlasLootItems" },
+	["SCHOLOTrash"] = { AL["Scholomance"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Shadowfang Keep
-	["SFKRethilgore"] = { AL["Rethilgore"], "AtlasLootItems" },
-	["SFKFelSteed"] = { AL["Fel Steed"], "AtlasLootItems" },
-	["SFKJordansHammer"] = { AL["Jordan's Hammer"], "AtlasLootItems" },
-	["SFKRazorclawtheButcher"] = { AL["Razorclaw the Butcher"], "AtlasLootItems" },
-	["SFKSilverlaine"] = { AL["Baron Silverlaine"], "AtlasLootItems" },
-	["SFKSpringvale"] = { AL["Commander Springvale"], "AtlasLootItems" },
-	["SFKSever"] = { AL["Sever"] .. " (" .. AL["Scourge Invasion"] .. ")", "AtlasLootItems" },
-	["SFKOdotheBlindwatcher"] = { AL["Odo the Blindwatcher"], "AtlasLootItems" },
-	["SFKFenrustheDevourer"] = { AL["Fenrus the Devourer"], "AtlasLootItems" },
-	["SFKBookofUr"] = { AL["The Book of Ur"], "AtlasLootItems" },
-	["SFKArugalsVoidwalker"] = { AL["Arugal's Voidwalker"], "AtlasLootItems" },
-	["SFKWolfMasterNandos"] = { AL["Wolf Master Nandos"], "AtlasLootItems" },
-	["SFKArchmageArugal"] = { AL["Archmage Arugal"], "AtlasLootItems" },
-	["SFKDeathswornCaptain"] = { AL["Deathsworn Captain"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["SFKTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Shadowfang Keep"] .. ")", "AtlasLootItems" },
+	["SFKRethilgore"] = { AL["Shadowfang Keep"].." - "..AL["Rethilgore"], "AtlasLootItems" },
+	["SFKFelSteed"] = { AL["Shadowfang Keep"].." - "..AL["Fel Steed"], "AtlasLootItems" },
+	["SFKJordansHammer"] = { AL["Shadowfang Keep"].." - "..AL["Jordan's Hammer"], "AtlasLootItems" },
+	["SFKRazorclawtheButcher"] = { AL["Shadowfang Keep"].." - "..AL["Razorclaw the Butcher"], "AtlasLootItems" },
+	["SFKSilverlaine"] = { AL["Shadowfang Keep"].." - "..AL["Baron Silverlaine"], "AtlasLootItems" },
+	["SFKSpringvale"] = { AL["Shadowfang Keep"].." - "..AL["Commander Springvale"], "AtlasLootItems" },
+	["SFKSever"] = { AL["Shadowfang Keep"].." - "..AL["Sever"] .. " (" .. AL["Scourge Invasion"] .. ")", "AtlasLootItems" },
+	["SFKOdotheBlindwatcher"] = { AL["Shadowfang Keep"].." - "..AL["Odo the Blindwatcher"], "AtlasLootItems" },
+	["SFKFenrustheDevourer"] = { AL["Shadowfang Keep"].." - "..AL["Fenrus the Devourer"], "AtlasLootItems" },
+	["SFKBookofUr"] = { AL["Shadowfang Keep"].." - "..AL["The Book of Ur"], "AtlasLootItems" },
+	["SFKArugalsVoidwalker"] = { AL["Shadowfang Keep"].." - "..AL["Arugal's Voidwalker"], "AtlasLootItems" },
+	["SFKWolfMasterNandos"] = { AL["Shadowfang Keep"].." - "..AL["Wolf Master Nandos"], "AtlasLootItems" },
+	["SFKArchmageArugal"] = { AL["Shadowfang Keep"].." - "..AL["Archmage Arugal"], "AtlasLootItems" },
+	["SFKDeathswornCaptain"] = { AL["Shadowfang Keep"].." - "..AL["Deathsworn Captain"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["SFKTrash"] = { AL["Shadowfang Keep"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--The Stockade
-	["SWStTargorr"] = { AL["Targorr the Dread"], "AtlasLootItems" },
-	["SWStKamDeepfury"] = { AL["Kam Deepfury"], "AtlasLootItems" },
-	["SWStHamhock"] = { AL["Hamhock"], "AtlasLootItems" },
-	["SWStDextren"] = { AL["Dextren Ward"], "AtlasLootItems"},
-	["SWStBazil"] = { AL["Bazil Thredd"], "AtlasLootItems" },
-	["SWStBruegalIronknuckle"] = { AL["Bruegal Ironknuckle"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["SWStTrash"] = { AL["Trash Mobs"] .. " (" .. AL["The Stockade"] .. ")", "AtlasLootItems" },
+	["SWStTargorr"] = { AL["The Stockade"].." - "..AL["Targorr the Dread"], "AtlasLootItems" },
+	["SWStKamDeepfury"] = { AL["The Stockade"].." - "..AL["Kam Deepfury"], "AtlasLootItems" },
+	["SWStHamhock"] = { AL["The Stockade"].." - "..AL["Hamhock"], "AtlasLootItems" },
+	["SWStDextren"] = { AL["The Stockade"].." - "..AL["Dextren Ward"], "AtlasLootItems"},
+	["SWStBazil"] = { AL["The Stockade"].." - "..AL["Bazil Thredd"], "AtlasLootItems" },
+	["SWStBruegalIronknuckle"] = { AL["The Stockade"].." - "..AL["Bruegal Ironknuckle"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["SWStTrash"] = { AL["The Stockade"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Stratholme
-	["STRATSkull"] = { AL["Skul"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["STRATStratholmeCourier"] = { AL["Stratholme Courier"], "AtlasLootItems" },
-	["STRATPostmaster"] = { AL["Postmaster Malown"], "AtlasLootItems" },
-	["STRATFrasSiabi"] = { AL["Fras Siabi"], "AtlasLootItems" },
-	["STRATAtiesh"] = { "Atiesh <Hand of Sargeras>", "AtlasLootItems" },
-	["STRATBalzaphon"] = { AL["Balzaphon"] .. " (" .. AL["Scourge Invasion"] .. ")", "AtlasLootItems" },
-	["STRATHearthsingerForresten"] = { AL["Hearthsinger Forresten"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["STRATTheUnforgiven"] = { AL["The Unforgiven"], "AtlasLootItems" },
-	["STRATTimmytheCruel"] = { AL["Timmy the Cruel"], "AtlasLootItems" },
-	["STRATMalor"] = { AL["Malor the Zealous"], "AtlasLootItems" },
-	["STRATMalorsStrongbox"] = { AL["Malor's Strongbox"], "AtlasLootItems" },
-	["STRATCrimsonHammersmith"] = { AL["Crimson Hammersmith"] .. " (" .. AL["Summon"] .. ")", "AtlasLootItems" },
-	["STRATBSPlansSerenity"] = { "Plans: Serenity", "AtlasLootItems" },
-	["STRATCannonMasterWilley"] = { AL["Cannon Master Willey"], "AtlasLootItems" },
-	["STRATArchivistGalford"] = { AL["Archivist Galford"], "AtlasLootItems" },
-	["STRATBalnazzar"] = { AL["Balnazzar"], "AtlasLootItems" },
-	["STRATSothosJarien"] = { AL["Sothos"] .. " & " .. AL["Jarien"], "AtlasLootItems" },
-	["STRATStonespine"] = { AL["Stonespine"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["STRATNerubenkan"] = { AL["Nerub'enkan"], "AtlasLootItems" },
-	["STRATBaronessAnastari"] = { AL["Baroness Anastari"], "AtlasLootItems" },
-	["STRATBlackGuardSwordsmith"] = { AL["Black Guard Swordsmith"] .. " (" .. AL["Summon"] .. ")", "AtlasLootItems" },
-	["STRATBSPlansCorruption"] = { "Plans: Corruption", "AtlasLootItems" },
-	["STRATMalekithePallid"] = { AL["Maleki the Pallid"], "AtlasLootItems" },
-	["STRATMagistrateBarthilas"] = { AL["Magistrate Barthilas"], "AtlasLootItems" },
-	["STRATRamsteintheGorger"] = { AL["Ramstein the Gorger"], "AtlasLootItems" },
-	["STRATBaronRivendare"] = { AL["Baron Rivendare"], "AtlasLootItems" },
-	["STRATTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Stratholme"] .. ")", "AtlasLootItems" },
+	["STRATSkull"] = { AL["Stratholme"].." - "..AL["Skul"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["STRATStratholmeCourier"] = { AL["Stratholme"].." - "..AL["Stratholme Courier"], "AtlasLootItems" },
+	["STRATPostmaster"] = { AL["Stratholme"].." - "..AL["Postmaster Malown"], "AtlasLootItems" },
+	["STRATFrasSiabi"] = { AL["Stratholme"].." - "..AL["Fras Siabi"], "AtlasLootItems" },
+	["STRATAtiesh"] = { AL["Stratholme"].." - ".."Atiesh", "AtlasLootItems" },
+	["STRATBalzaphon"] = { AL["Stratholme"].." - "..AL["Balzaphon"] .. " (" .. AL["Scourge Invasion"] .. ")", "AtlasLootItems" },
+	["STRATHearthsingerForresten"] = { AL["Stratholme"].." - "..AL["Hearthsinger Forresten"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["STRATTheUnforgiven"] = { AL["Stratholme"].." - "..AL["The Unforgiven"], "AtlasLootItems" },
+	["STRATTimmytheCruel"] = { AL["Stratholme"].." - "..AL["Timmy the Cruel"], "AtlasLootItems" },
+	["STRATMalor"] = { AL["Stratholme"].." - "..AL["Malor the Zealous"], "AtlasLootItems" },
+	["STRATMalorsStrongbox"] = { AL["Stratholme"].." - "..AL["Malor's Strongbox"], "AtlasLootItems" },
+	["STRATCrimsonHammersmith"] = { AL["Stratholme"].." - "..AL["Crimson Hammersmith"] .. " (" .. AL["Summon"] .. ")", "AtlasLootItems" },
+	["STRATBSPlansSerenity"] = { AL["Stratholme"].." - ".."Plans: Serenity", "AtlasLootItems" },
+	["STRATCannonMasterWilley"] = { AL["Stratholme"].." - "..AL["Cannon Master Willey"], "AtlasLootItems" },
+	["STRATArchivistGalford"] = { AL["Stratholme"].." - "..AL["Archivist Galford"], "AtlasLootItems" },
+	["STRATBalnazzar"] = { AL["Stratholme"].." - "..AL["Balnazzar"], "AtlasLootItems" },
+	["STRATSothosJarien"] = { AL["Stratholme"].." - "..AL["Sothos"] .. " & " .. AL["Jarien"], "AtlasLootItems" },
+	["STRATStonespine"] = { AL["Stratholme"].." - "..AL["Stonespine"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["STRATNerubenkan"] = { AL["Stratholme"].." - "..AL["Nerub'enkan"], "AtlasLootItems" },
+	["STRATBaronessAnastari"] = { AL["Stratholme"].." - "..AL["Baroness Anastari"], "AtlasLootItems" },
+	["STRATBlackGuardSwordsmith"] = { AL["Stratholme"].." - "..AL["Black Guard Swordsmith"] .. " (" .. AL["Summon"] .. ")", "AtlasLootItems" },
+	["STRATBSPlansCorruption"] = { AL["Stratholme"].." - ".."Plans: Corruption", "AtlasLootItems" },
+	["STRATMalekithePallid"] = { AL["Stratholme"].." - "..AL["Maleki the Pallid"], "AtlasLootItems" },
+	["STRATMagistrateBarthilas"] = { AL["Stratholme"].." - "..AL["Magistrate Barthilas"], "AtlasLootItems" },
+	["STRATRamsteintheGorger"] = { AL["Stratholme"].." - "..AL["Ramstein the Gorger"], "AtlasLootItems" },
+	["STRATBaronRivendare"] = { AL["Stratholme"].." - "..AL["Baron Rivendare"], "AtlasLootItems" },
+	["STRATTrash"] = { AL["Stratholme"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Sunken Temple
-	["STSpawnOfHakkar"] = { AL["Spawn of Hakkar"], "AtlasLootItems" },
-	["STBalconyMinibosses"] = { AL["Balcony Minibosses"], "AtlasLootItems" },
-	["STAtalalarion"] = { AL["Atal'alarion"], "AtlasLootItems" },
-	["STDreamscythe"] = { AL["Dreamscythe"], "AtlasLootItems" },
-	["STWeaver"] = { AL["Weaver"], "AtlasLootItems" },
-	["STAvatarofHakkar"] = { AL["Avatar of Hakkar"], "AtlasLootItems" },
-	["STJammalan"] = { AL["Jammal'an the Prophet"], "AtlasLootItems" },
-	["STOgom"] = { AL["Ogom the Wretched"], "AtlasLootItems" },
-	["STMorphaz"] = { AL["Morphaz"], "AtlasLootItems" },
-	["STHazzas"] = { AL["Hazzas"], "AtlasLootItems" },
-	["STEranikus"] = { AL["Shade of Eranikus"], "AtlasLootItems" },
-	["STTrash"] = { AL["Trash Mobs"] .. " (" .. AL["The Sunken Temple"] .. ")", "AtlasLootItems" },
+	["STSpawnOfHakkar"] = { AL["The Sunken Temple"].." - "..AL["Spawn of Hakkar"], "AtlasLootItems" },
+	["STBalconyMinibosses"] = { AL["The Sunken Temple"].." - "..AL["Balcony Minibosses"], "AtlasLootItems" },
+	["STAtalalarion"] = { AL["The Sunken Temple"].." - "..AL["Atal'alarion"], "AtlasLootItems" },
+	["STDreamscythe"] = { AL["The Sunken Temple"].." - "..AL["Dreamscythe"], "AtlasLootItems" },
+	["STWeaver"] = { AL["The Sunken Temple"].." - "..AL["Weaver"], "AtlasLootItems" },
+	["STAvatarofHakkar"] = { AL["The Sunken Temple"].." - "..AL["Avatar of Hakkar"], "AtlasLootItems" },
+	["STJammalan"] = { AL["The Sunken Temple"].." - "..AL["Jammal'an the Prophet"], "AtlasLootItems" },
+	["STOgom"] = { AL["The Sunken Temple"].." - "..AL["Ogom the Wretched"], "AtlasLootItems" },
+	["STMorphaz"] = { AL["The Sunken Temple"].." - "..AL["Morphaz"], "AtlasLootItems" },
+	["STHazzas"] = { AL["The Sunken Temple"].." - "..AL["Hazzas"], "AtlasLootItems" },
+	["STEranikus"] = { AL["The Sunken Temple"].." - "..AL["Shade of Eranikus"], "AtlasLootItems" },
+	["STTrash"] = { AL["The Sunken Temple"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	-- Hateforge Quarry
-	["HQHighForemanBargulBlackhammer"] = { AL["High Foreman Bargul Blackhammer"], "AtlasLootItems" },
-	["HQEngineerFiggles"] = { AL["Engineer Figgles"], "AtlasLootItems" },
-	["HQCorrosis"] = { AL["Corrosis"], "AtlasLootItems" },
-	["HQHatereaverAnnihilator"] = { AL["Hatereaver Annihilator"], "AtlasLootItems" },
-	["HQHargeshDoomcaller"] = { AL["Hargesh Doomcaller"], "AtlasLootItems" },
-	["HQTrash"] = { AL["Trash Mobs"], "AtlasLootItems" },
+	["HQHighForemanBargulBlackhammer"] = { AL["Hateforge Quarry"].." - "..AL["High Foreman Bargul Blackhammer"], "AtlasLootItems" },
+	["HQEngineerFiggles"] = { AL["Hateforge Quarry"].." - "..AL["Engineer Figgles"], "AtlasLootItems" },
+	["HQCorrosis"] = { AL["Hateforge Quarry"].." - "..AL["Corrosis"], "AtlasLootItems" },
+	["HQHatereaverAnnihilator"] = { AL["Hateforge Quarry"].." - "..AL["Hatereaver Annihilator"], "AtlasLootItems" },
+	["HQHargeshDoomcaller"] = { AL["Hateforge Quarry"].." - "..AL["Hargesh Doomcaller"], "AtlasLootItems" },
+	["HQTrash"] = { AL["Hateforge Quarry"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	-- The Cresant Grove
-	["TCGGrovetenderEngryss"] = { AL["Grovetender Engryss"], "AtlasLootItems" },
-	["TCGKeeperRanathos"] = { AL["Keeper Ranathos"], "AtlasLootItems" },
-	["TCGHighPriestessAlathea"] = { AL["High Priestess A'lathea"], "AtlasLootItems" },
-	["TCGFenektistheDeceiver"] = { AL["Fenektis the Deceiver"], "AtlasLootItems" },
-	["TCGMasterRaxxieth"] = { AL["Master Raxxieth"], "AtlasLootItems" },
-	["TCGTrash"] = { AL["Trash Mobs"], "AtlasLootItems" },
+	["TCGGrovetenderEngryss"] = { AL["The Crescent Grove"].." - "..AL["Grovetender Engryss"], "AtlasLootItems" },
+	["TCGKeeperRanathos"] = { AL["The Crescent Grove"].." - "..AL["Keeper Ranathos"], "AtlasLootItems" },
+	["TCGHighPriestessAlathea"] = { AL["The Crescent Grove"].." - "..AL["High Priestess A'lathea"], "AtlasLootItems" },
+	["TCGFenektistheDeceiver"] = { AL["The Crescent Grove"].." - "..AL["Fenektis the Deceiver"], "AtlasLootItems" },
+	["TCGMasterRaxxieth"] = { AL["The Crescent Grove"].." - "..AL["Master Raxxieth"], "AtlasLootItems" },
+	["TCGTrash"] = { AL["The Crescent Grove"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	-- Karazhan Crypt
-	["KCMarrowspike"] = { AL["Marrowspike"], "AtlasLootItems" },
-	["KCHivaxxis"] = { AL["Hivaxxis"], "AtlasLootItems" },
-	["KCCorpsemuncher"] = { AL["Corpsemuncher"], "AtlasLootItems" },
-	["KCGuardCaptainGort"] = { AL["Guard Captain Gort"], "AtlasLootItems" },
-	["KCArchlichEnkhraz"] = { AL["Archlich Enkhraz"], "AtlasLootItems" },
-	["KCCommanderAndreon"] = { AL["Commander Andreon"], "AtlasLootItems" },
-	["KCAlarus"] = { AL["Alarus"], "AtlasLootItems" },
-	["KCTreasure"] = { AL["Half-Buried Treasure Chest"], "AtlasLootItems" },
-	["KCTrash"] = { AL["Trash Mobs"], "AtlasLootItems" },
+	["KCMarrowspike"] = { AL["Karazhan Crypt"].." - "..AL["Marrowspike"], "AtlasLootItems" },
+	["KCHivaxxis"] = { AL["Karazhan Crypt"].." - "..AL["Hivaxxis"], "AtlasLootItems" },
+	["KCCorpsemuncher"] = { AL["Karazhan Crypt"].." - "..AL["Corpsemuncher"], "AtlasLootItems" },
+	["KCGuardCaptainGort"] = { AL["Karazhan Crypt"].." - "..AL["Guard Captain Gort"], "AtlasLootItems" },
+	["KCArchlichEnkhraz"] = { AL["Karazhan Crypt"].." - "..AL["Archlich Enkhraz"], "AtlasLootItems" },
+	["KCCommanderAndreon"] = { AL["Karazhan Crypt"].." - "..AL["Commander Andreon"], "AtlasLootItems" },
+	["KCAlarus"] = { AL["Karazhan Crypt"].." - "..AL["Alarus"], "AtlasLootItems" },
+	["KCTreasure"] = { AL["Karazhan Crypt"].." - "..AL["Half-Buried Treasure Chest"], "AtlasLootItems" },
+	["KCTrash"] = { AL["Karazhan Crypt"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	-- Caverns of Time: Black Morass
-	["COTBMChronar"] = { AL["Chronar"], "AtlasLootItems" },
-	["COTBMEpidamu"] = { AL["Epidamu"], "AtlasLootItems" },
-	["COTBMDriftingAvatar"] = { AL["Drifting Avatar of Time"], "AtlasLootItems" },
-	["COTBMTimeLordEpochronos"] = { AL["Time-Lord Epochronos"], "AtlasLootItems" },
-	["COTBMMossheart"] = { AL["Mossheart"], "AtlasLootItems" },
-	["COTBMRotmaw"] = { AL["Rotmaw"], "AtlasLootItems" },
-	["COTBMAntnormi"] = { AL["Antnormi"], "AtlasLootItems" },
-	["COTTrash"] = { AL["Trash Mobs"], "AtlasLootItems" },
-	["COTBMInfiniteChromie"] = { AL["Infinite Chromie"], "AtlasLootItems" },
+	["COTBMChronar"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Chronar"], "AtlasLootItems" },
+	["COTBMEpidamu"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Epidamu"], "AtlasLootItems" },
+	["COTBMDriftingAvatar"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Drifting Avatar of Time"], "AtlasLootItems" },
+	["COTBMTimeLordEpochronos"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Time-Lord Epochronos"], "AtlasLootItems" },
+	["COTBMMossheart"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Mossheart"], "AtlasLootItems" },
+	["COTBMRotmaw"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Rotmaw"], "AtlasLootItems" },
+	["COTBMAntnormi"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Antnormi"], "AtlasLootItems" },
+	["COTTrash"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
+	["COTBMInfiniteChromie"] = { AL["Caverns of Time: Black Morass"].." - "..AL["Infinite Chromie"], "AtlasLootItems" },
 	-- Stormwind Vault
-	["SWVAszoshGrimflame"] = { AL["Aszosh Grimflame"], "AtlasLootItems" },
-	["SWVThamGrarr"] = { AL["Tham'Grarr"], "AtlasLootItems" },
-	["SWVBlackBride"] = { AL["Black Bride"], "AtlasLootItems" },
-	["SWVDamian"] = { AL["Damian"], "AtlasLootItems" },
-	["SWVVolkanCruelblade"] = { AL["Volkan Cruelblade"], "AtlasLootItems" },
-	["SWVVaultArmoryEquipment"] = { AL["Arc'tiras / Vault Armory Equipment"], "AtlasLootItems" },
-	["SWVTrash"] = { AL["Trash Mobs"], "AtlasLootItems" },
+	["SWVAszoshGrimflame"] = { AL["Stormwind Vault"].." - "..AL["Aszosh Grimflame"], "AtlasLootItems" },
+	["SWVThamGrarr"] = { AL["Stormwind Vault"].." - "..AL["Tham'Grarr"], "AtlasLootItems" },
+	["SWVBlackBride"] = { AL["Stormwind Vault"].." - "..AL["Black Bride"], "AtlasLootItems" },
+	["SWVDamian"] = { AL["Stormwind Vault"].." - "..AL["Damian"], "AtlasLootItems" },
+	["SWVVolkanCruelblade"] = { AL["Stormwind Vault"].." - "..AL["Volkan Cruelblade"], "AtlasLootItems" },
+	["SWVVaultArmoryEquipment"] = { AL["Stormwind Vault"].." - "..AL["Arc'tiras / Vault Armory Equipment"], "AtlasLootItems" },
+	["SWVTrash"] = { AL["Stormwind Vault"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Temple of Ahn'Qiraj
-	["AQ40Skeram"] = { AL["The Prophet Skeram"], "AtlasLootItems" },
-	["AQ40Trio"] = { AL["The Bug Family"], "AtlasLootItems" },
-	["AQ40Sartura"] = { AL["Battleguard Sartura"], "AtlasLootItems" },
-	["AQ40Fankriss"] = { AL["Fankriss the Unyielding"], "AtlasLootItems" },
-	["AQ40Viscidus"] = { AL["Viscidus"], "AtlasLootItems" },
-	["AQ40Huhuran"] = { AL["Princess Huhuran"], "AtlasLootItems" },
-	["AQ40Emperors"] = { AL["The Twin Emperors"], "AtlasLootItems" },
-	["AQ40Ouro"] = { AL["Ouro"], "AtlasLootItems" },
-	["AQ40CThun"] = { AL["C'Thun"], "AtlasLootItems" },
-	["AQ40Trash1"] = { AL["Trash Mobs"] .. " (AQ40)", "AtlasLootItems" },
-	["AQ40Trash2"] = { AL["Trash Mobs"] .. " (AQ40)", "AtlasLootItems" },
-	["AQOpening"] = { "AQ Opening Quest Line", "AtlasLootItems" },
-	["AQEnchants"] = { "AQ Enchants", "AtlasLootItems" },
+	["AQ40Skeram"] = { AL["Temple of Ahn'Qiraj"].." - "..AL["The Prophet Skeram"], "AtlasLootItems" },
+	["AQ40Trio"] = { AL["Temple of Ahn'Qiraj"].." - "..AL["The Bug Family"], "AtlasLootItems" },
+	["AQ40Sartura"] = { AL["Temple of Ahn'Qiraj"].." - "..AL["Battleguard Sartura"], "AtlasLootItems" },
+	["AQ40Fankriss"] = { AL["Temple of Ahn'Qiraj"].." - "..AL["Fankriss the Unyielding"], "AtlasLootItems" },
+	["AQ40Viscidus"] = { AL["Temple of Ahn'Qiraj"].." - "..AL["Viscidus"], "AtlasLootItems" },
+	["AQ40Huhuran"] = { AL["Temple of Ahn'Qiraj"].." - "..AL["Princess Huhuran"], "AtlasLootItems" },
+	["AQ40Emperors"] = { AL["Temple of Ahn'Qiraj"].." - "..AL["The Twin Emperors"], "AtlasLootItems" },
+	["AQ40Ouro"] = { AL["Temple of Ahn'Qiraj"].." - "..AL["Ouro"], "AtlasLootItems" },
+	["AQ40CThun"] = { AL["Temple of Ahn'Qiraj"].." - "..AL["C'Thun"], "AtlasLootItems" },
+	["AQ40Trash1"] = { AL["Temple of Ahn'Qiraj"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
+	["AQ40Trash2"] = { AL["Temple of Ahn'Qiraj"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
+	["AQOpening"] = { AL["Temple of Ahn'Qiraj"].." - ".."AQ Opening Quest Line", "AtlasLootItems" },
+	["AQEnchants"] = { AL["Temple of Ahn'Qiraj"].." - ".."AQ Enchants", "AtlasLootItems" },
 	--Uldaman
-	["UldMagreganDeepshadow"] = { AL["Magregan Deepshadow"], "AtlasLootItems" },
-	["UldTabletofRyuneh"] = { "Tablet of Ryun'eh", "AtlasLootItems" },
-	["UldKromStoutarmChest"] = { AL["Krom Stoutarm's Chest"], "AtlasLootItems" },
-	["UldGarrettFamilyChest"] = { AL["Garrett Family Chest"], "AtlasLootItems" },
-	["UldShovelphlange"] = { AL["Digmaster Shovelphlange"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["UldRevelosh"] = { AL["Revelosh"], "AtlasLootItems" },
-	["UldEric"] = { AL["Baelog"], "AtlasLootItems" },
-	["UldOlaf"] = { AL["Baelog"], "AtlasLootItems" },
-	["UldBaelog"] = { AL["Baelog"], "AtlasLootItems" },
-	["UldBaelogsChest"] = { AL["Baelog"], "AtlasLootItems" },
-	["UldIronaya"] = { AL["Ironaya"], "AtlasLootItems" },
-	["UldObsidianSentinel"] = { AL["Obsidian Sentinel"], "AtlasLootItems" },
-	["UldAncientStoneKeeper"] = { AL["Ancient Stone Keeper"], "AtlasLootItems" },
-	["UldGalgannFirehammer"] = { AL["Galgann Firehammer"], "AtlasLootItems" },
-	["UldTabletofWill"] = { "Tablet of Will", "AtlasLootItems" },
-	["UldShadowforgeCache"] = { "Shadowforge Cache", "AtlasLootItems" },
-	["UldGrimlok"] = { AL["Grimlok"], "AtlasLootItems" },
-	["UldArchaedas"] = { AL["Archaedas"], "AtlasLootItems" },
-	["UldTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Uldaman"] .. ")", "AtlasLootItems" },
+	["UldMagreganDeepshadow"] = { AL["Uldaman"].." - "..AL["Magregan Deepshadow"], "AtlasLootItems" },
+	["UldTabletofRyuneh"] = { AL["Uldaman"].." - ".."Tablet of Ryun'eh", "AtlasLootItems" },
+	["UldKromStoutarmChest"] = { AL["Uldaman"].." - "..AL["Krom Stoutarm's Chest"], "AtlasLootItems" },
+	["UldGarrettFamilyChest"] = { AL["Uldaman"].." - "..AL["Garrett Family Chest"], "AtlasLootItems" },
+	["UldShovelphlange"] = { AL["Uldaman"].." - "..AL["Digmaster Shovelphlange"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["UldRevelosh"] = { AL["Uldaman"].." - "..AL["Revelosh"], "AtlasLootItems" },
+	["UldEric"] = { AL["Uldaman"].." - "..AL["Eric 'The Swift'"], "AtlasLootItems" },
+	["UldOlaf"] = { AL["Uldaman"].." - "..AL["Olaf"], "AtlasLootItems" },
+	["UldBaelog"] = { AL["Uldaman"].." - "..AL["Baelog"], "AtlasLootItems" },
+	["UldBaelogsChest"] = { AL["Uldaman"].." - "..AL["Baelog's Chest"], "AtlasLootItems" },
+	["UldIronaya"] = { AL["Uldaman"].." - "..AL["Ironaya"], "AtlasLootItems" },
+	["UldObsidianSentinel"] = { AL["Uldaman"].." - "..AL["Obsidian Sentinel"], "AtlasLootItems" },
+	["UldAncientStoneKeeper"] = { AL["Uldaman"].." - "..AL["Ancient Stone Keeper"], "AtlasLootItems" },
+	["UldGalgannFirehammer"] = { AL["Uldaman"].." - "..AL["Galgann Firehammer"], "AtlasLootItems" },
+	["UldTabletofWill"] = { AL["Uldaman"].." - ".."Tablet of Will", "AtlasLootItems" },
+	["UldShadowforgeCache"] = { AL["Uldaman"].." - ".."Shadowforge Cache", "AtlasLootItems" },
+	["UldGrimlok"] = { AL["Uldaman"].." - "..AL["Grimlok"], "AtlasLootItems" },
+	["UldArchaedas"] = { AL["Uldaman"].." - "..AL["Archaedas"], "AtlasLootItems" },
+	["UldTrash"] = { AL["Uldaman"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Gilneas City
-	["GCMatthiasHoltz"] = { AL["Matthias Holtz"], "AtlasLootItems" },
-	["GCPackmasterRagetooth"] = { AL["Packmaster Ragetooth"], "AtlasLootItems" },
-	["GCJudgeSutherland"] = { AL["Judge Sutherland"], "AtlasLootItems" },
-	["GCDustivanBlackcowl"] = { AL["Dustivan Blackcowl"], "AtlasLootItems" },
-	["GCMarshalMagnusGreystone"] = { AL["Marshal Magnus Greystone"], "AtlasLootItems" },
-	["GCHorsemasterLevvin"] = { AL["Horsemaster Levvin"], "AtlasLootItems" },
-	["GCHarlowFamilyChest"] = { AL["Harlow Family Chest"], "AtlasLootItems" },
-	["GCGennGreymane"] = { AL["Genn Greymane"], "AtlasLootItems" },
-	["GCTrash"] = { AL["Trash Mobs"], "AtlasLootItems" },
+	["GCMatthiasHoltz"] = { AL["Gilneas City"].." - "..AL["Matthias Holtz"], "AtlasLootItems" },
+	["GCPackmasterRagetooth"] = { AL["Gilneas City"].." - "..AL["Packmaster Ragetooth"], "AtlasLootItems" },
+	["GCJudgeSutherland"] = { AL["Gilneas City"].." - "..AL["Judge Sutherland"], "AtlasLootItems" },
+	["GCDustivanBlackcowl"] = { AL["Gilneas City"].." - "..AL["Dustivan Blackcowl"], "AtlasLootItems" },
+	["GCMarshalMagnusGreystone"] = { AL["Gilneas City"].." - "..AL["Marshal Magnus Greystone"], "AtlasLootItems" },
+	["GCHorsemasterLevvin"] = { AL["Gilneas City"].." - "..AL["Horsemaster Levvin"], "AtlasLootItems" },
+	["GCHarlowFamilyChest"] = { AL["Gilneas City"].." - "..AL["Harlow Family Chest"], "AtlasLootItems" },
+	["GCGennGreymane"] = { AL["Gilneas City"].." - "..AL["Genn Greymane"], "AtlasLootItems" },
+	["GCTrash"] = { AL["Gilneas City"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Wailing Caverns
-	["WCKalldanFelmoon"] = { AL["Kalldan Felmoon"], "AtlasLootItems" },
-	["WCMadMagglish"] = { AL["Mad Magglish"], "AtlasLootItems" },
-	["WCTrigoretheLasher"] = { AL["Trigore the Lasher"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["WCBoahn"] = { AL["Boahn"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["WCLordCobrahn"] = { AL["Lord Cobrahn"], "AtlasLootItems" },
-	["WCLadyAnacondra"] = { AL["Lady Anacondra"], "AtlasLootItems" },
-	["WCKresh"] = { AL["Kresh"], "AtlasLootItems" },
-	["WCLordPythas"] = { AL["Lord Pythas"], "AtlasLootItems" },
-	["WCSkum"] = { AL["Skum"], "AtlasLootItems" },
-	["WCLordSerpentis"] = { AL["Lord Serpentis"], "AtlasLootItems" },
-	["WCVerdan"] = { AL["Verdan the Everliving"], "AtlasLootItems" },
-	["WCMutanus"] = { AL["Mutanus the Devourer"], "AtlasLootItems" },
-	["WCDeviateFaerieDragon"] = { AL["Deviate Faerie Dragon"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["WCTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Wailing Caverns"] .. ")", "AtlasLootItems" },
+	["WCKalldanFelmoon"] = { AL["Wailing Caverns"].." - "..AL["Kalldan Felmoon"], "AtlasLootItems" },
+	["WCMadMagglish"] = { AL["Wailing Caverns"].." - "..AL["Mad Magglish"], "AtlasLootItems" },
+	["WCTrigoretheLasher"] = { AL["Wailing Caverns"].." - "..AL["Trigore the Lasher"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["WCBoahn"] = { AL["Wailing Caverns"].." - "..AL["Boahn"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["WCLordCobrahn"] = { AL["Wailing Caverns"].." - "..AL["Lord Cobrahn"], "AtlasLootItems" },
+	["WCLadyAnacondra"] = { AL["Wailing Caverns"].." - "..AL["Lady Anacondra"], "AtlasLootItems" },
+	["WCKresh"] = { AL["Wailing Caverns"].." - "..AL["Kresh"], "AtlasLootItems" },
+	["WCLordPythas"] = { AL["Wailing Caverns"].." - "..AL["Lord Pythas"], "AtlasLootItems" },
+	["WCSkum"] = { AL["Wailing Caverns"].." - "..AL["Skum"], "AtlasLootItems" },
+	["WCLordSerpentis"] = { AL["Wailing Caverns"].." - "..AL["Lord Serpentis"], "AtlasLootItems" },
+	["WCVerdan"] = { AL["Wailing Caverns"].." - "..AL["Verdan the Everliving"], "AtlasLootItems" },
+	["WCMutanus"] = { AL["Wailing Caverns"].." - "..AL["Mutanus the Devourer"], "AtlasLootItems" },
+	["WCDeviateFaerieDragon"] = { AL["Wailing Caverns"].." - "..AL["Deviate Faerie Dragon"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["WCTrash"] = { AL["Wailing Caverns"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Zul'Farrak
-	["ZFAntusul"] = { AL["Antu'sul"], "AtlasLootItems" },
-	["ZFThekatheMartyr"] = { AL["Theka the Martyr"], "AtlasLootItems" },
-	["ZFWitchDoctorZumrah"] = { AL["Witch Doctor Zum'rah"], "AtlasLootItems" },
-	["ZFNekrumGutchewer"] = { AL["Nekrum Gutchewer"], "AtlasLootItems" },
-	["ZFSezzziz"] = { AL["Shadowpriest Sezz'ziz"], "AtlasLootItems" },
-	["ZFDustwraith"] = { AL["Dustwraith"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["ZFSergeantBly"] = { AL["Sergeant Bly"], "AtlasLootItems" },
-	["ZFSandfury"] = { AL["Sandfury Executioner"], "AtlasLootItems" },
-	["ZFHydromancerVelratha"] = { AL["Hydromancer Velratha"], "AtlasLootItems" },
-	["ZFGahzrilla"] = { AL["Gahz'rilla"], "AtlasLootItems" },
-	["ZFChiefUkorzSandscalp"] = { AL["Chief Ukorz Sandscalp"], "AtlasLootItems" },
-	["ZFZerillis"] = { AL["Zerillis"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
-	["ZFTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Zul'Farrak"] .. ")", "AtlasLootItems" },
+	["ZFAntusul"] = { AL["Zul'Farrak"].." - "..AL["Antu'sul"], "AtlasLootItems" },
+	["ZFThekatheMartyr"] = { AL["Zul'Farrak"].." - "..AL["Theka the Martyr"], "AtlasLootItems" },
+	["ZFWitchDoctorZumrah"] = { AL["Zul'Farrak"].." - "..AL["Witch Doctor Zum'rah"], "AtlasLootItems" },
+	["ZFNekrumGutchewer"] = { AL["Zul'Farrak"].." - "..AL["Nekrum Gutchewer"], "AtlasLootItems" },
+	["ZFSezzziz"] = { AL["Zul'Farrak"].." - "..AL["Shadowpriest Sezz'ziz"], "AtlasLootItems" },
+	["ZFDustwraith"] = { AL["Zul'Farrak"].." - "..AL["Dustwraith"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["ZFSergeantBly"] = { AL["Zul'Farrak"].." - "..AL["Sergeant Bly"], "AtlasLootItems" },
+	["ZFSandfury"] = { AL["Zul'Farrak"].." - "..AL["Sandfury Executioner"], "AtlasLootItems" },
+	["ZFHydromancerVelratha"] = { AL["Zul'Farrak"].." - "..AL["Hydromancer Velratha"], "AtlasLootItems" },
+	["ZFGahzrilla"] = { AL["Zul'Farrak"].." - "..AL["Gahz'rilla"], "AtlasLootItems" },
+	["ZFChiefUkorzSandscalp"] = { AL["Zul'Farrak"].." - "..AL["Chief Ukorz Sandscalp"], "AtlasLootItems" },
+	["ZFZerillis"] = { AL["Zul'Farrak"].." - "..AL["Zerillis"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" },
+	["ZFTrash"] = { AL["Zul'Farrak"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Zul'Gurub
-	["ZGJeklik"] = { AL["High Priestess Jeklik"], "AtlasLootItems" },
-	["ZGVenoxis"] = { AL["High Priest Venoxis"], "AtlasLootItems" },
-	["ZGMarli"] = { AL["High Priestess Mar'li"], "AtlasLootItems" },
-	["ZGMandokir"] = { AL["Bloodlord Mandokir"], "AtlasLootItems" },
-	["ZGGrilek"] = { AL["Gri'lek"], "AtlasLootItems" },
-	["ZGHazzarah"] = { AL["Hazza'rah"], "AtlasLootItems" },
-	["ZGRenataki"] = { AL["Renataki"], "AtlasLootItems" },
-	["ZGWushoolay"] = { AL["Wushoolay"], "AtlasLootItems" },
-	["ZGGahzranka"] = { AL["Gahz'ranka"], "AtlasLootItems" },
-	["ZGThekal"] = { AL["High Priest Thekal"], "AtlasLootItems" },
-	["ZGArlokk"] = { AL["High Priestess Arlokk"], "AtlasLootItems" },
-	["ZGJindo"] = { AL["Jin'do the Hexxer"], "AtlasLootItems" },
-	["ZGHakkar"] = { AL["Hakkar"], "AtlasLootItems" },
-	["ZGMuddyChurningWaters"] = { AL["Muddy Churning Waters"], "AtlasLootItems" },
-	["ZGJinxedHoodooPile"] = { AL["Jinxed Hoodoo Pile"], "AtlasLootItems" },
-	["ZGShared"] = { "Shared ZG Priest Drops", "AtlasLootItems" },
-	["ZGTrash1"] = { AL["Trash Mobs"] .. " (" .. AL["Zul'Gurub"] .. ")", "AtlasLootItems" },
-	["ZGTrash2"] = { AL["Trash Mobs"] .. " (" .. AL["Zul'Gurub"] .. ")", "AtlasLootItems" },
-	["ZGEnchants"] = { "ZG Enchants", "AtlasLootItems" },
+	["ZGJeklik"] = { AL["Zul'Gurub"].." - "..AL["High Priestess Jeklik"], "AtlasLootItems" },
+	["ZGVenoxis"] = { AL["Zul'Gurub"].." - "..AL["High Priest Venoxis"], "AtlasLootItems" },
+	["ZGMarli"] = { AL["Zul'Gurub"].." - "..AL["High Priestess Mar'li"], "AtlasLootItems" },
+	["ZGMandokir"] = { AL["Zul'Gurub"].." - "..AL["Bloodlord Mandokir"], "AtlasLootItems" },
+	["ZGGrilek"] = { AL["Zul'Gurub"].." - "..AL["Gri'lek"], "AtlasLootItems" },
+	["ZGHazzarah"] = { AL["Zul'Gurub"].." - "..AL["Hazza'rah"], "AtlasLootItems" },
+	["ZGRenataki"] = { AL["Zul'Gurub"].." - "..AL["Renataki"], "AtlasLootItems" },
+	["ZGWushoolay"] = { AL["Zul'Gurub"].." - "..AL["Wushoolay"], "AtlasLootItems" },
+	["ZGGahzranka"] = { AL["Zul'Gurub"].." - "..AL["Gahz'ranka"], "AtlasLootItems" },
+	["ZGThekal"] = { AL["Zul'Gurub"].." - "..AL["High Priest Thekal"], "AtlasLootItems" },
+	["ZGArlokk"] = { AL["Zul'Gurub"].." - "..AL["High Priestess Arlokk"], "AtlasLootItems" },
+	["ZGJindo"] = { AL["Zul'Gurub"].." - "..AL["Jin'do the Hexxer"], "AtlasLootItems" },
+	["ZGHakkar"] = { AL["Zul'Gurub"].." - "..AL["Hakkar"], "AtlasLootItems" },
+	["ZGMuddyChurningWaters"] = { AL["Zul'Gurub"].." - "..AL["Muddy Churning Waters"], "AtlasLootItems" },
+	["ZGJinxedHoodooPile"] = { AL["Zul'Gurub"].." - "..AL["Jinxed Hoodoo Pile"], "AtlasLootItems" },
+	["ZGShared"] = { AL["Zul'Gurub"].." - ".."Shared Priest Drops", "AtlasLootItems" },
+	["ZGTrash1"] = { AL["Zul'Gurub"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
+	["ZGTrash2"] = { AL["Zul'Gurub"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
+	["ZGEnchants"] = { AL["Zul'Gurub"].." - ".."Enchants", "AtlasLootItems" },
 	--Emerald Sanctum
-	["ESErennius"] = { AL["Erennius"], "AtlasLootItems" },
-	["ESSolnius1"] = { AL["Solnius the Awakener"], "AtlasLootItems" },
-	["ESSolnius2"] = { AL["Solnius the Awakener (Page 2)"], "AtlasLootItems" },
-	["ESHardMode"] = { AL["Favor of Erennius (ES Hard Mode)"], "AtlasLootItems" },
-	["ESTrash"] = { AL["Trash Mobs"], "AtlasLootItems" },
+	["ESErennius"] = { AL["Emerald Sanctum"].." - "..AL["Erennius"], "AtlasLootItems" },
+	["ESSolnius1"] = { AL["Emerald Sanctum"].." - "..AL["Solnius the Awakener"], "AtlasLootItems" },
+	["ESSolnius2"] = { AL["Emerald Sanctum"].." - "..AL["Solnius the Awakener"], "AtlasLootItems" },
+	["ESHardMode"] = { AL["Emerald Sanctum"].." - "..AL["Favor of Erennius"], "AtlasLootItems" },
+	["ESTrash"] = { AL["Emerald Sanctum"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
 	--Lower Karazhan Halls
-	["LKHRolfen"] = { AL["Master Blacksmith Rolfen"], "AtlasLootItems" },
-	["LKHBroodQueenAraxxna"] = { AL["Brood Queen Araxxna"], "AtlasLootItems" },
-	["LKHGrizikil"] = { AL["Grizikil"], "AtlasLootItems" },
-	["LKHClawlordHowlfang"] = { AL["Clawlord Howlfang"], "AtlasLootItems" },
-	["LKHLordBlackwaldII"] = { AL["Lord Blackwald II"], "AtlasLootItems" },
-	["LKHMoroes"] = { AL["Moroes"], "AtlasLootItems" },
-	["LKHTrash"] = { AL["Trash Mobs"], "AtlasLootItems" },
-	["LKHEnchants"] = { AL["LKH Enchants"], "AtlasLootItems" },
+	["LKHRolfen"] = { AL["Lower Karazhan Halls"].." - "..AL["Master Blacksmith Rolfen"], "AtlasLootItems" },
+	["LKHBroodQueenAraxxna"] = { AL["Lower Karazhan Halls"].." - "..AL["Brood Queen Araxxna"], "AtlasLootItems" },
+	["LKHGrizikil"] = { AL["Lower Karazhan Halls"].." - "..AL["Grizikil"], "AtlasLootItems" },
+	["LKHClawlordHowlfang"] = { AL["Lower Karazhan Halls"].." - "..AL["Clawlord Howlfang"], "AtlasLootItems" },
+	["LKHLordBlackwaldII"] = { AL["Lower Karazhan Halls"].." - "..AL["Lord Blackwald II"], "AtlasLootItems" },
+	["LKHMoroes"] = { AL["Lower Karazhan Halls"].." - "..AL["Moroes"], "AtlasLootItems" },
+	["LKHTrash"] = { AL["Lower Karazhan Halls"].." - "..AL["Trash Mobs"], "AtlasLootItems" },
+	["LKHEnchants"] = { AL["Lower Karazhan Halls"].." - ".."Enchants", "AtlasLootItems" },
 
 	------------
 	--- Sets ---
 	------------
 
 	--Vanilla WoW Sets
-	["DEADMINES"] = { AL["Set: "] .. AL["Defias Leather"], "AtlasLootSetItems" },
-	["WAILING"] = { AL["Set: "] .. AL["Embrace of the Viper"], "AtlasLootSetItems" },
-	["SCARLET"] = { AL["Set: "] .. AL["Chain of the Scarlet Crusade"], "AtlasLootSetItems" },
-	["BLACKROCKD"] = { AL["Set: "] .. AL["The Gladiator"], "AtlasLootSetItems" },
-	["IRONWEAVE"] = { AL["Set: "] .. AL["Ironweave Battlesuit"], "AtlasLootSetItems" },
-	["ScholoCloth"] = { AL["Set: "] .. AL["Necropile Raiment"], "AtlasLootSetItems" },
-	["ScholoLeather"] = { AL["Set: "] .. AL["Cadaverous Garb"], "AtlasLootSetItems" },
-	["ScholoMail"] = { AL["Set: "] .. AL["Bloodmail Regalia"], "AtlasLootSetItems" },
-	["ScholoPlate"] = { AL["Set: "] .. AL["Deathbone Guardian"], "AtlasLootSetItems" },
-	["STRAT"] = { AL["Set: "] .. AL["The Postmaster"], "AtlasLootSetItems" },
-	["SpiderKiss"] = { AL["Set: "] .. AL["Spider's Kiss"], "AtlasLootSetItems" },
-	["DalRend"] = { AL["Set: "] .. AL["Dal'Rend's Arms"], "AtlasLootSetItems" },
-	["ZGRings"] = { AL["Set: "] .. AL["ZG Rings"], "AtlasLootSetItems" },
-	["ShardOfGods"] = { AL["Set: "] .. AL["Shard of the Gods"], "AtlasLootSetItems" },
+	["DEADMINES"] = { AL["The Deadmines"], "AtlasLootSetItems" },
+	["WAILING"] = { AL["Wailing Caverns"], "AtlasLootSetItems" },
+	["SCARLET"] = { "Scarlet Monastery", "AtlasLootSetItems" },
+	["BLACKROCKD"] = { AL["Blackrock Depths"], "AtlasLootSetItems" },
+	["IRONWEAVE"] = { "High Level Dungeons", "AtlasLootSetItems" },
+	["ScholoCloth"] = { AL["Scholomance"], "AtlasLootSetItems" },
+	["ScholoLeather"] = { AL["Scholomance"], "AtlasLootSetItems" },
+	["ScholoMail"] = { AL["Scholomance"], "AtlasLootSetItems" },
+	["ScholoPlate"] = { AL["Scholomance"], "AtlasLootSetItems" },
+	["STRAT"] = { AL["Stratholme"], "AtlasLootSetItems" },
+	["SpiderKiss"] = { AL["Lower Blackrock Spire"], "AtlasLootSetItems" },
+	["DalRend"] = { AL["Upper Blackrock Spire"], "AtlasLootSetItems" },
+	["ZGRings"] = { AL["Zul'Gurub"], "AtlasLootSetItems" },
+	["ShardOfGods"] = { AL["Ragnaros"].."/"..AL["Onyxia"], "AtlasLootSetItems" },
 	["SpiritofEskhandar"] = { AL["Set: "] .. AL["Spirit of Eskhandar"], "AtlasLootSetItems" },
-	["HakkariBlades"] = { AL["Set: "] .. AL["The Twin Blades of Hakkari"], "AtlasLootSetItems" },
-	["PrimalBlessing"] = { AL["Set: "] .. AL["Primal Blessing"], "AtlasLootSetItems" },
-	["ScourgeInvasion"] = { AL["Set: "] .. AL["Scourge Invasion"], "AtlasLootSetItems" },
-	["Legendaries"] = { AL["Set: "] .. AL["Legendary Items"], "AtlasLootSetItems" },
+	["HakkariBlades"] = { AL["Zul'Gurub"] .. AL["The Twin Blades of Hakkari"], "AtlasLootSetItems" },
+	["PrimalBlessing"] = { AL["Zul'Gurub"] .. AL["Primal Blessing"], "AtlasLootSetItems" },
+	["ScourgeInvasion"] = { AL["Scourge Invasion"], "AtlasLootSetItems" },
+	["Legendaries"] = { AL["Legendary Items"], "AtlasLootSetItems" },
 	["Artifacts"] = { AL["Set: "] .. AL["Artifact Items"], "AtlasLootSetItems" },
 	["RareMounts"] = { AL["Rare Mounts"], "AtlasLootSetItems" },
 	["OldMounts"] = { AL["Old Mounts"], "AtlasLootSetItems" },
@@ -568,75 +568,75 @@ AtlasLoot_TableNames = {
 	["BlueDragonM"] = { AL["Blue Dragon Mail"], "AtlasLootCrafting" },
 	["BlackDragonM"] = { AL["Black Dragon Mail"], "AtlasLootCrafting" },
 	--ZG Sets
-	["ZGDruid"] = { AL["Druid"] .. " - " .. AL["ZG Class Sets"], "AtlasLootSetItems" },
-	["ZGHunter"] = { AL["Hunter"] .. " - " .. AL["ZG Class Sets"], "AtlasLootSetItems" },
-	["ZGMage"] = { AL["Mage"] .. " - " .. AL["ZG Class Sets"], "AtlasLootSetItems" },
-	["ZGPaladin"] = { AL["Paladin"] .. " - " .. AL["ZG Class Sets"], "AtlasLootSetItems" },
-	["ZGPriest"] = { AL["Priest"] .. " - " .. AL["ZG Class Sets"], "AtlasLootSetItems" },
-	["ZGRogue"] = { AL["Rogue"] .. " - " .. AL["ZG Class Sets"], "AtlasLootSetItems" },
-	["ZGShaman"] = { AL["Shaman"] .. " - " .. AL["ZG Class Sets"], "AtlasLootSetItems" },
-	["ZGWarlock"] = { AL["Warlock"] .. " - " .. AL["ZG Class Sets"], "AtlasLootSetItems" },
-	["ZGWarrior"] = { AL["Warrior"] .. " - " .. AL["ZG Class Sets"], "AtlasLootSetItems" },
+	["ZGDruid"] = { AL["Zul'Gurub"].." - ".. AL["Class Set"], "AtlasLootSetItems" },
+	["ZGHunter"] = { AL["Zul'Gurub"].." - ".. AL["Class Set"], "AtlasLootSetItems" },
+	["ZGMage"] = { AL["Zul'Gurub"].." - ".. AL["Class Set"], "AtlasLootSetItems" },
+	["ZGPaladin"] = { AL["Zul'Gurub"].." - ".. AL["Class Set"], "AtlasLootSetItems" },
+	["ZGPriest"] = { AL["Zul'Gurub"].." - ".. AL["Class Set"], "AtlasLootSetItems" },
+	["ZGRogue"] = { AL["Zul'Gurub"].." - ".. AL["Class Set"], "AtlasLootSetItems" },
+	["ZGShaman"] = { AL["Zul'Gurub"].." - ".. AL["Class Set"], "AtlasLootSetItems" },
+	["ZGWarlock"] = { AL["Zul'Gurub"].." - ".. AL["Class Set"], "AtlasLootSetItems" },
+	["ZGWarrior"] = { AL["Zul'Gurub"].." - "..AL["Class Set"], "AtlasLootSetItems" },
 	--AQ20 Sets
-	["AQ20Mage"] = { AL["AQ20 Class Sets"], "AtlasLootSetItems" },
-	["AQ20Warlock"] = { AL["AQ20 Class Sets"], "AtlasLootSetItems" },
-	["AQ20Priest"] = { AL["AQ20 Class Sets"], "AtlasLootSetItems" },
-	["AQ20Rogue"] = { AL["AQ20 Class Sets"], "AtlasLootSetItems" },
-	["AQ20Druid"] = { AL["AQ20 Class Sets"], "AtlasLootSetItems" },
-	["AQ20Hunter"] = { AL["AQ20 Class Sets"], "AtlasLootSetItems" },
-	["AQ20Paladin"] = { AL["AQ20 Class Sets"], "AtlasLootSetItems" },
-	["AQ20Shaman"] = { AL["AQ20 Class Sets"], "AtlasLootSetItems" },
-	["AQ20Warrior"] = { AL["AQ20 Class Sets"], "AtlasLootSetItems" },
+	["AQ20Mage"] = { AL["Ruins of Ahn'Qiraj"].. " - "..AL["Class Set"], "AtlasLootSetItems" },
+	["AQ20Warlock"] = { AL["Ruins of Ahn'Qiraj"].. " - "..AL["Class Set"], "AtlasLootSetItems" },
+	["AQ20Priest"] = { AL["Ruins of Ahn'Qiraj"].. " - "..AL["Class Set"], "AtlasLootSetItems" },
+	["AQ20Rogue"] = { AL["Ruins of Ahn'Qiraj"].. " - "..AL["Class Set"], "AtlasLootSetItems" },
+	["AQ20Druid"] = { AL["Ruins of Ahn'Qiraj"].. " - "..AL["Class Set"], "AtlasLootSetItems" },
+	["AQ20Hunter"] = { AL["Ruins of Ahn'Qiraj"].. " - "..AL["Class Set"], "AtlasLootSetItems" },
+	["AQ20Paladin"] = { AL["Ruins of Ahn'Qiraj"].. " - "..AL["Class Set"], "AtlasLootSetItems" },
+	["AQ20Shaman"] = { AL["Ruins of Ahn'Qiraj"].. " - "..AL["Class Set"], "AtlasLootSetItems" },
+	["AQ20Warrior"] = { AL["Ruins of Ahn'Qiraj"].. " - "..AL["Class Set"], "AtlasLootSetItems" },
 	--AQ40 Sets
-	["AQ40Mage"] = { AL["AQ40 Class Sets"], "AtlasLootSetItems" },
-	["AQ40Priest"] = { AL["AQ40 Class Sets"], "AtlasLootSetItems" },
-	["AQ40Warlock"] = { AL["AQ40 Class Sets"], "AtlasLootSetItems" },
-	["AQ40Rogue"] = { AL["AQ40 Class Sets"], "AtlasLootSetItems" },
-	["AQ40Druid"] = { AL["AQ40 Class Sets"], "AtlasLootSetItems" },
-	["AQ40Shaman"] = { AL["AQ40 Class Sets"], "AtlasLootSetItems" },
-	["AQ40Hunter"] = { AL["AQ40 Class Sets"], "AtlasLootSetItems" },
-	["AQ40Warrior"] = { AL["AQ40 Class Sets"], "AtlasLootSetItems" },
-	["AQ40Paladin"] = { AL["AQ40 Class Sets"], "AtlasLootSetItems" },
+	["AQ40Mage"] = {  AL["Temple of Ahn'Qiraj"].. " - "..AL["Tier 2.5"].." "..AL["Set"], "AtlasLootSetItems" },
+	["AQ40Priest"] = {  AL["Temple of Ahn'Qiraj"].. " - "..AL["Tier 2.5"].." "..AL["Set"], "AtlasLootSetItems" },
+	["AQ40Warlock"] = {  AL["Temple of Ahn'Qiraj"].. " - "..AL["Tier 2.5"].." "..AL["Set"], "AtlasLootSetItems" },
+	["AQ40Rogue"] = { AL["Temple of Ahn'Qiraj"].. " - "..AL["Tier 2.5"].." "..AL["Set"], "AtlasLootSetItems" },
+	["AQ40Druid"] = { AL["Temple of Ahn'Qiraj"].. " - "..AL["Tier 2.5"].." "..AL["Set"], "AtlasLootSetItems" },
+	["AQ40Shaman"] = { AL["Temple of Ahn'Qiraj"].. " - "..AL["Tier 2.5"].." "..AL["Set"], "AtlasLootSetItems" },
+	["AQ40Hunter"] = { AL["Temple of Ahn'Qiraj"].. " - "..AL["Tier 2.5"].." "..AL["Set"], "AtlasLootSetItems" },
+	["AQ40Warrior"] = { AL["Temple of Ahn'Qiraj"].. " - "..AL["Tier 2.5"].." "..AL["Set"], "AtlasLootSetItems" },
+	["AQ40Paladin"] = { AL["Temple of Ahn'Qiraj"].. " - "..AL["Tier 2.5"].." "..AL["Set"], "AtlasLootSetItems" },
 	--Dungeon Set 1/2
-	["T0Druid"] = { AL["Druid"] .. " - " .. AL["Dungeon 1/2 Sets"], "AtlasLootSetItems" },
-	["T0Hunter"] = { AL["Hunter"] .. " - " .. AL["Dungeon 1/2 Sets"], "AtlasLootSetItems" },
-	["T0Mage"] = { AL["Mage"] .. " - " .. AL["Dungeon 1/2 Sets"], "AtlasLootSetItems" },
-	["T0Paladin"] = { AL["Paladin"] .. " - " .. AL["Dungeon 1/2 Sets"], "AtlasLootSetItems" },
-	["T0Priest"] = { AL["Priest"] .. " - " .. AL["Dungeon 1/2 Sets"], "AtlasLootSetItems" },
-	["T0Rogue"] = { AL["Rogue"] .. " - " .. AL["Dungeon 1/2 Sets"], "AtlasLootSetItems" },
-	["T0Shaman"] = { AL["Shaman"] .. " - " .. AL["Dungeon 1/2 Sets"], "AtlasLootSetItems" },
-	["T0Warlock"] = { AL["Warlock"] .. " - " .. AL["Dungeon 1/2 Sets"], "AtlasLootSetItems" },
-	["T0Warrior"] = { AL["Warrior"] .. " - " .. AL["Dungeon 1/2 Sets"], "AtlasLootSetItems" },
+	["T0Druid"] = { AL["Druid"] .. " " .. AL["Dungeon Set"], "AtlasLootSetItems" },
+	["T0Hunter"] = { AL["Hunter"] .. " " .. AL["Dungeon Set"], "AtlasLootSetItems" },
+	["T0Mage"] = { AL["Mage"] .. " " .. AL["Dungeon Set"], "AtlasLootSetItems" },
+	["T0Paladin"] = { AL["Paladin"] .. " " .. AL["Dungeon Set"], "AtlasLootSetItems" },
+	["T0Priest"] = { AL["Priest"] .. " " .. AL["Dungeon Set"], "AtlasLootSetItems" },
+	["T0Rogue"] = { AL["Rogue"] .. " " .. AL["Dungeon Set"], "AtlasLootSetItems" },
+	["T0Shaman"] = { AL["Shaman"] .. " " .. AL["Dungeon Set"], "AtlasLootSetItems" },
+	["T0Warlock"] = { AL["Warlock"] .. " " .. AL["Dungeon Set"], "AtlasLootSetItems" },
+	["T0Warrior"] = { AL["Warrior"] .. " " .. AL["Dungeon Set"], "AtlasLootSetItems" },
 	--T1Sets
-	["T1Druid"] = { AL["Druid"] .. " - " .. AL["Tier 1 Sets"], "AtlasLootSetItems" },
-	["T1Hunter"] = { AL["Hunter"] .. " - " .. AL["Tier 1 Sets"], "AtlasLootSetItems" },
-	["T1Mage"] = { AL["Mage"] .. " - " .. AL["Tier 1 Sets"], "AtlasLootSetItems" },
-	["T1Paladin"] = { AL["Paladin"] .. " - " .. AL["Tier 1 Sets"], "AtlasLootSetItems" },
-	["T1Priest"] = { AL["Priest"] .. " - " .. AL["Tier 1 Sets"], "AtlasLootSetItems" },
-	["T1Rogue"] = { AL["Rogue"] .. " - " .. AL["Tier 1 Sets"], "AtlasLootSetItems" },
-	["T1Shaman"] = { AL["Shaman"] .. " - " .. AL["Tier 1 Sets"], "AtlasLootSetItems" },
-	["T1Warlock"] = { AL["Warlock"] .. " - " .. AL["Tier 1 Sets"], "AtlasLootSetItems" },
-	["T1Warrior"] = { AL["Warrior"] .. " - " .. AL["Tier 1 Sets"], "AtlasLootSetItems" },
+	["T1Druid"] = { AL["Molten Core"].." - "..AL["Tier 1"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T1Hunter"] = { AL["Molten Core"].." - "..AL["Tier 1"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T1Mage"] = { AL["Molten Core"].." - "..AL["Tier 1"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T1Paladin"] = { AL["Molten Core"].." - "..AL["Tier 1"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T1Priest"] = { AL["Molten Core"].." - "..AL["Tier 1"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T1Rogue"] = { AL["Molten Core"].." - "..AL["Tier 1"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T1Shaman"] = { AL["Molten Core"].." - "..AL["Tier 1"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T1Warlock"] = { AL["Molten Core"].." - "..AL["Tier 1"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T1Warrior"] = { AL["Molten Core"].." - "..AL["Tier 1"].." "..AL["Set"], "AtlasLootSetItems" },
 	--T2Sets
-	["T2Druid"] = { AL["Druid"] .. " - " .. AL["Tier 2 Sets"], "AtlasLootSetItems" },
-	["T2Hunter"] = { AL["Hunter"] .. " - " .. AL["Tier 2 Sets"], "AtlasLootSetItems" },
-	["T2Mage"] = { AL["Mage"] .. " - " .. AL["Tier 2 Sets"], "AtlasLootSetItems" },
-	["T2Paladin"] = { AL["Paladin"] .. " - " .. AL["Tier 2 Sets"], "AtlasLootSetItems" },
-	["T2Priest"] = { AL["Priest"] .. " - " .. AL["Tier 2 Sets"], "AtlasLootSetItems" },
-	["T2Rogue"] = { AL["Rogue"] .. " - " .. AL["Tier 2 Sets"], "AtlasLootSetItems" },
-	["T2Shaman"] = { AL["Shaman"] .. " - " .. AL["Tier 2 Sets"], "AtlasLootSetItems" },
-	["T2Warlock"] = { AL["Warlock"] .. " - " .. AL["Tier 2 Sets"], "AtlasLootSetItems" },
-	["T2Warrior"] = { AL["Warrior"] .. " - " .. AL["Tier 2 Sets"], "AtlasLootSetItems" },
+	["T2Druid"] = { AL["Blackwing Lair"].."/"..AL["Ragnaros"].."/"..AL["Onyxia"].." - "..AL["Tier 2"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T2Hunter"] = { AL["Blackwing Lair"].."/"..AL["Ragnaros"].."/"..AL["Onyxia"].." - "..AL["Tier 2"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T2Mage"] = { AL["Blackwing Lair"].."/"..AL["Ragnaros"].."/"..AL["Onyxia"].." - "..AL["Tier 2"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T2Paladin"] = { AL["Blackwing Lair"].."/"..AL["Ragnaros"].."/"..AL["Onyxia"].." - "..AL["Tier 2"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T2Priest"] = { AL["Blackwing Lair"].."/"..AL["Ragnaros"].."/"..AL["Onyxia"].." - "..AL["Tier 2"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T2Rogue"] = { AL["Blackwing Lair"].."/"..AL["Ragnaros"].."/"..AL["Onyxia"].." - "..AL["Tier 2"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T2Shaman"] = { AL["Blackwing Lair"].."/"..AL["Ragnaros"].."/"..AL["Onyxia"].." - "..AL["Tier 2"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T2Warlock"] = { AL["Blackwing Lair"].."/"..AL["Ragnaros"].."/"..AL["Onyxia"].." - "..AL["Tier 2"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T2Warrior"] = { AL["Blackwing Lair"].."/"..AL["Ragnaros"].."/"..AL["Onyxia"].." - "..AL["Tier 2"].." "..AL["Set"], "AtlasLootSetItems" },
 	--T3 Sets
-	["T3Druid"] = { AL["Druid"] .. " - " .. AL["Tier 3 Sets"], "AtlasLootSetItems" },
-	["T3Hunter"] = { AL["Hunter"] .. " - " .. AL["Tier 3 Sets"], "AtlasLootSetItems" },
-	["T3Mage"] = { AL["Mage"] .. " - " .. AL["Tier 3 Sets"], "AtlasLootSetItems" },
-	["T3Paladin"] = { AL["Paladin"] .. " - " .. AL["Tier 3 Sets"], "AtlasLootSetItems" },
-	["T3Priest"] = { AL["Priest"] .. " - " .. AL["Tier 3 Sets"], "AtlasLootSetItems" },
-	["T3Rogue"] = { AL["Rogue"] .. " - " .. AL["Tier 3 Sets"], "AtlasLootSetItems" },
-	["T3Shaman"] = { AL["Shaman"] .. " - " .. AL["Tier 3 Sets"], "AtlasLootSetItems" },
-	["T3Warlock"] = { AL["Warlock"] .. " - " .. AL["Tier 3 Sets"], "AtlasLootSetItems" },
-	["T3Warrior"] = { AL["Warrior"] .. " - " .. AL["Tier 3 Sets"], "AtlasLootSetItems" },
+	["T3Druid"] = { AL["Naxxramas"].." - "..AL["Tier 3"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T3Hunter"] = { AL["Naxxramas"].." - "..AL["Tier 3"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T3Mage"] = { AL["Naxxramas"].." - "..AL["Tier 3"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T3Paladin"] = { AL["Naxxramas"].." - "..AL["Tier 3"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T3Priest"] = { AL["Naxxramas"].." - "..AL["Tier 3"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T3Rogue"] = { AL["Naxxramas"].." - "..AL["Tier 3"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T3Shaman"] = { AL["Naxxramas"].." - "..AL["Tier 3"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T3Warlock"] = { AL["Naxxramas"].." - "..AL["Tier 3"].." "..AL["Set"], "AtlasLootSetItems" },
+	["T3Warrior"] = { AL["Naxxramas"].." - "..AL["Tier 3"].." "..AL["Set"], "AtlasLootSetItems" },
 
 	------------------------
 	--- Misc Collections ---
@@ -654,12 +654,12 @@ AtlasLoot_TableNames = {
 	--Azuregos
 	["AAzuregos"] = { AL["Azuregos"], "AtlasLootWBItems" },
 	["ASpiritA"] = { AL["Spirit of Azuregos"], "AtlasLootWBItems" },
-	["Turtlhu"] = { "Turtlhu, the Black Turtle of Doom", "AtlasLootWBItems" },
+	--["Turtlhu"] = { "Turtlhu, the Black Turtle of Doom", "AtlasLootWBItems" },
 	["Nerubian"] = { "Nerubian Overseer", "AtlasLootWBItems" },
 	["Reaver"] = { "Dark Reaver of Karazhan", "AtlasLootWBItems" },
 	["Ostarius"] = { "Ostarius", "AtlasLootWBItems" },
 	["Concavius"] = { "Concavius", "AtlasLootWBItems" },
-	["CowKing"] = { "CowKing", "AtlasLootWBItems" },
+	["CowKing"] = { "Moo", "AtlasLootWBItems" },
 	--Doom Lord Kazzak
 	["KKazzak"] = { AL["Lord Kazzak"], "AtlasLootWBItems" },
 	--Emrald Dragons
@@ -667,7 +667,7 @@ AtlasLoot_TableNames = {
 	["DLethon"] = { AL["Lethon"], "AtlasLootWBItems" },
 	["DTaerar"] = { AL["Taerar"], "AtlasLootWBItems" },
 	["DYsondre"] = { AL["Ysondre"], "AtlasLootWBItems" },
-	["DTrash"] = { AL["Trash Mobs"] .. " (" .. AL["Emerald Dragons"] .. ")", "AtlasLootWBItems" },
+	["DTrash"] = { AL["Emerald Dragons"].." - "..AL["Trash Mobs"], "AtlasLootWBItems" },
 
 
 	--------------------------
@@ -679,8 +679,8 @@ AtlasLoot_TableNames = {
 	["Mallon"] = { "Mallon The Moontouched", "AtlasLootWBItems" },
 	["Grugthok"] = { "Grug'thok the Seer", "AtlasLootWBItems" },
 	["WanderingKnight"] = { "The Wandering Knight", "AtlasLootWBItems" },
-	["CrusaderLarsarius"] = { "Crusader Larsarius The Scarlet Crusade", "AtlasLootWBItems" },
-	["Zareth"] = { "Zareth Terrorblade Demon Hunter", "AtlasLootWBItems" },
+	["CrusaderLarsarius"] = { "Crusader Larsarius", "AtlasLootWBItems" },
+	["Zareth"] = { "Zareth Terrorblade", "AtlasLootWBItems" },
 	["Jalakar"] = { "Jal'akar Dire Troll", "AtlasLootWBItems" },
 	["Ashbeard"] = { "Explorer Ashbeard", "AtlasLootWBItems" },
 	["AdmiralBareanWestwind"] = { "Admiral Barean Westwind", "AtlasLootWBItems" },
@@ -726,7 +726,7 @@ AtlasLoot_TableNames = {
 	--Abyssal Council
 	["AbyssalTemplars"] = { "Abyssal Council - Templars", "AtlasLootWorldEvents" },
 	["AbyssalDukes"] = { "Abyssal Council - Dukes", "AtlasLootWorldEvents" },
-	["AbyssalLords"] = { "Abyssal Council - High Council", "AtlasLootWorldEvents" },
+	["AbyssalLords"] = { "Abyssal Council - Lords", "AtlasLootWorldEvents" },
 	--Seasonal
 	["ChildrensWeek"] = { AL["Children's Week"], "AtlasLootWorldEvents" },
 	["Halloween1"] = { AL["Hallow's End"], "AtlasLootWorldEvents" },
@@ -740,11 +740,11 @@ AtlasLoot_TableNames = {
 	["Winterviel"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" },
 	["Winterviel1"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" },
 	["Winterviel2"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" },
-	["WintervielSnowball"] = { "Snowball", "AtlasLootWorldEvents" },
+	["WintervielSnowball"] = { AL["Feast of Winter Veil"].." - Snowball", "AtlasLootWorldEvents" },
 	--Other
 	["ElementalInvasion"] = { AL["Elemental Invasion"], "AtlasLootWorldEvents" },
 	["FishingExtravaganza"] = { AL["Stranglethorn Fishing Extravaganza"], "AtlasLootWorldEvents" },
-	["GurubashiArena"] = { AL["Gurubashi Arena Booty Run"], "AtlasLootWorldEvents" },
+	["GurubashiArena"] = { AL["Gurubashi Arena"], "AtlasLootWorldEvents" },
 	["ScourgeInvasionEvent1"] = { AL["Scourge Invasion"], "AtlasLootWorldEvents" },
 	["ScourgeInvasionEvent2"] = { AL["Scourge Invasion Bosses"], "AtlasLootWorldEvents" },
 
@@ -753,7 +753,7 @@ AtlasLoot_TableNames = {
 	------------------------
 
 	--Argent Dawn
-	["Argent1"] = { AL["Argent Dawn"] .. ": Token Hand-ins", "AtlasLootRepItems" },
+	["Argent1"] = { AL["Argent Dawn"] .. " - Token Hand-ins", "AtlasLootRepItems" },
 	["Argent2"] = { AL["Argent Dawn"], "AtlasLootRepItems" },
 	["Argent3"] = { AL["Argent Dawn"], "AtlasLootRepItems" },
 	--Bloodsail Buccaneers
@@ -761,10 +761,10 @@ AtlasLoot_TableNames = {
 	--Brood of Nozdormu
 	["AQBroodRings"] = { AL["Brood of Nozdormu"], "AtlasLootRepItems" },
 	--Cenarion Circle
-	["Cenarion1"] = { AL["Cenarion Circle"] .. ": " .. AL["Friendly"], "AtlasLootRepItems" },
-	["Cenarion2"] = { AL["Cenarion Circle"] .. ": " .. AL["Honored"], "AtlasLootRepItems" },
-	["Cenarion3"] = { AL["Cenarion Circle"] .. ": " .. AL["Revered"], "AtlasLootRepItems" },
-	["Cenarion4"] = { AL["Cenarion Circle"] .. ": " .. AL["Exalted"], "AtlasLootRepItems" },
+	["Cenarion1"] = { AL["Cenarion Circle"] .. " - " .. AL["Friendly"], "AtlasLootRepItems" },
+	["Cenarion2"] = { AL["Cenarion Circle"] .. " - " .. AL["Honored"], "AtlasLootRepItems" },
+	["Cenarion3"] = { AL["Cenarion Circle"] .. " - " .. AL["Revered"], "AtlasLootRepItems" },
+	["Cenarion4"] = { AL["Cenarion Circle"] .. " - " .. AL["Exalted"], "AtlasLootRepItems" },
 	--The Darkmoon Faire
 	["Darkmoon"] = { AL["Darkmoon Faire"], "AtlasLootRepItems" },
 	--The Defilers
@@ -782,18 +782,18 @@ AtlasLoot_TableNames = {
 	--Stormpike Guard
 	["Stormpike1"] = { AL["Stormpike Guard"], "AtlasLootRepItems" },
 	--Thorium Brotherhood
-	["Thorium1"] = { AL["Thorium Brotherhood"] .. ": " .. AL["Friendly"] .. "/" .. AL["Honored"], "AtlasLootRepItems" },
-	["Thorium2"] = { AL["Thorium Brotherhood"] .. ": " .. AL["Revered"] .. "/" .. AL["Exalted"], "AtlasLootRepItems" },
+	["Thorium1"] = { AL["Thorium Brotherhood"] .. " - " .. AL["Friendly"] .. "/" .. AL["Honored"], "AtlasLootRepItems" },
+	["Thorium2"] = { AL["Thorium Brotherhood"] .. " - " .. AL["Revered"] .. "/" .. AL["Exalted"], "AtlasLootRepItems" },
 	--Timbermaw Hold
 	["Timbermaw"] = { AL["Timbermaw Hold"], "AtlasLootRepItems" },
 	--Wardens of Time
-	["Wardens1"] = { AL["Wardens of Time"] .. ": " .. AL["Friendly"] .. " & " .. AL["Honored"], "AtlasLootRepItems" },
-	["Wardens2"] = { AL["Wardens of Time"] .. ": " .. AL["Revered"] .. " & " .. AL["Exalted"], "AtlasLootRepItems" },
+	["Wardens1"] = { AL["Wardens of Time"] .. " - " .. AL["Friendly"] .. " & " .. AL["Honored"], "AtlasLootRepItems" },
+	["Wardens2"] = { AL["Wardens of Time"] .. " - " .. AL["Revered"] .. " & " .. AL["Exalted"], "AtlasLootRepItems" },
 	--Wintersaber Trainers
 	["Wintersaber1"] = { AL["Wintersaber Trainers"], "AtlasLootRepItems" },
 	--Zandalar Tribe
-	["Zandalar1"] = { AL["Zandalar Tribe"] .. ": " .. AL["Friendly"] .. "/" .. AL["Honored"], "AtlasLootRepItems" },
-	["Zandalar2"] = { AL["Zandalar Tribe"] .. ": " .. AL["Revered"] .. "/" .. AL["Exalted"], "AtlasLootRepItems" },
+	["Zandalar1"] = { AL["Zandalar Tribe"] .. " - " .. AL["Friendly"] .. "/" .. AL["Honored"], "AtlasLootRepItems" },
+	["Zandalar2"] = { AL["Zandalar Tribe"] .. " - " .. AL["Revered"] .. "/" .. AL["Exalted"], "AtlasLootRepItems" },
 
 	["Helf"] = { AL["Silvermoon Remnant"], "AtlasLootRepItems" },
 	["Helf2"] = { AL["Silvermoon Remnant"], "AtlasLootRepItems" },
@@ -823,13 +823,13 @@ AtlasLoot_TableNames = {
 	["AlchemyExpert1"] = { AL["Alchemy"] .. ": " .. AL["Expert"], "AtlasLootCrafting" },
 	["AlchemyArtisan1"] = { AL["Alchemy"] .. ": " .. AL["Artisan"], "AtlasLootCrafting" },
 	["AlchemyArtisan2"] = { AL["Alchemy"] .. ": " .. AL["Artisan"], "AtlasLootCrafting" },
-	["AlchemyFlasks1"] = { AL["Flasks"], "AtlasLootCrafting" },
-	["AlchemyProtectionPots1"] = { AL["Protection Potions"], "AtlasLootCrafting" },
-	["AlchemyHealingAndMana1"] = { AL["Healing and Mana Potions"], "AtlasLootCrafting" },
-	["AlchemyTransmutes1"] = { AL["Transmutes"], "AtlasLootCrafting" },
-	["AlchemyDefensive1"] = { AL["Defensive Potions and Elixirs"], "AtlasLootCrafting" },
-	["AlchemyOffensive1"] = { AL["Offensive Potions and Elixirs"], "AtlasLootCrafting" },
-	["AlchemyOther1"] = { AL["Other"], "AtlasLootCrafting" },
+	["AlchemyFlasks1"] = { AL["Alchemy"] .. ": " .. AL["Flasks"], "AtlasLootCrafting" },
+	["AlchemyProtectionPots1"] = { AL["Alchemy"] .. ": " .. AL["Protection Potions"], "AtlasLootCrafting" },
+	["AlchemyHealingAndMana1"] = { AL["Alchemy"] .. ": " .. AL["Healing and Mana Potions"], "AtlasLootCrafting" },
+	["AlchemyTransmutes1"] = { AL["Alchemy"] .. ": " .. AL["Transmutes"], "AtlasLootCrafting" },
+	["AlchemyDefensive1"] = { AL["Alchemy"] .. ": " .. AL["Defensive Potions and Elixirs"], "AtlasLootCrafting" },
+	["AlchemyOffensive1"] = { AL["Alchemy"] .. ": " .. AL["Offensive Potions and Elixirs"], "AtlasLootCrafting" },
+	["AlchemyOther1"] = { AL["Alchemy"] .. ": " .. AL["Other"], "AtlasLootCrafting" },
 	--BlackSmithing
 	["SmithingApprentice1"] = { AL["Blacksmithing"] .. ": " .. AL["Apprentice"], "AtlasLootCrafting" },
 	["SmithingJourneyman1"] = { AL["Blacksmithing"] .. ": " .. AL["Journeyman"], "AtlasLootCrafting" },
@@ -907,9 +907,9 @@ AtlasLoot_TableNames = {
 	["LeatherArtisan1"] = { AL["Leatherworking"] .. ": " .. AL["Artisan"], "AtlasLootCrafting" },
 	["LeatherArtisan2"] = { AL["Leatherworking"] .. ": " .. AL["Artisan"], "AtlasLootCrafting" },
 	["LeatherArtisan3"] = { AL["Leatherworking"] .. ": " .. AL["Artisan"], "AtlasLootCrafting" },
-	["Dragonscale1"] = { AL["Leatherworking"] .. ": " .. AL["Dragonscale Leatherworking"], "AtlasLootCrafting" },
-	["Elemental1"] = { AL["Leatherworking"] .. ": " .. AL["Elemental Leatherworking"], "AtlasLootCrafting" },
-	["Tribal1"] = { AL["Leatherworking"] .. ": " .. AL["Tribal Leatherworking"], "AtlasLootCrafting" },
+	["Dragonscale1"] = { AL["Dragonscale Leatherworking"], "AtlasLootCrafting" },
+	["Elemental1"] = { AL["Elemental Leatherworking"], "AtlasLootCrafting" },
+	["Tribal1"] = { AL["Tribal Leatherworking"], "AtlasLootCrafting" },
 	["LeatherHelm1"] = { AL["Leatherworking"] .. ": " .. AL["Helm"], "AtlasLootCrafting" },
 	["LeatherShoulders1"] = { AL["Leatherworking"] .. ": " .. AL["Shoulders"], "AtlasLootCrafting" },
 	["LeatherCloak1"] = { AL["Leatherworking"] .. ": " .. AL["Cloak"], "AtlasLootCrafting" },	
@@ -965,7 +965,7 @@ AtlasLoot_TableNames = {
 	["Survival1"] = { AL["Survival"], "AtlasLootCrafting" },
 	["Survival2"] = { AL["Gardening"], "AtlasLootCrafting" },
 	--Poisons
-	["Poisons1"] = { AL["Rogue"] .. ": " .. AL["Poisons"], "AtlasLootCrafting" },
+	["Poisons1"] = { AL["Rogue"] .. " - " .. AL["Poisons"], "AtlasLootCrafting" },
 	
 
 	-----------
@@ -974,61 +974,61 @@ AtlasLoot_TableNames = {
 
 	--Battlegrounds
 	--Blood Ring
-	["BRRepFriendly"] = { AL["Blood Ring"] .. " " .. AL["Friendly Rewards"], "AtlasLootBGItems" },
-	["BRRepHonored"] = { AL["Blood Ring"] .. " " .. AL["Honored Rewards"], "AtlasLootBGItems" },
-	["BRRepRevered"] = { AL["Blood Ring"] .. " " .. AL["Revered Rewards"], "AtlasLootBGItems" },
-	["BRRepExalted"] = { AL["Blood Ring"] .. " " .. AL["Exalted Rewards"], "AtlasLootBGItems" },
-	["BRRepTokens"] = { AL["Token of Blood Rewards"], "AtlasLootBGItems" },
+	["BRRepFriendly"] = { AL["Blood Ring"] .. " - " .. AL["Friendly"], "AtlasLootBGItems" },
+	["BRRepHonored"] = { AL["Blood Ring"] .. " - " .. AL["Honored"], "AtlasLootBGItems" },
+	["BRRepRevered"] = { AL["Blood Ring"] .. " - " .. AL["Revered"], "AtlasLootBGItems" },
+	["BRRepExalted"] = { AL["Blood Ring"] .. " - " .. AL["Exalted"], "AtlasLootBGItems" },
+	["BRRepTokens"] = { AL["Blood Ring"] .. " - " .. AL["Token of Blood Rewards"], "AtlasLootBGItems" },
 	--Alterac Valley
-	["AVRepFriendly"] = { AL["Alterac Valley"] .. " " .. AL["51-60 Friendly Rewards"], "AtlasLootBGItems" },
-	["AVRepHonored"] = { AL["Alterac Valley"] .. " " .. AL["51-60 Honored Rewards"], "AtlasLootBGItems" },
-	["AVRepRevered"] = { AL["Alterac Valley"] .. " " .. AL["51-60 Revered Rewards"], "AtlasLootBGItems" },
-	["AVRepExalted"] = { AL["Alterac Valley"] .. " " .. AL["51-60 Exalted Rewards"], "AtlasLootBGItems" },
-	["AVKorrak"] = { AL["Korrak the Bloodrager"], "AtlasLootBGItems" },
-	["AVLokholarIvus"] = { AL["Ivus & Lokholar"], "AtlasLootBGItems" },
+	["AVRepFriendly"] = { AL["Alterac Valley"] .. " - " .. AL["Friendly"], "AtlasLootBGItems" },
+	["AVRepHonored"] = { AL["Alterac Valley"] .. " - " .. AL["Honored"], "AtlasLootBGItems" },
+	["AVRepRevered"] = { AL["Alterac Valley"] .. " - " .. AL["Revered"], "AtlasLootBGItems" },
+	["AVRepExalted"] = { AL["Alterac Valley"] .. " - " .. AL["Exalted"], "AtlasLootBGItems" },
+	["AVKorrak"] = { AL["Alterac Valley"] .. " - " .. AL["Korrak the Bloodrager"], "AtlasLootBGItems" },
+	["AVLokholarIvus"] = { AL["Alterac Valley"] .. " - " .. AL["Ivus & Lokholar"], "AtlasLootBGItems" },
 	--Arathi Basin
-	["ABRepFriendly"] = { AL["Arathi Basin"] .. " " .. AL["Friendly Rewards"], "AtlasLootBGItems" },
-	["ABRepHonored2029"] = { AL["Arathi Basin"] .. " " .. AL["20-29 Honored Rewards"], "AtlasLootBGItems" },
-	["ABRepHonored3039"] = { AL["Arathi Basin"] .. " " .. AL["30-39 Honored Rewards"], "AtlasLootBGItems" },
-	["ABRepHonored4049"] = { AL["Arathi Basin"] .. " " .. AL["40-49 Honored Rewards"], "AtlasLootBGItems" },
-	["ABRepHonored5059"] = { AL["Arathi Basin"] .. " " .. AL["50-59 Honored Rewards"], "AtlasLootBGItems" },
-	["ABRepRevered2029"] = { AL["Arathi Basin"] .. " " .. AL["20-29 Revered Rewards"], "AtlasLootBGItems" },
-	["ABRepRevered3039"] = { AL["Arathi Basin"] .. " " .. AL["30-39 Revered Rewards"], "AtlasLootBGItems" },
-	["ABRepRevered4049"] = { AL["Arathi Basin"] .. " " .. AL["40-49 Revered Rewards"], "AtlasLootBGItems" },
-	["ABRepRevered5059"] = { AL["Arathi Basin"] .. " " .. AL["50-59 Revered Rewards"], "AtlasLootBGItems" },
-	["ABRepExalted"] = { AL["Arathi Basin"] .. " " .. AL["60 Exalted Rewards"], "AtlasLootBGItems" },
+	["ABRepFriendly"] = { AL["Arathi Basin"] .. " - " .. AL["Friendly"], "AtlasLootBGItems" },
+	["ABRepHonored2029"] = { AL["Arathi Basin"] .. " - " .. AL["Honored"], "AtlasLootBGItems" },
+	["ABRepHonored3039"] = { AL["Arathi Basin"] .. " - " .. AL["Honored"], "AtlasLootBGItems" },
+	["ABRepHonored4049"] = { AL["Arathi Basin"] .. " - " .. AL["Honored"], "AtlasLootBGItems" },
+	["ABRepHonored5059"] = { AL["Arathi Basin"] .. " - " .. AL["Honored"], "AtlasLootBGItems" },
+	["ABRepRevered2029"] = { AL["Arathi Basin"] .. " - " .. AL["Revered"], "AtlasLootBGItems" },
+	["ABRepRevered3039"] = { AL["Arathi Basin"] .. " - " .. AL["Revered"], "AtlasLootBGItems" },
+	["ABRepRevered4049"] = { AL["Arathi Basin"] .. " - " .. AL["Revered"], "AtlasLootBGItems" },
+	["ABRepRevered5059"] = { AL["Arathi Basin"] .. " - " .. AL["Revered"], "AtlasLootBGItems" },
+	["ABRepExalted"] = { AL["Arathi Basin"] .. " - " .. AL["Exalted"], "AtlasLootBGItems" },
 	--Warsong Gulch
-	["WSGRepFriendly"] = { AL["Warsong Gulch"] .. " " .. AL["Friendly Rewards"], "AtlasLootBGItems" },
-	["WSGRepHonored1019"] = { AL["Warsong Gulch"] .. " " .. AL["10-19 Honored Rewards"], "AtlasLootBGItems" },
-	["WSGRepHonored2029"] = { AL["Warsong Gulch"] .. " " .. AL["20-29 Honored Rewards"], "AtlasLootBGItems" },
-	["WSGRepHonored3039"] = { AL["Warsong Gulch"] .. " " .. AL["30-39 Honored Rewards"], "AtlasLootBGItems" },
-	["WSGRepHonored4049"] = { AL["Warsong Gulch"] .. " " .. AL["40-49 Honored Rewards"], "AtlasLootBGItems" },
-	["WSGRepHonored5059"] = { AL["Warsong Gulch"] .. " " .. AL["50-59 Honored Rewards"], "AtlasLootBGItems" },
-	["WSGRepRevered1019"] = { AL["Warsong Gulch"] .. " " .. AL["10-19 Revered Rewards"], "AtlasLootBGItems" },
-	["WSGRepRevered2029"] = { AL["Warsong Gulch"] .. " " .. AL["20-29 Revered Rewards"], "AtlasLootBGItems" },
-	["WSGRepRevered3039"] = { AL["Warsong Gulch"] .. " " .. AL["30-39 Revered Rewards"], "AtlasLootBGItems" },
-	["WSGRepRevered4049"] = { AL["Warsong Gulch"] .. " " .. AL["40-49 Revered Rewards"], "AtlasLootBGItems" },
-	["WSGRepRevered5059"] = { AL["Warsong Gulch"] .. " " .. AL["50-59 Revered Rewards"], "AtlasLootBGItems" },
-	["WSGRepExalted4049"] = { AL["Warsong Gulch"] .. " " .. AL["40-49 Exalted Rewards"], "AtlasLootBGItems" },
-	["WSGRepExalted5059"] = { AL["Warsong Gulch"] .. " " .. AL["50-59 Exalted Rewards"], "AtlasLootBGItems" },
-	["WSGRepExalted60"] = { AL["Warsong Gulch"] .. " " .. AL["60 Exalted Rewards"], "AtlasLootBGItems" },
+	["WSGRepFriendly"] = { AL["Warsong Gulch"] .. " - " .. AL["Friendly"], "AtlasLootBGItems" },
+	["WSGRepHonored1019"] = { AL["Warsong Gulch"] .. " - " .. AL["Honored"], "AtlasLootBGItems" },
+	["WSGRepHonored2029"] = { AL["Warsong Gulch"] .. " - " .. AL["Honored"], "AtlasLootBGItems" },
+	["WSGRepHonored3039"] = { AL["Warsong Gulch"] .. " - " .. AL["Honored"], "AtlasLootBGItems" },
+	["WSGRepHonored4049"] = { AL["Warsong Gulch"] .. " - " .. AL["Honored"], "AtlasLootBGItems" },
+	["WSGRepHonored5059"] = { AL["Warsong Gulch"] .. " - " .. AL["Honored"], "AtlasLootBGItems" },
+	["WSGRepRevered1019"] = { AL["Warsong Gulch"] .. " - " .. AL["Revered"], "AtlasLootBGItems" },
+	["WSGRepRevered2029"] = { AL["Warsong Gulch"] .. " - " .. AL["Revered"], "AtlasLootBGItems" },
+	["WSGRepRevered3039"] = { AL["Warsong Gulch"] .. " - " .. AL["Revered"], "AtlasLootBGItems" },
+	["WSGRepRevered4049"] = { AL["Warsong Gulch"] .. " - " .. AL["Revered"], "AtlasLootBGItems" },
+	["WSGRepRevered5059"] = { AL["Warsong Gulch"] .. " - " .. AL["Revered"], "AtlasLootBGItems" },
+	["WSGRepExalted4049"] = { AL["Warsong Gulch"] .. " - " .. AL["Exalted"], "AtlasLootBGItems" },
+	["WSGRepExalted5059"] = { AL["Warsong Gulch"] .. " - " .. AL["Exalted"], "AtlasLootBGItems" },
+	["WSGRepExalted60"] = { AL["Warsong Gulch"] .. " - " .. AL["Exalted"], "AtlasLootBGItems" },
 	--Misc Other PvP
-	["PvP60Accessories1"] = { AL["PvP Accessories"], "AtlasLootGeneralPvPItems" },
-	["PvP60Accessories2"] = { AL["PvP Accessories - Alliance"], "AtlasLootGeneralPvPItems" },
-	["PvP60Accessories3"] = { AL["PvP Accessories - Horde"], "AtlasLootGeneralPvPItems" },
-	["PVPWeapons1"] = { AL["PvP Weapons"], "AtlasLootGeneralPvPItems" },
-	["PVPWeapons2"] = { AL["PvP Weapons"], "AtlasLootGeneralPvPItems" },
-	["PvPMountsPvP"] = { AL["PvP Mounts"], "AtlasLootGeneralPvPItems" },
+	["PvP60Accessories1"] = { "PvP "..AL["Rank"].." 2", "AtlasLootGeneralPvPItems" },
+	["PvP60Accessories2"] = { "PvP "..AL["Rank 2-9"], "AtlasLootGeneralPvPItems" },
+	["PvP60Accessories3"] = { "PvP "..AL["Rank 2-9"], "AtlasLootGeneralPvPItems" },
+	["PVPWeapons1"] = { "PvP "..AL["Rank 14"], "AtlasLootGeneralPvPItems" },
+	["PVPWeapons2"] = { "PvP "..AL["Rank 14"], "AtlasLootGeneralPvPItems" },
+	["PvPMountsPvP"] = { "PvP "..AL["Rank 11"], "AtlasLootGeneralPvPItems" },
 	--Level 60 PvP Sets
-	["PVPDruid"] = { AL["Druid"] .. " - " .. AL["PvP Sets"], "AtlasLootGeneralPvPItems" },
-	["PVPHunter"] = { AL["Hunter"] .. " - " .. AL["PvP Sets"], "AtlasLootGeneralPvPItems" },
-	["PVPMage"] = { AL["Mage"] .. " - " .. AL["PvP Sets"], "AtlasLootGeneralPvPItems" },
-	["PVPPaladin"] = { AL["Paladin"] .. " - " .. AL["PvP Sets"], "AtlasLootGeneralPvPItems" },
-	["PVPPriest"] = { AL["Priest"] .. " - " .. AL["PvP Sets"], "AtlasLootGeneralPvPItems" },
-	["PVPRogue"] = { AL["Rogue"] .. " - " .. AL["PvP Sets"], "AtlasLootGeneralPvPItems" },
-	["PVPShaman"] = { AL["Shaman"] .. " - " .. AL["PvP Sets"], "AtlasLootGeneralPvPItems" },
-	["PVPWarlock"] = { AL["Warlock"] .. " - " .. AL["PvP Sets"], "AtlasLootGeneralPvPItems" },
-	["PVPWarrior"] = { AL["Warrior"] .. " - " .. AL["PvP Sets"], "AtlasLootGeneralPvPItems" },
+	["PVPDruid"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" },
+	["PVPHunter"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" },
+	["PVPMage"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" },
+	["PVPPaladin"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" },
+	["PVPPriest"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" },
+	["PVPRogue"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" },
+	["PVPShaman"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" },
+	["PVPWarlock"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" },
+	["PVPWarrior"] = { "PvP "..AL["Rank 7-13"], "AtlasLootGeneralPvPItems" },
 
 	-------------
 	--- Other ---
@@ -1780,12 +1780,12 @@ AtlasLoot_TableNamesBoss = {
 	["WorldBosses"] = {
 		["AAzuregos"] = { AL["Azuregos"], "AtlasLootWBItems" },
 		["ASpiritA"] = { AL["Spirit of Azuregos"], "AtlasLootWBItems" },
-		["Turtlhu"] = { "Turtlhu, the Black Turtle of Doom", "AtlasLootWBItems" },
+		--["Turtlhu"] = { "Turtlhu, the Black Turtle of Doom", "AtlasLootWBItems" },
 		["Nerubian"] = { "Nerubian Overseer", "AtlasLootWBItems" },
 		["Reaver"] = { "Dark Reaver of Karazhan", "AtlasLootWBItems" },
 		["Ostarius"] = { "Ostarius", "AtlasLootWBItems" },
 		["Concavius"] = { "Concavius", "AtlasLootWBItems" },
-		["CowKing"] = { "CowKing", "AtlasLootWBItems" },
+		["CowKing"] = { "Moo", "AtlasLootWBItems" },
 		--Doom Lord Kazzak
 		["KKazzak"] = { AL["Lord Kazzak"], "AtlasLootWBItems" },
 		--Emrald Dragons
@@ -1863,7 +1863,7 @@ AtlasLoot_TableNamesBoss = {
 		--Other
 		["ElementalInvasion"] = { AL["Elemental Invasion"], "AtlasLootWorldEvents" },
 		["FishingExtravaganza"] = { AL["Stranglethorn Fishing Extravaganza"], "AtlasLootWorldEvents" },
-		["GurubashiArena"] = { AL["Gurubashi Arena Booty Run"], "AtlasLootWorldEvents" },
+		["GurubashiArena"] = { AL["Gurubashi Arena"], "AtlasLootWorldEvents" },
 		["ScourgeInvasionEvent1"] = { AL["Scourge Invasion"], "AtlasLootWorldEvents" },
 		["ScourgeInvasionEvent2"] = { AL["Scourge Invasion Bosses"], "AtlasLootWorldEvents" },
 	},
diff --git a/WorldBosses/worldbosses.en.lua b/WorldBosses/worldbosses.en.lua
index be5058a..d21fd65 100644
--- a/WorldBosses/worldbosses.en.lua
+++ b/WorldBosses/worldbosses.en.lua
@@ -19,9 +19,9 @@ AtlasLootWBBossButtons = {
 	LordKazzak = {
 		"KKazzak";
 	};
-	Turtlhu = {
+	--[[Turtlhu = {
 		"Turtlhu";
-	};
+	};]]
 	Nerubian = {
 		"Nerubian";
 	};
@@ -151,7 +151,7 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 0, "", "", "", "" },
 		{ 51739, "inv_fabric_wool_02", "=q1=Little Ball of Spider Web", "=ds=#e15#", "100%" },
 	};
-	Turtlhu = {
+	--[[Turtlhu = {
 		{ 20633, "INV_Shoulder_29", "=q4=Unnatural Leather Spaulders", "=ds=#s3#, #a2#", "4.76%" },
 		{ 20631, "INV_Boots_Cloth_05", "=q4=Mendicant's Slippers", "=ds=#s12#, #a1#", "4.76%" },
 		{ 20634, "INV_Boots_08", "=q4=Boots of Fright", "=ds=#s12#, #a2#", "4.76%" },
@@ -179,7 +179,7 @@ AtlasLoot_Data["AtlasLootWBItems"] = {
 		{ 0, "", "", "", "" },
 		{ 50202, "INV_Egg_03", "=q3=Egg of Turtlhu", "=ds=#e15#", "100%" },
 		{ 50203, "INV_Enchant_Dustsoul", "=q2=Corrupted Sand", "=ds=#e12#", "100%" },
-	};
+	};]]
 	Ostarius = {
 		{ 83480, "inv_misc_book_07", "=q4=Tome of Infalliable Truth", "=ds=#h4#, #s15#", "17%" },
 		{ 83481, "inv_mace_08", "=q4=Failsafe Activation Key", "=ds=#h4#, #s15#", "17%" },