diff --git a/Addon/!mMT_MediaPack/!mMT_MediaPack.toc b/Addon/!mMT_MediaPack/!mMT_MediaPack.toc
index 8a0db557..439de98c 100644
--- a/Addon/!mMT_MediaPack/!mMT_MediaPack.toc
+++ b/Addon/!mMT_MediaPack/!mMT_MediaPack.toc
@@ -1,7 +1,7 @@
 ## Interface: 30403
 ## Author: Blinkii
-## Version: 1.24
-## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFFFF06A2M|r|CFFFF108Ce|r|CFFFF197Ad|r|CFFFF216Bi|r|CFFFF275Da|r |CFFFF3441P|r|CFFFF3F2Ca|r|CFFFF461Cc|r|CFFFF4E0Ck|r
+## Version: 1.25
+## Title: |CFF8308AEm|r|CFFCA07A7M|r|CFFFF06A2T -|r |CFFFF06A2M|r|CFFFF108Ce|r|CFFFF197Ad|r|CFFFF216Bi|r|CFFFF275Da|r |CFFFF3441P|r|CFFFF3F2Ca|r|CFFFF461Cc|r|CFFFF4E0Ck|r
 ## Notes: mMT Media Pack by Blinkii | Support: mMediaTag@gmx.de
 ## IconTexture: Interface\AddOns\!mMT_MediaPack\media\logo\mmt_icon
 ## SavedVariables: mMTSettings
diff --git a/Addon/!mMT_MediaPack/!mMT_MediaPack_Cata.toc b/Addon/!mMT_MediaPack/!mMT_MediaPack_Cata.toc
index 1977871e..7dcc3163 100644
--- a/Addon/!mMT_MediaPack/!mMT_MediaPack_Cata.toc
+++ b/Addon/!mMT_MediaPack/!mMT_MediaPack_Cata.toc
@@ -1,7 +1,7 @@
 ## Interface: 40400
 ## Author: Blinkii
-## Version: 1.24
-## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFFFF06A2M|r|CFFFF108Ce|r|CFFFF197Ad|r|CFFFF216Bi|r|CFFFF275Da|r |CFFFF3441P|r|CFFFF3F2Ca|r|CFFFF461Cc|r|CFFFF4E0Ck|r
+## Version: 1.25
+## Title: |CFF8308AEm|r|CFFCA07A7M|r|CFFFF06A2T -|r |CFFFF06A2M|r|CFFFF108Ce|r|CFFFF197Ad|r|CFFFF216Bi|r|CFFFF275Da|r |CFFFF3441P|r|CFFFF3F2Ca|r|CFFFF461Cc|r|CFFFF4E0Ck|r
 ## Notes: mMT Media Pack by Blinkii | Support: mMediaTag@gmx.de
 ## IconTexture: Interface\AddOns\!mMT_MediaPack\media\logo\mmt_icon
 ## SavedVariables: mMTSettings
diff --git a/Addon/!mMT_MediaPack/!mMT_MediaPack_Mainline.toc b/Addon/!mMT_MediaPack/!mMT_MediaPack_Mainline.toc
index 5e13cf96..3ad3d9b8 100644
--- a/Addon/!mMT_MediaPack/!mMT_MediaPack_Mainline.toc
+++ b/Addon/!mMT_MediaPack/!mMT_MediaPack_Mainline.toc
@@ -1,7 +1,7 @@
 ## Interface: 110002
 ## Author: Blinkii
-## Version: 1.24
-## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFFFF06A2M|r|CFFFF108Ce|r|CFFFF197Ad|r|CFFFF216Bi|r|CFFFF275Da|r |CFFFF3441P|r|CFFFF3F2Ca|r|CFFFF461Cc|r|CFFFF4E0Ck|r
+## Version: 1.25
+## Title: |CFF8308AEm|r|CFFCA07A7M|r|CFFFF06A2T -|r |CFFFF06A2M|r|CFFFF108Ce|r|CFFFF197Ad|r|CFFFF216Bi|r|CFFFF275Da|r |CFFFF3441P|r|CFFFF3F2Ca|r|CFFFF461Cc|r|CFFFF4E0Ck|r
 ## Notes: mMT Media Pack by Blinkii | Support: mMediaTag@gmx.de
 ## IconTexture: Interface\AddOns\!mMT_MediaPack\media\logo\mmt_icon
 ## SavedVariables: mMTSettings
diff --git a/Addon/!mMT_MediaPack/!mMT_MediaPack_Vanilla.toc b/Addon/!mMT_MediaPack/!mMT_MediaPack_Vanilla.toc
index 62904f8c..2fdb05d2 100644
--- a/Addon/!mMT_MediaPack/!mMT_MediaPack_Vanilla.toc
+++ b/Addon/!mMT_MediaPack/!mMT_MediaPack_Vanilla.toc
@@ -1,7 +1,7 @@
 ## Interface: 11504
 ## Author: Blinkii
-## Version: 1.24
-## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFFFF06A2M|r|CFFFF108Ce|r|CFFFF197Ad|r|CFFFF216Bi|r|CFFFF275Da|r |CFFFF3441P|r|CFFFF3F2Ca|r|CFFFF461Cc|r|CFFFF4E0Ck|r
+## Version: 1.25
+## Title: |CFF8308AEm|r|CFFCA07A7M|r|CFFFF06A2T -|r |CFFFF06A2M|r|CFFFF108Ce|r|CFFFF197Ad|r|CFFFF216Bi|r|CFFFF275Da|r |CFFFF3441P|r|CFFFF3F2Ca|r|CFFFF461Cc|r|CFFFF4E0Ck|r
 ## Notes: mMT Media Pack by Blinkii | Support: mMediaTag@gmx.de
 ## IconTexture: Interface\AddOns\!mMT_MediaPack\media\logo\mmt_icon
 ## SavedVariables: mMTSettings
diff --git a/Addon/!mMT_MediaPack/media/core.lua b/Addon/!mMT_MediaPack/media/core.lua
index bc02723c..1b7c058a 100644
--- a/Addon/!mMT_MediaPack/media/core.lua
+++ b/Addon/!mMT_MediaPack/media/core.lua
@@ -736,6 +736,17 @@ mAddFont("Montserrat-Medium", "Montserrat-Medium.ttf")
 mAddFont("Montserrat-Regular", "Montserrat-Regular.ttf")
 mAddFont("Montserrat-SemiBold", "Montserrat-SemiBold.ttf")
 
+mAddFont("Beep-Black", "Beep-Black.otf")
+mAddFont("Beep-Bold", "Beep-Bold.otf")
+mAddFont("Beep-Medium", "Beep-Medium.otf")
+mAddFont("Beep-Regular", "Beep-Regular.otf")
+
+mAddFont("RingLink-Bold", "RingLink-Bold.otf")
+mAddFont("RingLink-Medium", "RingLink-Medium.otf")
+
+mAddFont("SimplySans-Bold", "SimplySans-Bold.ttf")
+mAddFont("SimplySans-Book", "SimplySans-Book.ttf")
+
 mAddSound("mMT - Bewegen - weiblich", "bewegen_female.ogg")
 mAddSound("mMT - Unterbrechen - weiblich", "unterbrechen_female.ogg")
 mAddSound("mMT - Bewegen - mänlich", "bewegen_male.ogg")
diff --git a/Addon/!mMT_MediaPack/media/fonts/Beep-Black.otf b/Addon/!mMT_MediaPack/media/fonts/Beep-Black.otf
new file mode 100644
index 00000000..94ce2c52
Binary files /dev/null and b/Addon/!mMT_MediaPack/media/fonts/Beep-Black.otf differ
diff --git a/Addon/!mMT_MediaPack/media/fonts/Beep-Bold.otf b/Addon/!mMT_MediaPack/media/fonts/Beep-Bold.otf
new file mode 100644
index 00000000..cc20288f
Binary files /dev/null and b/Addon/!mMT_MediaPack/media/fonts/Beep-Bold.otf differ
diff --git a/Addon/!mMT_MediaPack/media/fonts/Beep-Medium.otf b/Addon/!mMT_MediaPack/media/fonts/Beep-Medium.otf
new file mode 100644
index 00000000..23600864
Binary files /dev/null and b/Addon/!mMT_MediaPack/media/fonts/Beep-Medium.otf differ
diff --git a/Addon/!mMT_MediaPack/media/fonts/Beep-Regular.otf b/Addon/!mMT_MediaPack/media/fonts/Beep-Regular.otf
new file mode 100644
index 00000000..15d55aa1
Binary files /dev/null and b/Addon/!mMT_MediaPack/media/fonts/Beep-Regular.otf differ
diff --git a/Addon/!mMT_MediaPack/media/fonts/RingLink-Bold.otf b/Addon/!mMT_MediaPack/media/fonts/RingLink-Bold.otf
new file mode 100644
index 00000000..8c84807e
Binary files /dev/null and b/Addon/!mMT_MediaPack/media/fonts/RingLink-Bold.otf differ
diff --git a/Addon/!mMT_MediaPack/media/fonts/RingLink-Medium.otf b/Addon/!mMT_MediaPack/media/fonts/RingLink-Medium.otf
new file mode 100644
index 00000000..a90f4602
Binary files /dev/null and b/Addon/!mMT_MediaPack/media/fonts/RingLink-Medium.otf differ
diff --git a/Addon/!mMT_MediaPack/media/fonts/SimplySans-Bold.ttf b/Addon/!mMT_MediaPack/media/fonts/SimplySans-Bold.ttf
new file mode 100644
index 00000000..3098a794
Binary files /dev/null and b/Addon/!mMT_MediaPack/media/fonts/SimplySans-Bold.ttf differ
diff --git a/Addon/!mMT_MediaPack/media/fonts/SimplySans-Book.ttf b/Addon/!mMT_MediaPack/media/fonts/SimplySans-Book.ttf
new file mode 100644
index 00000000..becb59a1
Binary files /dev/null and b/Addon/!mMT_MediaPack/media/fonts/SimplySans-Book.ttf differ
diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc
index f4aaf0fa..fd6687c2 100644
--- a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc
+++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc
@@ -1,7 +1,7 @@
 ## Interface: 30403
 ## Author: Blinkii
-## Version: 3.60
-## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r
+## Version: 3.61
+## Title: |CFF3650D5m|r|CFF4148C3M|r|CFF4743B6T -|r |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r
 ## Notes: mMediaTag & Tools is a plugin for ElvUI. mMediaTag adds many media files like textures/ fonts/ icons and some tools to ElvUI.
 ## Notes-deDE: mMediaTag & Tools ist ein Plugin für ElvUI. mMediaTag fügt viele Mediendateien wie Texturen/ Schriften/ Symbole und einige Tools zu ElvUI hinzu.
 ## IconTexture: Interface\AddOns\ElvUI_mMediaTag\media\logo\mmt_icon
diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc
index af20712a..0d17d94b 100644
--- a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc
+++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc
@@ -1,7 +1,7 @@
 ## Interface: 40400
 ## Author: Blinkii
-## Version: 3.60
-## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r
+## Version: 3.61
+## Title: |CFF3650D5m|r|CFF4148C3M|r|CFF4743B6T -|r |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r
 ## IconTexture: Interface\AddOns\ElvUI_mMediaTag\media\logo\mmt_icon
 ## AddonCompartmentFunc: ElvUI_mMediaTag_OnAddonCompartmentClick
 ## AddonCompartmentFuncOnEnter: ElvUI_mMediaTag_OnAddonCompartmentOnEnter
diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc
index 117f6941..5c00d44a 100644
--- a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc
+++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc
@@ -1,7 +1,7 @@
 ## Interface: 110002, 110005
 ## Author: Blinkii
-## Version: 3.60
-## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r
+## Version: 3.61
+## Title: |CFF3650D5m|r|CFF4148C3M|r|CFF4743B6T -|r |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r
 ## Notes: ElvUI Plugin from Blinkii | Support: mMediaTag@gmx.de
 ## IconTexture: Interface\AddOns\ElvUI_mMediaTag\media\logo\mmt_icon
 ## AddonCompartmentFunc: ElvUI_mMediaTag_OnAddonCompartmentClick
diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Vanilla.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Vanilla.toc
index c78d9c00..ae6c6738 100644
--- a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Vanilla.toc
+++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Vanilla.toc
@@ -1,7 +1,7 @@
 ## Interface: 11504
 ## Author: Blinkii
-## Version: 3.60
-## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r
+## Version: 3.61
+## Title: |CFF3650D5m|r|CFF4148C3M|r|CFF4743B6T -|r |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r
 ## Notes: mMediaTag & Tools is a plugin for ElvUI. mMediaTag adds many media files like textures/ fonts/ icons and some tools to ElvUI.
 ## Notes-deDE: mMediaTag & Tools ist ein Plugin für ElvUI. mMediaTag fügt viele Mediendateien wie Texturen/ Schriften/ Symbole und einige Tools zu ElvUI hinzu.
 ## IconTexture: Interface\AddOns\ElvUI_mMediaTag\media\logo\mmt_icon
diff --git a/Addon/ElvUI_mMediaTag/core/changelog/3.61.lua b/Addon/ElvUI_mMediaTag/core/changelog/3.61.lua
new file mode 100644
index 00000000..9b7241dd
--- /dev/null
+++ b/Addon/ElvUI_mMediaTag/core/changelog/3.61.lua
@@ -0,0 +1,23 @@
+mMT.Changelog[361]  = {
+	DATE = "13.10.2024",
+	NEW = {
+		"[MEDIA]: Fonts: Beep, RingLink, SimplySans.",
+		"[Minimap]: Add a function to Skin the Minimap.",
+		"[Minimap]: Add a function to change the aspect ratio of the Minimap.",
+		"[Role-Icons]: Three new (Tank/Heal/DD) Role Icons."
+	},
+	UPDATE = {
+		"[Datatext-Score]: Update rewards infos.",
+		"[Datatext-Teleports]: Update Dungeon Teleport IDs for Siege.",
+		"[Dock-LFG]: Update rewards infos.",
+		"[System]: Some minor code improvements."
+	},
+	FIX = {
+		"[Datatext-Durability]: Removed dev print.",
+		"[Datatext-Profession]: Fixed Cooking menu entry.",
+		"[Datatext-Profession]: Fixed toggle Profession window for Cata & Classic.",
+		"[Objectivetracker]: Possible fix for overlapping Blocks.",
+		"[Objectivetracker]: Prevent multiple hooks.",
+		"[Portraits]: Cata & Classic unsupported event."
+	 },
+}
diff --git a/Addon/ElvUI_mMediaTag/core/changelog/load_changelogs.xml b/Addon/ElvUI_mMediaTag/core/changelog/load_changelogs.xml
index 97a6682f..406508ad 100644
--- a/Addon/ElvUI_mMediaTag/core/changelog/load_changelogs.xml
+++ b/Addon/ElvUI_mMediaTag/core/changelog/load_changelogs.xml
@@ -15,4 +15,5 @@
     <Script file="3.58.lua"/>
     <Script file="3.59.lua"/>
     <Script file="3.60.lua"/>
+    <Script file="3.61.lua"/>
 </Ui>
diff --git a/Addon/ElvUI_mMediaTag/core/devmode.lua b/Addon/ElvUI_mMediaTag/core/devmode.lua
index f4745c43..565c4df1 100644
--- a/Addon/ElvUI_mMediaTag/core/devmode.lua
+++ b/Addon/ElvUI_mMediaTag/core/devmode.lua
@@ -15,58 +15,55 @@ end
 local function SaveZoneID()
 	local name, instanceType, difficultyID, difficultyName, maxPlayers, dynamicDifficulty, isDynamic, instanceID, instanceGroupSize, LfgDungeonID = GetInstanceInfo()
 	tinsert(mMT.DB.dev.zone, instanceID, { name = name, id = instanceID, type = instanceType, difficultyID = difficultyID, difficultyName = difficultyName })
-    mMT:Print("|CFFFFC900DEV:|r ", instanceID, name)
+	mMT:Print("|CFFFFC900DEV:|r ", instanceID, name)
 end
 
 function mMT:SaveFramePos()
-    mMT.DB.dev.frame.top =  mDevFrame:GetTop()
-    mMT.DB.dev.frame.left = mDevFrame:GetLeft()
+	if mDevFrame then
+		mMT.DB.dev.frame.top = mDevFrame:GetTop()
+		mMT.DB.dev.frame.left = mDevFrame:GetLeft()
+	end
 end
 
 local function SaveUnitID()
 	if UnitExists("target") and not UnitIsPlayer("target") then
-        local ZoneName, instanceType, difficultyID, difficultyName, maxPlayers, dynamicDifficulty, isDynamic, instanceID, instanceGroupSize, LfgDungeonID = GetInstanceInfo()
+		local ZoneName, instanceType, difficultyID, difficultyName, maxPlayers, dynamicDifficulty, isDynamic, instanceID, instanceGroupSize, LfgDungeonID = GetInstanceInfo()
 		local guid = UnitGUID("target")
 		local npcID = guid and select(6, strsplit("-", guid))
-        local name, realm = UnitName("target")
+		local name, realm = UnitName("target")
 		tinsert(mMT.DB.dev.unit, npcID or guid, { name = name, guid = guid, npcid = npcID, zone = ZoneName })
-        mMT:Print("|CFFFFC900DEV:|r ", npcID, name)
+		mMT:Print("|CFFFFC900DEV:|r ", npcID, name)
 	end
 end
 
 function mMT:DevTools()
-    if mMT.DevMode then
-        if not mDevFrame then
-            -- Create DEV Frame
-            mDevFrame = CreateFrame("Frame", "mMT_DevTools", E.UIParent, "BackdropTemplate")
-            mDevFrame:SetPoint("TOPLEFT", E.UIParent, "BOTTOMLEFT", mMT.DB.dev.frame.left or 0, mMT.DB.dev.frame.top or 0)
-            mDevFrame:CreateBackdrop("Transparent")
-            mDevFrame:SetMovable(true)
-            mDevFrame:EnableMouse(true)
-            mDevFrame:RegisterForDrag("LeftButton")
-            mDevFrame:SetScript("OnDragStart", mDevFrame.StartMoving)
-            mDevFrame:SetScript("OnDragStop", mDevFrame.StopMovingOrSizing)
-            mDevFrame:SetClampedToScreen(true)
-            mDevFrame:Size(76, 42)
-
-            -- Save Target Unit ID
-            mDevFrame.UnitID = CreateFrame("Button", "mMT_BTN_UnitID", mDevFrame)
-            setupButtons(mDevFrame.UnitID, "devunit")
-            mDevFrame.UnitID:Point("TOPLEFT", mDevFrame, "TOPLEFT", 5, -5)
-            mDevFrame.UnitID:SetScript("OnClick", SaveUnitID)
+	if mMT.DevMode then
+		if not mDevFrame then
+			-- Create DEV Frame
+			mDevFrame = CreateFrame("Frame", "mMT_DevTools", E.UIParent, "BackdropTemplate")
+			mDevFrame:SetPoint("TOPLEFT", E.UIParent, "BOTTOMLEFT", mMT.DB.dev.frame.left or 0, mMT.DB.dev.frame.top or 0)
+			mDevFrame:CreateBackdrop("Transparent")
+			mDevFrame:SetMovable(true)
+			mDevFrame:EnableMouse(true)
+			mDevFrame:RegisterForDrag("LeftButton")
+			mDevFrame:SetScript("OnDragStart", mDevFrame.StartMoving)
+			mDevFrame:SetScript("OnDragStop", mDevFrame.StopMovingOrSizing)
+			mDevFrame:SetClampedToScreen(true)
+			mDevFrame:Size(76, 42)
 
-            -- Save Zone ID
-            mDevFrame.ZoneID = CreateFrame("Button", "mMT_BTN_ZoneID", mDevFrame)
-            setupButtons(mDevFrame.ZoneID, "devzone")
-            mDevFrame.ZoneID:Point("LEFT", mDevFrame.UnitID, "RIGHT", 2, 0)
-            mDevFrame.ZoneID:SetScript("OnClick", SaveZoneID)
-        end
+			-- Save Target Unit ID
+			mDevFrame.UnitID = CreateFrame("Button", "mMT_BTN_UnitID", mDevFrame)
+			setupButtons(mDevFrame.UnitID, "devunit")
+			mDevFrame.UnitID:Point("TOPLEFT", mDevFrame, "TOPLEFT", 5, -5)
+			mDevFrame.UnitID:SetScript("OnClick", SaveUnitID)
 
-        if DevTool then
-            DevTool:AddData(mMT.DB.dev.zone, "Zone")
-            DevTool:AddData(mMT.DB.dev.unit, "Unit")
-        end
-    elseif mDevFrame then
-        mDevFrame:Hide()
-    end
+			-- Save Zone ID
+			mDevFrame.ZoneID = CreateFrame("Button", "mMT_BTN_ZoneID", mDevFrame)
+			setupButtons(mDevFrame.ZoneID, "devzone")
+			mDevFrame.ZoneID:Point("LEFT", mDevFrame.UnitID, "RIGHT", 2, 0)
+			mDevFrame.ZoneID:SetScript("OnClick", SaveZoneID)
+		end
+	elseif mDevFrame then
+		mDevFrame:Hide()
+	end
 end
diff --git a/Addon/ElvUI_mMediaTag/core/options/core.lua b/Addon/ElvUI_mMediaTag/core/options/core.lua
index 3969c6a9..680a3c6a 100644
--- a/Addon/ElvUI_mMediaTag/core/options/core.lua
+++ b/Addon/ElvUI_mMediaTag/core/options/core.lua
@@ -297,6 +297,12 @@ local function configTable()
 						childGroups = "tab",
 						args = {},
 					},
+					minimap = {
+						order = 9,
+						type = "group",
+						name = L["Minimap"],
+						args = {},
+					},
 					textures = {
 						order = 20,
 						type = "group",
diff --git a/Addon/ElvUI_mMediaTag/core/options/load_options.xml b/Addon/ElvUI_mMediaTag/core/options/load_options.xml
index cd10a965..b4c8d687 100644
--- a/Addon/ElvUI_mMediaTag/core/options/load_options.xml
+++ b/Addon/ElvUI_mMediaTag/core/options/load_options.xml
@@ -42,4 +42,5 @@
 	<Script file="tooltip.lua"/>
 	<Script file="uftextures.lua"/>
 	<Script file="unitframeicons.lua"/>
+	<Script file="minimap.lua"/>
 </Ui>
diff --git a/Addon/ElvUI_mMediaTag/core/options/minimap.lua b/Addon/ElvUI_mMediaTag/core/options/minimap.lua
new file mode 100644
index 00000000..2563aa62
--- /dev/null
+++ b/Addon/ElvUI_mMediaTag/core/options/minimap.lua
@@ -0,0 +1,388 @@
+local E = unpack(ElvUI)
+local L = mMT.Locales
+
+local tinsert = tinsert
+
+local aspectRatios = {
+	["3:2"] = "3:2",
+	["4:3"] = "4:3",
+	["16:8"] = "16:8",
+	["16:9"] = "16:9",
+	["16:10"] = "16:10",
+}
+
+local skins = {
+	circle = "circle",
+	drop = "drop",
+	drop_round = "drop round",
+	hexagon = "hexagon",
+	octagon = "octagon",
+	paralelogram = "paralelogram",
+	paralelogram_horizontal = "paralelogram horizontal",
+	zickzag = "zickzag",
+	antique = "antique",
+}
+
+local sizeString = ":16:16:0:0:64:64:4:60:4:60"
+
+local function configTable()
+	E.Options.args.mMT.args.cosmetic.args.minimap.args = {
+		aspectratio = {
+			order = 1,
+			type = "group",
+			inline = true,
+			name = L["Aspect ratio"],
+			disabled = function()
+				return E.db.mMT.minimapSkin.enable
+			end,
+			args = {
+				enable = {
+					order = 1,
+					type = "toggle",
+					name = L["Enable"],
+					get = function(info)
+						return E.db.mMT.minimapAspectRatio.enable
+					end,
+					set = function(info, value)
+						E.db.mMT.minimapAspectRatio.enable = value
+						E:StaticPopup_Show("CONFIG_RL")
+					end,
+				},
+				settings = {
+					order = 2,
+					type = "group",
+					inline = true,
+					name = L["Settings"],
+					disabled = function()
+						return not E.db.mMT.minimapAspectRatio.enable or E.db.mMT.minimapSkin.enable
+					end,
+					args = {
+						aspectratio = {
+							order = 2,
+							type = "select",
+							name = L["Aspect ratio"],
+							values = aspectRatios,
+							get = function(info)
+								return E.db.mMT.minimapAspectRatio.aspectRatio
+							end,
+							set = function(info, value)
+								E.db.mMT.minimapAspectRatio.aspectRatio = value
+								mMT.Modules.MinimapAspectRatio:Initialize()
+							end,
+						},
+					},
+				},
+			},
+		},
+		skin = {
+			order = 2,
+			type = "group",
+			inline = true,
+			name = L["Skin"],
+			args = {
+				enable = {
+					order = 1,
+					type = "toggle",
+					name = L["Enable"],
+					get = function(info)
+						return E.db.mMT.minimapSkin.enable
+					end,
+					set = function(info, value)
+						E.db.mMT.minimapSkin.enable = value
+						if value then E.db.mMT.minimapAspectRatio.enable = false end
+						E:StaticPopup_Show("CONFIG_RL")
+					end,
+				},
+				settings = {
+					order = 2,
+					type = "group",
+					inline = true,
+					name = L["Settings"],
+					disabled = function()
+						return not E.db.mMT.minimapSkin.enable
+					end,
+					args = {
+						skin = {
+							order = 1,
+							type = "select",
+							name = L["Style"],
+							values = skins,
+							get = function(info)
+								return E.db.mMT.minimapSkin.skin
+							end,
+							set = function(info, value)
+								E.db.mMT.minimapSkin.skin = value
+								mMT.Modules.MinimapSkin:Initialize()
+							end,
+						},
+						cardinal = {
+							order = 2,
+							type = "toggle",
+							name = L["Cardinal Points"],
+							get = function(info)
+								return E.db.mMT.minimapSkin.cardinal
+							end,
+							set = function(info, value)
+								E.db.mMT.minimapSkin.cardinal = value
+								mMT.Modules.MinimapSkin:Initialize()
+							end,
+						},
+						effect = {
+							order = 2,
+							type = "toggle",
+							name = L["Effect"],
+							get = function(info)
+								return E.db.mMT.minimapSkin.effect
+							end,
+							set = function(info, value)
+								E.db.mMT.minimapSkin.effect = value
+								mMT.Modules.MinimapSkin:Initialize()
+							end,
+						},
+					},
+				},
+				color = {
+					order = 3,
+					type = "group",
+					inline = true,
+					name = L["Color"],
+					disabled = function()
+						return not E.db.mMT.minimapSkin.enable
+					end,
+					args = {
+						texture = {
+							order = 1,
+							type = "group",
+							inline = true,
+							name = L["Texture"],
+							args = {
+								color = {
+									order = 1,
+									type = "color",
+									name = L["Color"],
+									hasAlpha = true,
+									get = function(info)
+										local t = E.db.mMT.minimapSkin.colors.texture.color
+										return t.r, t.g, t.b, t.a
+									end,
+									set = function(info, r, g, b, a)
+										local t = E.db.mMT.minimapSkin.colors.texture.color
+										t.r, t.g, t.b, t.a = r, g, b, a
+										mMT.Modules.MinimapSkin:Initialize()
+									end,
+								},
+								calss = {
+									order = 2,
+									type = "toggle",
+									name = L["Class colored"],
+									get = function(info)
+										return E.db.mMT.minimapSkin.colors.texture.class
+									end,
+									set = function(info, value)
+										E.db.mMT.minimapSkin.colors.texture.class = value
+										mMT.Modules.MinimapSkin:Initialize()
+									end,
+								},
+							},
+						},
+						cardinal = {
+							order = 2,
+							type = "group",
+							inline = true,
+							name = L["Cardinal Point"],
+							args = {
+								color = {
+									order = 1,
+									type = "color",
+									name = L["Color"],
+									hasAlpha = true,
+									get = function(info)
+										local t = E.db.mMT.minimapSkin.colors.cardinal.color
+										return t.r, t.g, t.b, t.a
+									end,
+									set = function(info, r, g, b, a)
+										local t = E.db.mMT.minimapSkin.colors.cardinal.color
+										t.r, t.g, t.b, t.a = r, g, b, a
+										mMT.Modules.MinimapSkin:Initialize()
+									end,
+								},
+								calss = {
+									order = 2,
+									type = "toggle",
+									name = L["Class colored"],
+									get = function(info)
+										return E.db.mMT.minimapSkin.colors.cardinal.class
+									end,
+									set = function(info, value)
+										E.db.mMT.minimapSkin.colors.cardinal.class = value
+										mMT.Modules.MinimapSkin:Initialize()
+									end,
+								},
+							},
+						},
+						extra = {
+							order = 2,
+							type = "group",
+							inline = true,
+							name = L["Effect"],
+							args = {
+								color = {
+									order = 1,
+									type = "color",
+									name = L["Color"],
+									hasAlpha = true,
+									get = function(info)
+										local t = E.db.mMT.minimapSkin.colors.extra.color
+										return t.r, t.g, t.b, t.a
+									end,
+									set = function(info, r, g, b, a)
+										local t = E.db.mMT.minimapSkin.colors.extra.color
+										t.r, t.g, t.b, t.a = r, g, b, a
+										mMT.Modules.MinimapSkin:Initialize()
+									end,
+								},
+								calss = {
+									order = 2,
+									type = "toggle",
+									name = L["Class colored"],
+									get = function(info)
+										return E.db.mMT.minimapSkin.colors.extra.class
+									end,
+									set = function(info, value)
+										E.db.mMT.minimapSkin.colors.extra.class = value
+										mMT.Modules.MinimapSkin:Initialize()
+									end,
+								},
+							},
+						},
+					},
+				},
+				custom = {
+					order = 4,
+					type = "group",
+					name = L["Custom Textures"],
+					inline = true,
+					args = {
+						toggle_enable = {
+							order = 1,
+							type = "toggle",
+							name = L["Enable Custom Textures"],
+							get = function(info)
+								return E.db.mMT.minimapSkin.custom.enable
+							end,
+							set = function(info, value)
+								E.db.mMT.minimapSkin.custom.enable = value
+								mMT.Modules.MinimapSkin:Initialize()
+							end,
+						},
+						spacer_texture1 = {
+							order = 2,
+							type = "description",
+							name = "\n\n",
+						},
+						desc_important = {
+							order = 3,
+							type = "description",
+							name = L["Info! To achieve an optimal result with the minimap, a texture should be set for the texture and mask.\nThe mask is always required and no minimap will be visible without it.\n\n"],
+						},
+
+						texture = {
+							order = 4,
+							desc = L["Texture"],
+							name = function()
+								if E.db.mMT.minimapSkin.custom.texture and (E.db.mMT.minimapSkin.custom.texture ~= "") then
+									return L["Texture"] .. "  > " .. E:TextureString(E.db.mMT.minimapSkin.custom.texture, sizeString)
+								else
+									return L["Texture"] .. "  > " .. L["No Texture found"]
+								end
+							end,
+							type = "input",
+							width = "smal",
+							disabled = function()
+								return not E.db.mMT.minimapSkin.custom.enable
+							end,
+							get = function(info)
+								return E.db.mMT.minimapSkin.custom.texture
+							end,
+							set = function(info, value)
+								E.db.mMT.minimapSkin.custom.texture = value
+								mMT.Modules.MinimapSkin:Initialize()
+							end,
+						},
+						mask = {
+							order = 5,
+							desc = L["Mask"],
+							name = function()
+								if E.db.mMT.minimapSkin.custom.mask and (E.db.mMT.minimapSkin.custom.mask ~= "") then
+									return L["Mask"] .. "  > " .. E:TextureString(E.db.mMT.minimapSkin.custom.mask, sizeString)
+								else
+									return L["Mask"] .. "  > " .. L["No Texture found"]
+								end
+							end,
+							type = "input",
+							width = "smal",
+							disabled = function()
+								return not E.db.mMT.minimapSkin.custom.enable
+							end,
+							get = function(info)
+								return E.db.mMT.minimapSkin.custom.mask
+							end,
+							set = function(info, value)
+								E.db.mMT.minimapSkin.custom.mask = value
+								mMT.Modules.MinimapSkin:Initialize()
+							end,
+						},
+						cardinal = {
+							order = 6,
+							desc = L["Cardinal Point"],
+							name = function()
+								if E.db.mMT.minimapSkin.custom.cardinal and (E.db.mMT.minimapSkin.custom.cardinal ~= "") then
+									return L["Cardinal Point"] .. "  > " .. E:TextureString(E.db.mMT.minimapSkin.custom.cardinal, sizeString)
+								else
+									return L["Cardinal Point"] .. "  > " .. L["No Texture found"]
+								end
+							end,
+							type = "input",
+							width = "smal",
+							disabled = function()
+								return not E.db.mMT.minimapSkin.custom.enable
+							end,
+							get = function(info)
+								return E.db.mMT.minimapSkin.custom.cardinal
+							end,
+							set = function(info, value)
+								E.db.mMT.minimapSkin.custom.cardinal = value
+								mMT.Modules.MinimapSkin:Initialize()
+							end,
+						},
+						effect = {
+							order = 7,
+							desc = L["Effect"],
+							name = function()
+								if E.db.mMT.minimapSkin.custom.extra and (E.db.mMT.minimapSkin.custom.extra ~= "") then
+									return L["Effect"] .. "  > " .. E:TextureString(E.db.mMT.minimapSkin.custom.extra, sizeString)
+								else
+									return L["Effect"] .. "  > " .. L["No Texture found"]
+								end
+							end,
+							type = "input",
+							width = "smal",
+							disabled = function()
+								return not E.db.mMT.minimapSkin.custom.enable
+							end,
+							get = function(info)
+								return E.db.mMT.minimapSkin.custom.extra
+							end,
+							set = function(info, value)
+								E.db.mMT.minimapSkin.custom.extra = value
+								mMT.Modules.MinimapSkin:Initialize()
+							end,
+						},
+					},
+				},
+			},
+		},
+	}
+end
+
+tinsert(mMT.Config, configTable)
diff --git a/Addon/ElvUI_mMediaTag/core/settings/defaultSettings.lua b/Addon/ElvUI_mMediaTag/core/settings/defaultSettings.lua
index 2965e4f7..ed65b57f 100644
--- a/Addon/ElvUI_mMediaTag/core/settings/defaultSettings.lua
+++ b/Addon/ElvUI_mMediaTag/core/settings/defaultSettings.lua
@@ -565,6 +565,28 @@ P.mMT = {
 		s = true,
 		t = true,
 	},
+	minimapAspectRatio = {
+		enable = false,
+		aspectRatio = "16:8",
+	},
+	minimapSkin = {
+		enable = false,
+		skin = "circle",
+		cardinal = true,
+		effect = true,
+		custom = {
+			enable = false,
+			texture = "",
+			cardinal = "",
+			mask = "",
+			extra = "",
+		},
+		colors = {
+			texture = { class = false, color = { r = 0.25, g = 0.25, b = 0.25, a = 1 } },
+			cardinal = { class = false, color = { r = 0.5, g = 0.5, b = 0.5, a = 1 } },
+			extra = { class = false, color = { r = 1, g = 1, b = 1, a = 0.6 } },
+		},
+	},
 	detailsEmbedded = {
 		chatEmbedded = "DISABLE",
 		windows = 2,
diff --git a/Addon/ElvUI_mMediaTag/init.lua b/Addon/ElvUI_mMediaTag/init.lua
index ee0d682b..ef4a7724 100644
--- a/Addon/ElvUI_mMediaTag/init.lua
+++ b/Addon/ElvUI_mMediaTag/init.lua
@@ -10,13 +10,13 @@ local IsAddOnLoaded = _G.C_AddOns and _G.C_AddOns.IsAddOnLoaded or IsAddOnLoaded
 
 -- Addon Name and Namespace
 local addonName, _ = ...
-mMT = E:NewModule(addonName, "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0", "AceConsole-3.0")
+mMT = E:NewModule(addonName, "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0", "AceConsole-3.0", "AceHook-3.0")
 
 -- Settings
 mMT.Version = GetAddOnMetadata(addonName, "Version")
 mMT.Name =
 	"|CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r"
-mMT.NameShort = "|CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r"
+mMT.NameShort = "|CFF3650D5m|r|CFF4148C3M|r|CFF4743B6T|r"
 mMT.DockString = "|CFF2CD204D|r|CFF1BE43Ao|r|CFF10EE5Cc|r|CFF05FA82k|r"
 mMT.DatatextString = "|CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r-Datatexts"
 mMT.Icon = "|TInterface\\Addons\\ElvUI_mMediaTag\\media\\logo\\mmt_icon_round.tga:14:14|t"
@@ -51,6 +51,8 @@ mMT.Modules.CosmeticBars = {}
 mMT.Modules.ObjectiveTracker = {}
 mMT.Modules.CustomUFTextures = {}
 mMT.Modules.CustomBGTextures = {}
+mMT.Modules.MinimapAspectRatio = {}
+mMT.Modules.MinimapSkin = {}
 --mMT.Modules.CustomClassColors = {}
 
 local L = mMT.Locales
@@ -144,6 +146,9 @@ local function EnableModules()
 		mMT.Modules.ObjectiveTracker.enable = E.db.mMT.objectivetracker.enable and (E.private.skins.blizzard.enable and E.private.skins.blizzard.objectiveTracker) and not IsAddOnLoaded("!KalielsTracker")
 		mMT.Modules.InterruptOnCD.enable = E.db.mMT.interruptoncd.enable
 	end
+
+	mMT.Modules.MinimapAspectRatio.enable = (not E.db.mMT.minimapSkin.enable) and E.db.mMT.minimapAspectRatio.enable
+	mMT.Modules.MinimapSkin.enable = E.db.mMT.minimapSkin.enable
 end
 
 local function UpdateModules()
diff --git a/Addon/ElvUI_mMediaTag/localization/deDE.lua b/Addon/ElvUI_mMediaTag/localization/deDE.lua
index 8ec56893..3cfe85c6 100644
--- a/Addon/ElvUI_mMediaTag/localization/deDE.lua
+++ b/Addon/ElvUI_mMediaTag/localization/deDE.lua
@@ -801,4 +801,10 @@ L["|cFFffffffShift + Right Click:|r Select Output Audio Device"] = "|cFFffffffSh
 L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = "|cffFFFFFFStrg + Linksklick:|r Auslastung Loadout"
 L["|cffFFFFFFLeft Click:|r Change Talent Specialization"] = "|cffFFFFFFLinks Klick:|r Talent Spezialisierung ändern"
 L["|cffFFFFFFRight Click:|r Change Loot Specialization"] = "|cffFFFFFFRechtsklick:|r Beutespezialisierung ändern"
-L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = "|cffFFFFFFShift + Links Klick:|r Zeige Talent Spezialisierungs Interface"
\ No newline at end of file
+L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = "|cffFFFFFFShift + Links Klick:|r Zeige Talent Spezialisierungs Interface"
+
+-- new
+L["Aspect ratio"] = true
+L["Effect"] = true
+L["Cardinal Point"] = true
+L["Info! To achieve an optimal result with the minimap, a texture should be set for the texture and mask.\nThe mask is always required and no minimap will be visible without it.\n\n"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/enUS.lua b/Addon/ElvUI_mMediaTag/localization/enUS.lua
index f37ed2a9..15096f7a 100644
--- a/Addon/ElvUI_mMediaTag/localization/enUS.lua
+++ b/Addon/ElvUI_mMediaTag/localization/enUS.lua
@@ -803,3 +803,9 @@ L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = true
 L["|cffFFFFFFLeft Click:|r Change Talent Specialization"] = true
 L["|cffFFFFFFRight Click:|r Change Loot Specialization"] = true
 L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
+
+-- new
+L["Aspect ratio"] = true
+L["Effect"] = true
+L["Cardinal Point"] = true
+L["Info! To achieve an optimal result with the minimap, a texture should be set for the texture and mask.\nThe mask is always required and no minimap will be visible without it.\n\n"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/esMX.lua b/Addon/ElvUI_mMediaTag/localization/esMX.lua
index b8b85c72..b0c61bd1 100644
--- a/Addon/ElvUI_mMediaTag/localization/esMX.lua
+++ b/Addon/ElvUI_mMediaTag/localization/esMX.lua
@@ -801,4 +801,10 @@ L["|cFFffffffShift + Right Click:|r Select Output Audio Device"] = true
 L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = true
 L["|cffFFFFFFLeft Click:|r Change Talent Specialization"] = true
 L["|cffFFFFFFRight Click:|r Change Loot Specialization"] = true
-L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
\ No newline at end of file
+L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
+
+-- new
+L["Aspect ratio"] = true
+L["Effect"] = true
+L["Cardinal Point"] = true
+L["Info! To achieve an optimal result with the minimap, a texture should be set for the texture and mask.\nThe mask is always required and no minimap will be visible without it.\n\n"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/frFR.lua b/Addon/ElvUI_mMediaTag/localization/frFR.lua
index a4533a7a..85c5bb16 100644
--- a/Addon/ElvUI_mMediaTag/localization/frFR.lua
+++ b/Addon/ElvUI_mMediaTag/localization/frFR.lua
@@ -800,4 +800,10 @@ L["|cFFffffffShift + Right Click:|r Select Output Audio Device"] = true
 L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = true
 L["|cffFFFFFFLeft Click:|r Change Talent Specialization"] = true
 L["|cffFFFFFFRight Click:|r Change Loot Specialization"] = true
-L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
\ No newline at end of file
+L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
+
+-- new
+L["Aspect ratio"] = true
+L["Effect"] = true
+L["Cardinal Point"] = true
+L["Info! To achieve an optimal result with the minimap, a texture should be set for the texture and mask.\nThe mask is always required and no minimap will be visible without it.\n\n"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/itIT.lua b/Addon/ElvUI_mMediaTag/localization/itIT.lua
index 88a8364f..2a4cf024 100644
--- a/Addon/ElvUI_mMediaTag/localization/itIT.lua
+++ b/Addon/ElvUI_mMediaTag/localization/itIT.lua
@@ -801,4 +801,10 @@ L["|cFFffffffShift + Right Click:|r Select Output Audio Device"] = true
 L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = true
 L["|cffFFFFFFLeft Click:|r Change Talent Specialization"] = true
 L["|cffFFFFFFRight Click:|r Change Loot Specialization"] = true
-L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
\ No newline at end of file
+L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
+
+-- new
+L["Aspect ratio"] = true
+L["Effect"] = true
+L["Cardinal Point"] = true
+L["Info! To achieve an optimal result with the minimap, a texture should be set for the texture and mask.\nThe mask is always required and no minimap will be visible without it.\n\n"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/koKR.lua b/Addon/ElvUI_mMediaTag/localization/koKR.lua
index 0d7ec41a..8c46f331 100644
--- a/Addon/ElvUI_mMediaTag/localization/koKR.lua
+++ b/Addon/ElvUI_mMediaTag/localization/koKR.lua
@@ -801,4 +801,10 @@ L["|cFFffffffShift + Right Click:|r Select Output Audio Device"] = true
 L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = true
 L["|cffFFFFFFLeft Click:|r Change Talent Specialization"] = true
 L["|cffFFFFFFRight Click:|r Change Loot Specialization"] = true
-L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
\ No newline at end of file
+L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
+
+-- new
+L["Aspect ratio"] = true
+L["Effect"] = true
+L["Cardinal Point"] = true
+L["Info! To achieve an optimal result with the minimap, a texture should be set for the texture and mask.\nThe mask is always required and no minimap will be visible without it.\n\n"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/ptBR.lua b/Addon/ElvUI_mMediaTag/localization/ptBR.lua
index 7c702ab7..8064df71 100644
--- a/Addon/ElvUI_mMediaTag/localization/ptBR.lua
+++ b/Addon/ElvUI_mMediaTag/localization/ptBR.lua
@@ -801,4 +801,10 @@ L["|cFFffffffShift + Right Click:|r Select Output Audio Device"] = true
 L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = true
 L["|cffFFFFFFLeft Click:|r Change Talent Specialization"] = true
 L["|cffFFFFFFRight Click:|r Change Loot Specialization"] = true
-L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
\ No newline at end of file
+L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
+
+-- new
+L["Aspect ratio"] = true
+L["Effect"] = true
+L["Cardinal Point"] = true
+L["Info! To achieve an optimal result with the minimap, a texture should be set for the texture and mask.\nThe mask is always required and no minimap will be visible without it.\n\n"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/ruRU.lua b/Addon/ElvUI_mMediaTag/localization/ruRU.lua
index 786b395a..9e563dbe 100644
--- a/Addon/ElvUI_mMediaTag/localization/ruRU.lua
+++ b/Addon/ElvUI_mMediaTag/localization/ruRU.lua
@@ -801,4 +801,10 @@ L["|cFFffffffShift + Right Click:|r Select Output Audio Device"] = true
 L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = true
 L["|cffFFFFFFLeft Click:|r Change Talent Specialization"] = true
 L["|cffFFFFFFRight Click:|r Change Loot Specialization"] = true
-L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
\ No newline at end of file
+L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
+
+-- new
+L["Aspect ratio"] = true
+L["Effect"] = true
+L["Cardinal Point"] = true
+L["Info! To achieve an optimal result with the minimap, a texture should be set for the texture and mask.\nThe mask is always required and no minimap will be visible without it.\n\n"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/zhCN.lua b/Addon/ElvUI_mMediaTag/localization/zhCN.lua
index 14d7a6a1..a6949c0f 100644
--- a/Addon/ElvUI_mMediaTag/localization/zhCN.lua
+++ b/Addon/ElvUI_mMediaTag/localization/zhCN.lua
@@ -801,4 +801,10 @@ L["|cFFffffffShift + Right Click:|r Select Output Audio Device"] = true
 L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = true
 L["|cffFFFFFFLeft Click:|r Change Talent Specialization"] = true
 L["|cffFFFFFFRight Click:|r Change Loot Specialization"] = true
-L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
\ No newline at end of file
+L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
+
+-- new
+L["Aspect ratio"] = true
+L["Effect"] = true
+L["Cardinal Point"] = true
+L["Info! To achieve an optimal result with the minimap, a texture should be set for the texture and mask.\nThe mask is always required and no minimap will be visible without it.\n\n"] = true
diff --git a/Addon/ElvUI_mMediaTag/localization/zhTW.lua b/Addon/ElvUI_mMediaTag/localization/zhTW.lua
index eca98046..17f3e5f1 100644
--- a/Addon/ElvUI_mMediaTag/localization/zhTW.lua
+++ b/Addon/ElvUI_mMediaTag/localization/zhTW.lua
@@ -801,4 +801,10 @@ L["|cFFffffffShift + Right Click:|r Select Output Audio Device"] = true
 L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = true
 L["|cffFFFFFFLeft Click:|r Change Talent Specialization"] = true
 L["|cffFFFFFFRight Click:|r Change Loot Specialization"] = true
-L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
\ No newline at end of file
+L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = true
+
+-- new
+L["Aspect ratio"] = true
+L["Effect"] = true
+L["Cardinal Point"] = true
+L["Info! To achieve an optimal result with the minimap, a texture should be set for the texture and mask.\nThe mask is always required and no minimap will be visible without it.\n\n"] = true
diff --git a/Addon/ElvUI_mMediaTag/media/icons.lua b/Addon/ElvUI_mMediaTag/media/icons.lua
index 3af440c2..3cff2833 100644
--- a/Addon/ElvUI_mMediaTag/media/icons.lua
+++ b/Addon/ElvUI_mMediaTag/media/icons.lua
@@ -997,6 +997,10 @@ mMT.Media.Role = {
 	SWORDOUT6 = "Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\role\\swordoutline6.tga",
 	SWORDOUT7 = "Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\role\\swordoutline7.tga",
 
+	TANK = "Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\role\\tank.tga",
+	HEAL = "Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\role\\heal.tga",
+	DD = "Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\role\\dd.tga",
+
 	STICKERSHIELD01 = "Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\role\\stickershield01.tga",
 	STICKERSHIELD02 = "Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\role\\stickershield02.tga",
 	STICKERSHIELD03 = "Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\role\\stickershield03.tga",
diff --git a/Addon/ElvUI_mMediaTag/media/icons/role/dd.tga b/Addon/ElvUI_mMediaTag/media/icons/role/dd.tga
new file mode 100644
index 00000000..7b6eda3a
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/icons/role/dd.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/icons/role/heal.tga b/Addon/ElvUI_mMediaTag/media/icons/role/heal.tga
new file mode 100644
index 00000000..39cbdfa4
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/icons/role/heal.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/icons/role/tank.tga b/Addon/ElvUI_mMediaTag/media/icons/role/tank.tga
new file mode 100644
index 00000000..133045bf
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/icons/role/tank.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/16-10.tga b/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/16-10.tga
new file mode 100644
index 00000000..1ec8ab24
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/16-10.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/16-8.tga b/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/16-8.tga
new file mode 100644
index 00000000..f2bb2794
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/16-8.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/16-9.tga b/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/16-9.tga
new file mode 100644
index 00000000..6513a150
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/16-9.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/3-2.tga b/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/3-2.tga
new file mode 100644
index 00000000..51ba8119
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/3-2.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/4-3.tga b/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/4-3.tga
new file mode 100644
index 00000000..be1009c2
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/aspectratio/4-3.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin.pdn b/Addon/ElvUI_mMediaTag/media/minimap/skin.pdn
new file mode 100644
index 00000000..d92dd54f
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin.pdn differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/antique.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/antique.tga
new file mode 100644
index 00000000..2cb23187
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/antique.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/antique_extra.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/antique_extra.tga
new file mode 100644
index 00000000..81c65fde
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/antique_extra.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/antique_mask.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/antique_mask.tga
new file mode 100644
index 00000000..036f0a27
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/antique_mask.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/cardinal_a.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/cardinal_a.tga
new file mode 100644
index 00000000..e8edac9b
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/cardinal_a.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/circle.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/circle.tga
new file mode 100644
index 00000000..98c53b6f
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/circle.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/circle_cardinal.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/circle_cardinal.tga
new file mode 100644
index 00000000..b9e7c7fa
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/circle_cardinal.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/circle_mask.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/circle_mask.tga
new file mode 100644
index 00000000..118ea4f2
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/circle_mask.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/drop.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/drop.tga
new file mode 100644
index 00000000..74c754ce
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/drop.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/drop_extra.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/drop_extra.tga
new file mode 100644
index 00000000..dd4d0a90
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/drop_extra.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/drop_mask.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/drop_mask.tga
new file mode 100644
index 00000000..d6bd9881
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/drop_mask.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/drop_round.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/drop_round.tga
new file mode 100644
index 00000000..e0d13c0b
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/drop_round.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/drop_round_mask.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/drop_round_mask.tga
new file mode 100644
index 00000000..af8c115d
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/drop_round_mask.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/hexagon.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/hexagon.tga
new file mode 100644
index 00000000..333eb2d2
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/hexagon.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/hexagon_mask.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/hexagon_mask.tga
new file mode 100644
index 00000000..2abb8e8a
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/hexagon_mask.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/octagon.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/octagon.tga
new file mode 100644
index 00000000..c7521215
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/octagon.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/octagon_mask.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/octagon_mask.tga
new file mode 100644
index 00000000..16aa3756
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/octagon_mask.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram.tga
new file mode 100644
index 00000000..55a4baa2
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_cardinal.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_cardinal.tga
new file mode 100644
index 00000000..d9e5bdeb
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_cardinal.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_horizontal.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_horizontal.tga
new file mode 100644
index 00000000..d4225c68
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_horizontal.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_horizontal_cardinal.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_horizontal_cardinal.tga
new file mode 100644
index 00000000..ed88aeea
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_horizontal_cardinal.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_horizontal_mask.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_horizontal_mask.tga
new file mode 100644
index 00000000..23523c9a
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_horizontal_mask.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_mask.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_mask.tga
new file mode 100644
index 00000000..6682da31
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/paralelogram_mask.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/zickzag.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/zickzag.tga
new file mode 100644
index 00000000..4590013c
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/zickzag.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/zickzag_cardinal.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/zickzag_cardinal.tga
new file mode 100644
index 00000000..c20d1efe
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/zickzag_cardinal.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/zickzag_extra.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/zickzag_extra.tga
new file mode 100644
index 00000000..245a6982
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/zickzag_extra.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/minimap/skin/zickzag_mask.tga b/Addon/ElvUI_mMediaTag/media/minimap/skin/zickzag_mask.tga
new file mode 100644
index 00000000..98b303b5
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/minimap/skin/zickzag_mask.tga differ
diff --git a/Addon/ElvUI_mMediaTag/modules/Dock/mLFDTool.lua b/Addon/ElvUI_mMediaTag/modules/Dock/mLFDTool.lua
index dc77027c..8e79d596 100644
--- a/Addon/ElvUI_mMediaTag/modules/Dock/mLFDTool.lua
+++ b/Addon/ElvUI_mMediaTag/modules/Dock/mLFDTool.lua
@@ -110,62 +110,40 @@ local function mLFDTooltip()
 	local _, hc, myth, mythp, other, title, tip = mMT:mColorDatatext()
 	local isMaxLevel = E:XPIsLevelMax()
 
-	mInstanceInfoText = mMT:InstanceInfo()
-	if mInstanceInfoText then
-		DT.tooltip:AddLine(" ")
-		for i = 1, #mInstanceInfoText do
-			DT.tooltip:AddLine(mInstanceInfoText[i])
-		end
-	end
-
-	if E.Retail and E.db.mMT.dockdatatext.lfd.keystone and isMaxLevel then
-		keyText = mMT:OwenKeystone()
-		if keyText then
+	local function addLines(lines)
+		if lines then
 			DT.tooltip:AddLine(" ")
-			for i = 1, #keyText do
-				DT.tooltip:AddLine(keyText[i])
+			for _, line in ipairs(lines) do
+				DT.tooltip:AddLine(line)
 			end
 		end
 	end
 
-	if E.Retail and E.db.mMT.dockdatatext.lfd.score and isMaxLevel then
-		DT.tooltip:AddLine(" ")
-		DT.tooltip:AddDoubleLine(DUNGEON_SCORE, mMT:GetDungeonScore())
-	end
+	addLines(mMT:InstanceInfo())
 
-	if E.Retail and E.db.mMT.dockdatatext.lfd.affix then
-		mAffixesText = mMT:WeeklyAffixes()
-		if mAffixesText then
-			DT.tooltip:AddLine(" ")
-			for i = 1, #mAffixesText do
-				DT.tooltip:AddLine(mAffixesText[i])
-			end
-		end
-	end
+	if E.Retail and isMaxLevel then
+		if E.db.mMT.dockdatatext.lfd.keystone then addLines(mMT:OwenKeystone()) end
 
-	if E.Retail and E.db.mMT.dockdatatext.lfd.greatvault and isMaxLevel then
-		local vaultinfohighest, ok = nil, false
-		vaultinforaidText, vaultinfomplusText, vaultinfopvpText, vaultinfohighest, ok = mMT:mGetVaultInfo()
-		if ok then
+		if E.db.mMT.dockdatatext.lfd.score then
 			DT.tooltip:AddLine(" ")
-			DT.tooltip:AddLine(format("%s%s|r", title, GREAT_VAULT_REWARDS))
-
-			if vaultinfohighest then DT.tooltip:AddDoubleLine(format("%s%s|r", other, L["Actual reward:"]), vaultinfohighest or "-") end
+			DT.tooltip:AddDoubleLine(DUNGEON_SCORE, mMT:GetDungeonScore())
+		end
 
-			local vaultInfoTexts = {
-				{ vaultinforaidText, "Raid", myth },
-				{ vaultinfomplusText, "Myth+", mythp },
-				{ vaultinfopvpText, "PvP", hc },
-			}
+		if E.db.mMT.dockdatatext.lfd.affix then addLines(mMT:WeeklyAffixes()) end
 
-			for _, info in ipairs(vaultInfoTexts) do
-				local text, label, color = unpack(info)
-				if text[1] then DT.tooltip:AddDoubleLine(format("%s%s|r", color, label), table.concat({ text[1] or "-", text[2] or "-", text[3] or "-" }, ", ")) end
+		if E.db.mMT.dockdatatext.lfd.greatvault then
+			local rewards = mMT:mGetVaultInfo()
+			if rewards then
+				DT.tooltip:AddLine(" ")
+				DT.tooltip:AddLine(format("%s%s|r", title, GREAT_VAULT_REWARDS))
+				DT.tooltip:AddDoubleLine(rewards.raid.name, table.concat(rewards.raid.rewards, WrapTextInColorCode(" - ", "FFFFFFFF")))
+				DT.tooltip:AddDoubleLine(rewards.dungeons.name, table.concat(rewards.dungeons.rewards, WrapTextInColorCode(" - ", "FFFFFFFF")))
+				DT.tooltip:AddDoubleLine(rewards.world.name, table.concat(rewards.world.rewards, WrapTextInColorCode(" - ", "FFFFFFFF")))
+			end
+			if C_WeeklyRewards.HasAvailableRewards() then
+				DT.tooltip:AddLine(" ")
+				DT.tooltip:AddLine(format("%s%s|r", title, GREAT_VAULT_REWARDS_WAITING))
 			end
-		end
-		if C_WeeklyRewards.HasAvailableRewards() then
-			DT.tooltip:AddLine(" ")
-			DT.tooltip:AddLine(format("%s%s|r", title, GREAT_VAULT_REWARDS_WAITING))
 		end
 	end
 
diff --git a/Addon/ElvUI_mMediaTag/modules/all/functions.lua b/Addon/ElvUI_mMediaTag/modules/all/functions.lua
index 35682564..31cbfe63 100644
--- a/Addon/ElvUI_mMediaTag/modules/all/functions.lua
+++ b/Addon/ElvUI_mMediaTag/modules/all/functions.lua
@@ -47,9 +47,7 @@ function mMT:GetDurabilityInfo()
 			local perc, repairCost = (currentDura / maxDura) * 100, 0
 			invDurability[index] = perc
 
-			if perc < totalDurability then
-				totalDurability = perc
-			end
+			if perc < totalDurability then totalDurability = perc end
 
 			if E.Retail and E.ScanTooltip.GetTooltipData then
 				E.ScanTooltip:SetInventoryItem("player", index)
@@ -117,9 +115,7 @@ function mMT:GetCurrenciesInfo(tbl, item)
 				tbl.info.link = mMT:mCurrencyLink(tbl.info.id)
 				tbl.info.count = info.quantity
 				tbl.loaded = true
-				if not tbl.fragment and info.maxQuantity then
-					tbl.info.cap = info.maxQuantity
-				end
+				if not tbl.fragment and info.maxQuantity then tbl.info.cap = info.maxQuantity end
 			end
 		end
 
@@ -200,9 +196,7 @@ local function getProfSkill(skillLevel, maxSkillLevel, skillModifier)
 	local sm = nil
 	local colorTip = E.db.mMT.datatextcolors.colorother.hex
 
-	if skillModifier ~= 0 then
-		sm = format(" %s+%s|r", "|CFF68FF00", skillModifier)
-	end
+	if skillModifier ~= 0 then sm = format(" %s+%s|r", "|CFF68FF00", skillModifier) end
 
 	if skillLevel == maxSkillLevel then
 		text = format("%s[|r%s%s|r%s%s]|r", colorTip, "|CFF3AFF00", skillLevel, sm or "", colorTip)
@@ -245,13 +239,9 @@ local function BuildProfTable()
 	if not prof1 and prof2 then
 		tbl.nomain = true
 	else
-		if prof1 then
-			tinsert(tbl.main, 1, GetProfInfo(prof1))
-		end
+		if prof1 then tinsert(tbl.main, 1, GetProfInfo(prof1)) end
 
-		if prof2 then
-			tinsert(tbl.main, 2, GetProfInfo(prof2))
-		end
+		if prof2 then tinsert(tbl.main, 2, GetProfInfo(prof2)) end
 
 		tbl.nomain = false
 	end
@@ -259,13 +249,9 @@ local function BuildProfTable()
 	if not arch and not fish and not cook and not firstaid then
 		tbl.nosecondary = true
 	else
-		if arch then
-			tinsert(tbl.secondary, 1, GetProfInfo(arch))
-		end
+		if arch then tinsert(tbl.secondary, 1, GetProfInfo(arch)) end
 
-		if fish then
-			tinsert(tbl.secondary, 2, GetProfInfo(fish))
-		end
+		if fish then tinsert(tbl.secondary, 2, GetProfInfo(fish)) end
 
 		if cook then
 			tinsert(tbl.secondary, 3, GetProfInfo(cook))
@@ -273,7 +259,7 @@ local function BuildProfTable()
 		end
 
 		if firstaid then
-			tinsert(tbl.secondary, 3, GetProfInfo(firstaid))
+			tinsert(tbl.secondary, 4, GetProfInfo(firstaid))
 			tbl.firstaid = true
 		end
 
@@ -309,10 +295,12 @@ end
 
 local function GetFireCD()
 	local start, duration
-	if C_Spell then
+	if not E.Cata and C_Spell then
 		local spellCooldownInfo = GetSpellCooldown(818)
-		start = spellCooldownInfo.startTime
-		duration = spellCooldownInfo.duration
+		if spellCooldownInfo then
+			start = spellCooldownInfo.startTime
+			duration = spellCooldownInfo.duration
+		end
 	else
 		start, duration = GetSpellCooldown(818)
 	end
@@ -327,7 +315,7 @@ local function GetFireCD()
 	end
 end
 
-function mMT:GetProfessions(tooltip)
+function mMT:GetProfessionsd(tooltip)
 	local MenuTable = {}
 	local ProfTable = BuildProfTable()
 	local textA = ""
@@ -363,12 +351,26 @@ function mMT:GetProfessions(tooltip)
 			InsertInTable(MenuTable, "", nil, true)
 			textA = E.db.mMT.datatextcolors.colortitle.hex .. L["Others"] .. "|r"
 			InsertInTable(MenuTable, textA, nil, true)
-			tinsert(MenuTable, { text = format("|T%s:14:14:0:0:64:64:5:59:5:59|t %s", "136241", TRADE_SKILLS), color = "|CFFBC26E5", isTitle = false, func = function() ToggleProfessionsBook() end })
+			if E.Retail then
+				tinsert(MenuTable, {
+					text = format("|T%s:14:14:0:0:64:64:5:59:5:59|t %s", "136241", TRADE_SKILLS),
+					color = "|CFFBC26E5",
+					isTitle = false,
+					func = function()
+						_G.ToggleProfessionsBook()
+					end,
+				})
+			else
+				tinsert(
+					MenuTable,
+					{ text = format("|T%s:14:14:0:0:64:64:5:59:5:59|t %s", "136241", TRADE_SKILLS), color = "|CFFBC26E5", isTitle = false, macro = "/click SpellbookMicroButton\n/click SpellBookFrameTabButton2" }
+				)
+			end
 
 			if ProfTable.cook and IsSpellKnown(818) then
 				local texture = GetSpellTexture(818)
 				local spellInfo = GetSpellInfo(818)
-				local name = spellInfo.name or ""
+				local name = spellInfo.name or spellInfo or ""
 				tinsert(MenuTable, {
 					text = format("|T%s:14:14:0:0:64:64:5:59:5:59|t %s", texture, name),
 					SecondText = GetFireCD(),
@@ -381,3 +383,57 @@ function mMT:GetProfessions(tooltip)
 		return MenuTable
 	end
 end
+
+function mMT:GetProfessions(tooltip)
+	local MenuTable = {}
+	local ProfTable = BuildProfTable()
+	local textA = ""
+
+	local function InsertProfessions(profType, title, noProfText)
+		if ProfTable[profType] then
+			textA = E.db.mMT.datatextcolors.colortitle.hex .. L[title] .. "|r"
+			InsertInTable(MenuTable, textA, nil, true)
+			for _, prof in pairs(ProfTable[profType]) do
+				InsertInTable(MenuTable, prof.name, prof.skill, false, prof.icon, prof.color, prof.spell)
+			end
+			InsertInTable(MenuTable, "", nil, true)
+		else
+			textA = "|CFFE74C3C" .. L[noProfText] .. "|r"
+			InsertInTable(MenuTable, textA, nil, true)
+		end
+	end
+
+	if not ProfTable.nomain or not ProfTable.nosecondary then
+		InsertProfessions("main", "Main Professions", "No Main Professions")
+		InsertProfessions("secondary", "Secondary Professions", "No Secondary Professions")
+
+		if not tooltip then
+			textA = E.db.mMT.datatextcolors.colortitle.hex .. L["Others"] .. "|r"
+			InsertInTable(MenuTable, textA, nil, true)
+			local tradeSkillsText = format("|T%s:14:14:0:0:64:64:5:59:5:59|t %s", "136241", TRADE_SKILLS)
+			local tradeSkillsEntry = {
+				text = tradeSkillsText,
+				color = "|CFFBC26E5",
+				isTitle = false,
+				func = E.Retail and _G.ToggleProfessionsBook or nil,
+				macro = not E.Retail and "/click SpellbookMicroButton\n/click SpellBookFrameTabButton2" or nil
+			}
+			tinsert(MenuTable, tradeSkillsEntry)
+
+			if ProfTable.cook and IsSpellKnown(818) then
+				local texture = GetSpellTexture(818)
+				local spellInfo = GetSpellInfo(818)
+				local name = spellInfo.name or spellInfo or ""
+				tinsert(MenuTable, {
+					text = format("|T%s:14:14:0:0:64:64:5:59:5:59|t %s", texture, name),
+					SecondText = GetFireCD(),
+					color = "|CFFFF9B00",
+					isTitle = false,
+					macro = "/cast " .. name,
+				})
+			end
+		end
+	end
+
+	return MenuTable
+end
diff --git a/Addon/ElvUI_mMediaTag/modules/datatexts/Score.lua b/Addon/ElvUI_mMediaTag/modules/datatexts/Score.lua
index 0db22e95..88d37468 100644
--- a/Addon/ElvUI_mMediaTag/modules/datatexts/Score.lua
+++ b/Addon/ElvUI_mMediaTag/modules/datatexts/Score.lua
@@ -14,9 +14,7 @@ local C_MythicPlus_GetOwnedKeystoneChallengeMapID = C_MythicPlus.GetOwnedKeyston
 local C_MythicPlus_GetOwnedKeystoneLevel = C_MythicPlus.GetOwnedKeystoneLevel
 local C_MythicPlus_RequestCurrentAffixes = C_MythicPlus.RequestCurrentAffixes
 local C_MythicPlus_RequestMapInfo = C_MythicPlus.RequestMapInfo
-local C_MythicPlus_RequestRewards = C_MythicPlus.RequestRewards
 local GetKeystoneLevelRarityColor = C_ChallengeMode.GetKeystoneLevelRarityColor
-local C_WeeklyRewards_GetActivities = C_WeeklyRewards.GetActivities
 local UIParentLoadAddOn = UIParentLoadAddOn
 local C_MythicPlus_GetSeasonBestForMap = C_MythicPlus.GetSeasonBestForMap
 
@@ -94,77 +92,44 @@ local function GetDungeonScores()
 	return (ScoreTable and map_table) and ScoreTable or nil
 end
 
-local function padNumber(n, w)
-	n = n or 0
-	return format("%" .. w .. "s", n)
-end
-
-local function GetRewards()
-	local rewards = C_WeeklyRewards_GetActivities(Enum.WeeklyRewardChestThresholdType.Activities)
-	local rewardsText = {}
-
-	for i = 1, #rewards do
-		local reward = rewards[i]
-		local ilvl = C_MythicPlus.GetRewardLevelForDifficultyLevel(reward.level)
+local function DungeonScoreTooltip()
+	local ScoreTable = GetDungeonScores()
+	if not ScoreTable then return end
 
-		if reward.progress < reward.threshold then
-			local rt = reward.progress .. "/" .. reward.threshold
-			table.insert(rewardsText, WrapTextInColorCode(rt, "ff9d9d9d"))
-		else
-			local color = GetKeystoneLevelRarityColor(reward.level)
-			local rt = reward.threshold .. "/" .. reward.threshold .. ": " .. padNumber("+" .. reward.level, 3) .. " (" .. ilvl .. ")"
-			if color then table.insert(rewardsText, color:WrapTextInColorCode(rt)) end
+	if E.db.mMT.mpscore.upgrade then
+		SortScore(ScoreTable)
+		for i = 0, 2 do
+			ScoreTable[map_table[#map_table - i]].upgrade = true
 		end
 	end
 
-	return table.concat(rewardsText, WrapTextInColorCode(" - ", "FFFFFFFF"))
-end
-
-local function DungeonScoreTooltip()
-	ScoreTable = GetDungeonScores()
-	local reward = GetRewards()
-
-	if ScoreTable then
-		if E.db.mMT.mpscore.upgrade then
-			SortScore(ScoreTable)
-			ScoreTable[map_table[#map_table]].upgrade = true
-			ScoreTable[map_table[#map_table - 1]].upgrade = true
-			ScoreTable[map_table[#map_table - 2]].upgrade = true
-		end
+	if E.db.mMT.mpscore.sort == "SCORE" and not E.db.mMT.mpscore.upgrade then
+		SortScore(ScoreTable)
+	else
+		SortLevel(ScoreTable)
+	end
 
-		if E.db.mMT.mpscore.sort == "SCORE" and not E.db.mMT.mpscore.upgrade then
-			SortScore(ScoreTable)
-		else
-			SortLevel(ScoreTable)
+	for _, mapID in ipairs(map_table) do
+		local entry = ScoreTable[mapID]
+		local name = entry.name
+		local icon = entry.icon
+		local isOwenKeystone = entry.isOwenKeystone
+		local score = entry.score
+		local level = entry.level
+		local color = entry.color and entry.color:GenerateHexColor() or "FFFFFFFF"
+		local isTimed = entry.isTimed
+
+		if E.db.mMT.mpscore.highlight and isOwenKeystone then
+			local highlightColor = E.db.mMT.mpscore.highlightcolor.hex
+			name = format("%s%s|r", highlightColor, name)
 		end
 
-		for i = 1, #map_table do
-			local mapID = map_table[i]
-
-			local name = ScoreTable[mapID].name
-			local icon = ScoreTable[mapID].icon
-			local isOwenKeystone = ScoreTable[mapID].isOwenKeystone
-			local score = ScoreTable[mapID].score
-			local level = ScoreTable[mapID].level
-			local color = ScoreTable[mapID].color and ScoreTable[mapID].color:GenerateHexColor() or "FFFFFFFF"
-			local isTimed = ScoreTable[mapID].isTimed
-
-			local nameString = L["No Dungeon"]
-			local scoreString = L["No Score"]
-
-			if E.db.mMT.mpscore.highlight and isOwenKeystone then
-				local highlightColor = E.db.mMT.mpscore.highlightcolor.hex
-				name = format("%s%s|r", highlightColor, name)
-			end
+		local nameString = format("%s %s", mMT:mIcon(icon), name)
+		if E.db.mMT.mpscore.upgrade and entry.upgrade then nameString = nameString .. "  " .. mMT:mIcon(mMT.Media.UpgradeIcons[E.db.mMT.mpscore.icon]) end
 
-			nameString = format("%s %s", mMT:mIcon(icon), name)
-
-			if E.db.mMT.mpscore.upgrade and ScoreTable[mapID].upgrade then nameString = nameString .. "  " .. mMT:mIcon(mMT.Media.UpgradeIcons[E.db.mMT.mpscore.icon]) end
-
-			color = isTimed and color or "FFAFAFAF"
-			scoreString = (level ~= 0 and score ~= 0) and format("|C%s%s|r - |C%s%s|r", color, level, color, score) or L["No Score"]
-			DT.tooltip:AddDoubleLine(nameString, scoreString)
-		end
+		color = isTimed and color or "FFAFAFAF"
+		local scoreString = (level ~= 0 and score ~= 0) and format("|C%s%s|r - |C%s%s|r", color, level, color, score) or L["No Score"]
+		DT.tooltip:AddDoubleLine(nameString, scoreString)
 	end
 end
 
@@ -201,11 +166,9 @@ local function GetGroupKeystone()
 		local info = LOR.GetKeystoneInfo(unit)
 		local UnitInfo = LOR.GetUnitGear(unit)
 		local name = UnitName(unit)
-		local ilevel = ""
+		local ilevel = UnitInfo and format("|CFFFFCC00i |r|CFFFFFFFF%s|r", UnitInfo.ilevel) or ""
 		local leader = UnitIsGroupLeader(unit) and LeadIcon or ""
 
-		if UnitInfo then ilevel = format("|CFFFFCC00i |r|CFFFFFFFF%s|r", UnitInfo.ilevel) end
-
 		if info then
 			local mapName, _, _, icon = C_ChallengeMode.GetMapUIInfo(info.mythicPlusMapID)
 			if mapName then
@@ -227,7 +190,7 @@ local function GetGroupKeystone()
 
 				DT.tooltip:AddDoubleLine(name, key)
 			end
-		elseif UnitInfo then
+		else
 			name = format("%s%s|r %s |CFFFFFFFF[|r%s|CFFFFFFFF]|r ", mMT:GetClassColor(unit), UnitName(unit), leader, ilevel)
 			DT.tooltip:AddDoubleLine(name, L["No Keystone"])
 		end
@@ -236,25 +199,25 @@ end
 
 local function OnEnter(self)
 	isMaxLevel = E:XPIsLevelMax()
-
 	local inCombat = InCombatLockdown()
 	DT.tooltip:ClearLines()
 
 	if not inCombat then
 		SaveMyKeystone()
-		myScore = mMT:GetDungeonScore()
+		local myScore = mMT:GetDungeonScore()
+
 		if isMaxLevel then
 			local keyText = mMT:OwenKeystone()
 			if keyText then
-				for i = 1, #keyText do
-					DT.tooltip:AddLine(keyText[i])
+				for _, line in ipairs(keyText) do
+					DT.tooltip:AddLine(line)
 				end
 			end
 		end
 
 		DT.tooltip:AddLine(" ")
 		DT.tooltip:AddLine(L["Keystones on your Account"])
-		for k, v in pairs(mMT.DB.keys) do
+		for _, v in pairs(mMT.DB.keys) do
 			DT.tooltip:AddDoubleLine(v.name, v.key)
 		end
 
@@ -268,8 +231,8 @@ local function OnEnter(self)
 	local mAffixesText = mMT:WeeklyAffixes()
 	if mAffixesText then
 		DT.tooltip:AddLine(" ")
-		for i = 1, #mAffixesText do
-			DT.tooltip:AddLine(mAffixesText[i])
+		for _, line in ipairs(mAffixesText) do
+			DT.tooltip:AddLine(line)
 		end
 	end
 
@@ -279,7 +242,15 @@ local function OnEnter(self)
 		DT.tooltip:AddLine(" ")
 		DungeonScoreTooltip()
 		DT.tooltip:AddLine(" ")
-		DT.tooltip:AddDoubleLine(L["Rewards"], GetRewards())
+
+		local rewards = mMT:mGetVaultInfo()
+		if rewards then
+			DT.tooltip:AddLine(" ")
+			DT.tooltip:AddLine(GREAT_VAULT_REWARDS)
+			DT.tooltip:AddDoubleLine(rewards.raid.name, table.concat(rewards.raid.rewards, WrapTextInColorCode(" - ", "FFFFFFFF")))
+			DT.tooltip:AddDoubleLine(rewards.dungeons.name, table.concat(rewards.dungeons.rewards, WrapTextInColorCode(" - ", "FFFFFFFF")))
+			DT.tooltip:AddDoubleLine(rewards.world.name, table.concat(rewards.world.rewards, WrapTextInColorCode(" - ", "FFFFFFFF")))
+		end
 	end
 
 	DT.tooltip:AddLine(" ")
diff --git a/Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua b/Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua
index 58c4e1ba..6d046b6c 100644
--- a/Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua
+++ b/Addon/ElvUI_mMediaTag/modules/datatexts/Teleports.lua
@@ -218,28 +218,29 @@ local Teleports = {
 		available = false,
 		tps = {
 			-- S1
-			[445417] = "ARAK", -- Ara-Kara, City of Echoes
-			[445416] = "CoT", -- City of Threads
-			[445414] = "DAWN", -- The Dawnbreaker
+			[354462] = "NW", -- Necrotic Wake
+			[354464] = "MIST", -- Mists of Tirna Scithe
 			[445269] = "SV", -- The Stonevault
-			[464256] = "SIEGE", -- Siege of Boralus
+			[445414] = "DAWN", -- The Dawnbreaker
+			[445416] = "CoT", -- City of Threads
+			[445417] = "ARAK", -- Ara-Kara, City of Echoes
+			[445418] = "SIEGE", -- Siege of Boralus - alliance
 			[445424] = "GB", -- Grim Batol
-			[354464] = "MIST", -- Mists of Tirna Scithe
-			[354462] = "NW", -- Necrotic Wake
+			[464256] = "SIEGE", -- Siege of Boralus - horde
 		},
 	},
 
 	tww = {
 		available = false,
 		tps = {
-			[445417] = "ARAK", -- Ara-Kara, City of Echoes
-			[445416] = "CoT", -- City of Threads
-			[445414] = "DAWN", -- The Dawnbreaker
 			[445269] = "SV", -- The Stonevault
-			[442932] = "CM", -- Cinderbrew Meadery
-			[442930] = "DC", -- Darkflame Cleft
-			[442923] = "PSF", -- Priory of the Sacred Flame
-			[442925] = "ROOK", -- The Rookery
+			[445414] = "DAWN", -- The Dawnbreaker
+			[445416] = "CoT", -- City of Threads
+			[445417] = "ARAK", -- Ara-Kara, City of Echoes
+			[445440] = "CM", -- Cinderbrew Meadery
+			[445441] = "DC", -- Darkflame Cleft
+			[445443] = "ROOK", -- The Rookery
+			[445444] = "PSF", -- Priory of the Sacred Flame
 		},
 	},
 
@@ -263,7 +264,6 @@ local Teleports = {
 			[159900] = "GD", -- Grimrail Depot
 			[159901] = "EB", -- The Everbloom
 			[159902] = "UBS", -- Upper Blackrock Spire
-			[464256] = "SIEGE", -- Siege of Boralus
 			[354462] = "NW", -- Necrotic Wake
 			[354463] = "PF", -- Plaguefall
 			[354464] = "MIST", -- Mists of Tirna Scithe
@@ -288,7 +288,6 @@ local Teleports = {
 			[393283] = "HOI", -- Halls of Infusion
 			[393764] = "HOV", -- Halls of Valor
 			[393766] = "COS", -- Court of Stars
-			[445424] = "GB", -- Grim Batol
 			[410071] = "FH", -- Freehold
 			[410074] = "UNDR", -- Underrot
 			[410078] = "NL", -- Neltharion's Lair
@@ -299,14 +298,17 @@ local Teleports = {
 			[424167] = "WM", -- Waycrest Manor
 			[424187] = "AD", -- Atal'Dazar
 			[424197] = "DOI", -- Dawn of the Infinite
-			[442923] = "PSF", -- Priory of the Sacred Flame
-			[442925] = "ROOK", -- The Rookery
 			[445269] = "SV", -- The Stonevault
+			[445414] = "DAWN", -- The Dawnbreaker
 			[445416] = "CoT", -- City of Threads
 			[445417] = "ARAK", -- Ara-Kara, City of Echoes
-			[442930] = "DC", -- Darkflame Cleft
-			[445414] = "DAWN", -- The Dawnbreaker
-			[442932] = "CM", -- Cinderbrew Meadery
+			[445418] = "SIEGE", -- Siege of Boralus - alliance
+			[445424] = "GB", -- Grim Batol
+			[445440] = "CM", -- Cinderbrew Meadery
+			[445441] = "DC", -- Darkflame Cleft
+			[445443] = "ROOK", -- The Rookery
+			[445444] = "PSF", -- Priory of the Sacred Flame
+			[464256] = "SIEGE", -- Siege of Boralus - horde
 		},
 	},
 	menu = {},
diff --git a/Addon/ElvUI_mMediaTag/modules/datatexts/durability_ilevel.lua b/Addon/ElvUI_mMediaTag/modules/datatexts/durability_ilevel.lua
index be1a1b01..47c829fb 100644
--- a/Addon/ElvUI_mMediaTag/modules/datatexts/durability_ilevel.lua
+++ b/Addon/ElvUI_mMediaTag/modules/datatexts/durability_ilevel.lua
@@ -166,7 +166,6 @@ local function OnClick(_, button)
 	if InCombatLockdown() then
 		_G.UIErrorsFrame:AddMessage(E.InfoColor .. _G.ERR_NOT_IN_COMBAT)
 	else
-		mMT:Print(button)
 		if button == "LeftButton" then
 			_G.ToggleCharacter("PaperDollFrame")
 		elseif button == "RightButton" then
diff --git a/Addon/ElvUI_mMediaTag/modules/datatexts/gamemenu.lua b/Addon/ElvUI_mMediaTag/modules/datatexts/gamemenu.lua
index 5cc590cc..3cbf9c23 100644
--- a/Addon/ElvUI_mMediaTag/modules/datatexts/gamemenu.lua
+++ b/Addon/ElvUI_mMediaTag/modules/datatexts/gamemenu.lua
@@ -47,9 +47,7 @@ local function AddIcon(file)
 end
 
 local function AddColor(color)
-	if color > 16 then
-		color = 16
-	end
+	if color > 16 then color = 16 end
 	return E.db.mMT.gamemenu.color and colors[color] or colors[1]
 end
 
@@ -144,9 +142,7 @@ local function BuildMenu()
 			text = _G.ENCOUNTER_JOURNAL,
 			icon = AddIcon("magazine"),
 			func = function()
-				if not IsAddOnLoaded("Blizzard_EncounterJournal") then
-					UIParentLoadAddOn("Blizzard_EncounterJournal")
-				end
+				if not IsAddOnLoaded("Blizzard_EncounterJournal") then UIParentLoadAddOn("Blizzard_EncounterJournal") end
 				ToggleFrame(_G.EncounterJournal)
 			end,
 		})
@@ -190,20 +186,16 @@ local function BuildMenu()
 		})
 	end
 
-	if E.Cata and E.mylevel >= _G.SHOW_PVP_LEVEL then
-		tinsert(menuList, {
-			text = _G.PLAYER_V_PLAYER,
-			icon = AddIcon("battle"),
-			func = function()
-				_G.TogglePVPFrame()
-			end,
-		})
-	end
+	if E.Cata and E.mylevel >= _G.SHOW_PVP_LEVEL then tinsert(menuList, {
+		text = _G.PLAYER_V_PLAYER,
+		icon = AddIcon("battle"),
+		func = function()
+			_G.TogglePVPFrame()
+		end,
+	}) end
 
 	sort(menuList, function(a, b)
-		if a and b and a.text and b.text then
-			return a.text < b.text
-		end
+		if a and b and a.text and b.text then return a.text < b.text end
 		return false
 	end)
 
@@ -228,9 +220,7 @@ local function BuildMenu()
 		icon = "Interface\\Addons\\ElvUI_mMediaTag\\media\\logo\\mmt_icon.tga",
 		bottom = true,
 		func = function()
-			if not InCombatLockdown() then
-				E:ToggleOptions("mMT")
-			end
+			if not InCombatLockdown() then E:ToggleOptions("mMT") end
 		end,
 	})
 	tinsert(menuList, { text = "", isTitle = true, notClickable = true, func = function() end })
@@ -276,9 +266,7 @@ local function BuildMenu()
 	})
 end
 local function OnEvent(self, event)
-	if not menuList or event == "ELVUI_FORCE_UPDATE" then
-		BuildMenu()
-	end
+	if not menuList or event == "ELVUI_FORCE_UPDATE" then BuildMenu() end
 
 	local hex = E:RGBToHex(E.db.general.valuecolor.r, E.db.general.valuecolor.g, E.db.general.valuecolor.b)
 	local string = strjoin("", hex, "%s|r")
@@ -286,9 +274,7 @@ local function OnEvent(self, event)
 	self.text:SetFormattedText(string, E.db.mMT.gamemenu.icon and format("|TInterface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\misc\\gears.tga:16:16:0:0:64:64|t %s", L["Game Menu"]) or L["Game Menu"])
 end
 local function OnClick(self, button)
-	if not menuList then
-		BuildMenu()
-	end
+	if not menuList then BuildMenu() end
 
 	DT.tooltip:Hide()
 	if button == "LeftButton" then
@@ -297,9 +283,7 @@ local function OnClick(self, button)
 		if E.Retail then
 			_G.ToggleLFDParentFrame()
 		elseif E.Cata then
-			if not IsAddOnLoaded("Blizzard_LookingForGroupUI") then
-				UIParentLoadAddOn("Blizzard_LookingForGroupUI")
-			end
+			if not IsAddOnLoaded("Blizzard_LookingForGroupUI") then UIParentLoadAddOn("Blizzard_LookingForGroupUI") end
 			_G.ToggleLFGParentFrame()
 		end
 	end
@@ -315,9 +299,7 @@ local function OnEnter(self)
 
 	DT.tooltip:AddLine(" ")
 	DT.tooltip:AddLine(format("%s %s%s|r", mMT:mIcon(mMT.Media.Mouse["LEFT"]), tip, L["left click to open the menu."]))
-	if E.Retail or E.Cata then
-		DT.tooltip:AddLine(format("%s %s%s|r", mMT:mIcon(mMT.Media.Mouse["RIGHT"]), tip, L["right click to open LFD Window"]))
-	end
+	if E.Retail or E.Cata then DT.tooltip:AddLine(format("%s %s%s|r", mMT:mIcon(mMT.Media.Mouse["RIGHT"]), tip, L["right click to open LFD Window"])) end
 	DT.tooltip:Show()
 end
 
diff --git a/Addon/ElvUI_mMediaTag/modules/misc/ObjectiveTracker.lua b/Addon/ElvUI_mMediaTag/modules/misc/ObjectiveTracker.lua
index ad17f728..94188985 100644
--- a/Addon/ElvUI_mMediaTag/modules/misc/ObjectiveTracker.lua
+++ b/Addon/ElvUI_mMediaTag/modules/misc/ObjectiveTracker.lua
@@ -166,14 +166,12 @@ end
 
 local function SetTextProperties(text, fontSettings, color)
 	text:SetFont(LSM:Fetch("font", fontSettings.font), fontSettings.fontsize, fontSettings.fontflag)
-	if color then
-		text:SetTextColor(color.r, color.g, color.b)
-	end
+	if color then text:SetTextColor(color.r, color.g, color.b) end
 end
 
 local function SkinTitleText(text, color)
 	SetTextProperties(text, fonts.title, color or colors.title.n)
-	local height = text:GetStringHeight() + 2
+	local height = text:GetStringHeight()
 	if height ~= text:GetHeight() then text:SetHeight(height) end
 end
 
@@ -329,7 +327,7 @@ local function GetRequirements(text)
 	local result = matchPatterns(text)
 	if not result then return nil end
 
-	if (result.current and result.required) then
+	if result.current and result.required then
 		result.complete = tonumber(result.current) >= tonumber(result.required)
 	elseif result.percent then
 		result.complete = tonumber(result.percent) >= 100
@@ -695,6 +693,8 @@ end
 
 local function SkinBlock(_, block)
 	if block then
+		local totalHeight = 2
+
 		if block.Stage and not block.mMT_StageSkin then
 			hooksecurefunc(block, "UpdateStageBlock", SkinStageBlock)
 			SkinStageBlock(block)
@@ -726,6 +726,7 @@ local function SkinBlock(_, block)
 				cachedQuests[block.id].title = block.HeaderText:GetText()
 				block.HeaderText:SetText(GetLevelInfoText(cachedQuests[block.id].info.level) .. block.HeaderText:GetText())
 			end
+			totalHeight = totalHeight + block.HeaderText:GetHeight()
 		end
 
 		if block.usedLines then
@@ -743,9 +744,42 @@ local function SkinBlock(_, block)
 			hooksecurefunc(block, "OnHeaderLeave", OnHeaderLeave)
 			block.mMT_OnLeaveHook = true
 		end
+
+		if not block.WidgetContainerand and not C_ChallengeMode.GetActiveChallengeMapID() then
+			if block.usedLines then
+				for _, line in pairs(block.usedLines) do
+					totalHeight = totalHeight + line:GetHeight()
+				end
+			end
+			block:SetHeight(totalHeight)
+		end
 	end
 end
 
+-- Funktion zum Erstellen eines Textblocks
+function CreateTextBlock(text, fontSize)
+	local textBlock = {} -- Erstelle einen neuen Textblock (Tabelle)
+	textBlock.text = text
+	textBlock.fontSize = fontSize
+	textBlock.height = fontSize * 1.2 -- Berechne die Höhe des Textblocks basierend auf der Schriftgröße (1.2 ist ein Beispielwert für den Zeilenabstand)
+	return textBlock
+end
+
+-- Funktion zum Setzen des Abstands zwischen zwei Textblöcken
+function SetTextBlockSpacing(textBlock1, textBlock2, spacing)
+	textBlock2.y = textBlock1.y + textBlock1.height + spacing
+end
+
+-- Beispielverwendung
+local textBlock1 = CreateTextBlock("Erster Textblock", 14)
+textBlock1.y = 100 -- Setze die y-Position des ersten Textblocks
+
+local textBlock2 = CreateTextBlock("Zweiter Textblock", 18)
+SetTextBlockSpacing(textBlock1, textBlock2, 10) -- Setze den Abstand zwischen den Textblöcken auf 10 Einheiten
+
+print("TextBlock1 Position: " .. textBlock1.y)
+print("TextBlock2 Position: " .. textBlock2.y)
+
 local function AddBackground()
 	-- inspired by Merathilis background, thank you
 	local backdrop = _G.ObjectiveTrackerFrame.backdrop
@@ -856,8 +890,11 @@ function module:Initialize()
 					hooksecurefunc(tracker, "AddBlock", SkinBlock)
 					tracker.mMTSkin = true
 				end
+
+				--tracker:SetHeight(5)
 			end
 		end
+		module.hooked = true
 	end
 
 	cachedQuests = BuildQuestCache()
diff --git a/Addon/ElvUI_mMediaTag/modules/misc/load_misc.xml b/Addon/ElvUI_mMediaTag/modules/misc/load_misc.xml
index f03d7dbb..4442033c 100644
--- a/Addon/ElvUI_mMediaTag/modules/misc/load_misc.xml
+++ b/Addon/ElvUI_mMediaTag/modules/misc/load_misc.xml
@@ -11,4 +11,6 @@
 	<Script file="afk.lua"/>
 	<Script file="cosmeticbars.lua"/>
 	<Script file="details.lua"/>
+	<Script file="minimap_aspect_ratio.lua"/>
+	<Script file="minimap_skin.lua"/>
 </Ui>
diff --git a/Addon/ElvUI_mMediaTag/modules/misc/load_misc_cata.xml b/Addon/ElvUI_mMediaTag/modules/misc/load_misc_cata.xml
index 1fb989ce..3602ca96 100644
--- a/Addon/ElvUI_mMediaTag/modules/misc/load_misc_cata.xml
+++ b/Addon/ElvUI_mMediaTag/modules/misc/load_misc_cata.xml
@@ -8,4 +8,6 @@
 	<Script file="cosmeticbars.lua"/>
 	<Script file="instancedifficulty.lua"/>
 	<Script file="details.lua"/>
+	<Script file="minimap_aspect_ratio.lua"/>
+	<Script file="minimap_skin.lua"/>
 </Ui>
diff --git a/Addon/ElvUI_mMediaTag/modules/misc/load_misc_classic.xml b/Addon/ElvUI_mMediaTag/modules/misc/load_misc_classic.xml
index d0cd7c5b..d2c15744 100644
--- a/Addon/ElvUI_mMediaTag/modules/misc/load_misc_classic.xml
+++ b/Addon/ElvUI_mMediaTag/modules/misc/load_misc_classic.xml
@@ -7,4 +7,6 @@
 	<Script file="afk.lua"/>
 	<Script file="cosmeticbars.lua"/>
 	<Script file="details.lua"/>
+	<Script file="minimap_aspect_ratio.lua"/>
+	<Script file="minimap_skin.lua"/>
 </Ui>
diff --git a/Addon/ElvUI_mMediaTag/modules/misc/minimap_aspect_ratio.lua b/Addon/ElvUI_mMediaTag/modules/misc/minimap_aspect_ratio.lua
new file mode 100644
index 00000000..a1fbc0ab
--- /dev/null
+++ b/Addon/ElvUI_mMediaTag/modules/misc/minimap_aspect_ratio.lua
@@ -0,0 +1,107 @@
+local E, L, V, P, G = unpack(ElvUI)
+local M = E:GetModule("Minimap")
+local module = mMT.Modules.MinimapAspectRatio
+if not module then return end
+
+local Minimap = _G.Minimap
+local MinimapCluster = _G.MinimapCluster
+local ceil = math.ceil
+
+local aspectRatios = {
+	["3:2"] = {
+		mask = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\aspectratio\\3-2.tga",
+		aspectratio = 1.5,
+		offset = 2,
+	},
+	["4:3"] = {
+		mask = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\aspectratio\\4-3.tga",
+		aspectratio = 1.33333,
+		offset = 1,
+	},
+	["16:8"] = {
+		mask = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\aspectratio\\16-8.tga",
+		aspectratio = 2,
+		offset = 1,
+	},
+	["16:9"] = {
+		mask = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\aspectratio\\16-9.tga",
+		aspectratio = 1.77777,
+		offset = 1,
+	},
+	["16:10"] = {
+		mask = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\aspectratio\\16-10.tga",
+		aspectratio = 1.6,
+		offset = 1,
+	},
+}
+
+local function GetYOffset()
+	local aspectRatio = aspectRatios[E.db.mMT.minimapAspectRatio.aspectRatio]
+	local width = E.MinimapSize
+	local height = width / aspectRatio.aspectratio
+	local difference = width - height
+	return -ceil(difference / 2) + aspectRatio.offset
+end
+
+local function HandleButton(button, iconType, hideSetting)
+	if not button then return end
+
+	local hidden = not Minimap:IsShown()
+	if not hidden or E.private.general.minimap[hideSetting] then
+		local _, position, xOffset, y = M:GetIconSettings(iconType)
+		local yOffset = GetYOffset() - y
+
+		button:ClearAllPoints()
+		button:SetPoint(position, Minimap, xOffset, -yOffset)
+	end
+end
+
+local function HandleTrackingButton()
+	local tracking = MinimapCluster.Tracking or MinimapCluster.TrackingFrame or _G.MiniMapTrackingFrame or _G.MiniMapTracking
+	HandleButton(tracking, "tracking", "hideTracking")
+end
+
+local function HandleExpansionButton()
+	local garrison = _G.ExpansionLandingPageMinimapButton or _G.GarrisonLandingPageMinimapButton
+	HandleButton(garrison, "classHall", "hideClassHallReport")
+end
+
+local function SetAspectRatio()
+	local aspectRatio = aspectRatios[E.db.mMT.minimapAspectRatio.aspectRatio]
+	local width = E.MinimapSize
+	local height = width / aspectRatio.aspectratio
+
+	Minimap:SetSize(width, width)
+	M.MapHolder:SetSize(width, height)
+	Minimap:SetMaskTexture(aspectRatio.mask)
+
+	local yOffset = GetYOffset()
+	Minimap.backdrop:ClearAllPoints()
+	Minimap.backdrop:SetOutside(Minimap, 1, yOffset)
+
+	local yOffsetOther = yOffset + aspectRatio.offset
+	Minimap:ClearAllPoints()
+	Minimap:SetPoint("TOPLEFT", M.MapHolder, "TOPLEFT", 0, -yOffsetOther)
+
+	if Minimap.location then
+		Minimap.location:ClearAllPoints()
+		Minimap.location:SetPoint("TOP", Minimap, 0, yOffsetOther - 2)
+	end
+end
+
+
+function module:Initialize()
+	if not module.hooked then
+		hooksecurefunc(M, "UpdateSettings", SetAspectRatio)
+		hooksecurefunc(M, "HandleTrackingButton", HandleTrackingButton)
+		hooksecurefunc(M, "HandleExpansionButton", HandleExpansionButton)
+		module.hooked = true
+	end
+
+	SetAspectRatio()
+	HandleTrackingButton()
+	HandleExpansionButton()
+
+	module.needReloadUI = true
+	module.loaded = true
+end
diff --git a/Addon/ElvUI_mMediaTag/modules/misc/minimap_skin.lua b/Addon/ElvUI_mMediaTag/modules/misc/minimap_skin.lua
new file mode 100644
index 00000000..4fa9597c
--- /dev/null
+++ b/Addon/ElvUI_mMediaTag/modules/misc/minimap_skin.lua
@@ -0,0 +1,102 @@
+local E, L, V, P, G = unpack(ElvUI)
+local M = E:GetModule("Minimap")
+local module = mMT.Modules.MinimapSkin
+if not module then return end
+
+local Minimap = _G.Minimap
+
+local skins = {
+	circle = {
+		mask = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\circle_mask.tga",
+		texture = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\circle.tga",
+		cardinal = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\circle_cardinal.tga",
+	},
+	drop = {
+		mask = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\drop_mask.tga",
+		texture = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\drop.tga",
+		extra = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\drop_extra.tga",
+	},
+	drop_round = {
+		mask = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\drop_round_mask.tga",
+		texture = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\drop_round.tga",
+		extra = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\drop_extra.tga",
+	},
+	hexagon = {
+		mask = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\hexagon_mask.tga",
+		texture = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\hexagon.tga",
+		cardinal = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\cardinal_a.tga",
+	},
+	octagon = {
+		mask = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\octagon_mask.tga",
+		texture = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\octagon.tga",
+		cardinal = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\cardinal_a.tga",
+	},
+	paralelogram = {
+		mask = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\paralelogram_mask.tga",
+		texture = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\paralelogram.tga",
+		cardinal = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\paralelogram_cardinal.tga",
+	},
+	paralelogram_horizontal = {
+		mask = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\paralelogram_horizontal_mask.tga",
+		texture = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\paralelogram_horizontal.tga",
+		cardinal = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\paralelogram_horizontal_cardinal.tga",
+	},
+	zickzag = {
+		mask = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\zickzag_mask.tga",
+		texture = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\zickzag.tga",
+		cardinal = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\zickzag_cardinal.tga",
+		extra = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\zickzag_extra.tga",
+	},
+	antique = {
+		mask = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\antique_mask.tga",
+		texture = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\antique.tga",
+		--cardinal = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\zickzag_cardinal.tga",
+		extra = "Interface\\Addons\\ElvUI_mMediaTag\\media\\minimap\\skin\\antique_extra.tga",
+	},
+}
+
+local function CreateOrUpdateTexture(name, layer, level, texture, color)
+	if not Minimap[name] then
+		Minimap[name] = Minimap:CreateTexture(name, layer, nil, level)
+		Minimap[name]:SetAllPoints(Minimap)
+	end
+	Minimap[name]:SetTexture(texture, "CLAMP", "CLAMP", "TRILINEAR")
+	Minimap[name]:Show()
+	if color then Minimap[name]:SetVertexColor(color.r, color.g, color.b, color.a or 1) end
+end
+
+local function SkinMinimap()
+	local skin = E.db.mMT.minimapSkin.custom.enable and E.db.mMT.minimapSkin.custom or skins[E.db.mMT.minimapSkin.skin]
+
+	local color = E.db.mMT.minimapSkin.colors.texture.class and mMT.ClassColor or E.db.mMT.minimapSkin.colors.texture.color
+	CreateOrUpdateTexture("mMT_Minimap_Skin", "OVERLAY", 2, skin.texture, color)
+
+	if E.db.mMT.minimapSkin.cardinal and skin.cardinal then
+		color = E.db.mMT.minimapSkin.colors.cardinal.class and mMT.ClassColor or E.db.mMT.minimapSkin.colors.cardinal.color
+		CreateOrUpdateTexture("mMT_Cardinal", "OVERLAY", 3, skin.cardinal, color)
+	else
+		if Minimap.mMT_Cardinal then Minimap.mMT_Cardinal:Hide() end
+	end
+
+	if E.db.mMT.minimapSkin.effect and skin.extra then
+		color = E.db.mMT.minimapSkin.colors.extra.class and mMT.ClassColor or E.db.mMT.minimapSkin.colors.extra.color
+		CreateOrUpdateTexture("mMT_Extra", "OVERLAY", 1, skin.extra, color)
+	else
+		if Minimap.mMT_Extra then Minimap.mMT_Extra:Hide() end
+	end
+
+	Minimap:SetMaskTexture(skin.mask)
+	Minimap.backdrop:Hide()
+end
+
+function module:Initialize()
+	if not module.hooked then
+		hooksecurefunc(M, "UpdateSettings", SkinMinimap)
+		module.hooked = true
+	end
+
+	SkinMinimap()
+
+	module.needReloadUI = true
+	module.loaded = true
+end
diff --git a/Addon/ElvUI_mMediaTag/modules/retail/functions.lua b/Addon/ElvUI_mMediaTag/modules/retail/functions.lua
index 5f6bf8e3..65ae21dc 100644
--- a/Addon/ElvUI_mMediaTag/modules/retail/functions.lua
+++ b/Addon/ElvUI_mMediaTag/modules/retail/functions.lua
@@ -63,9 +63,7 @@ function mMT:WeeklyAffixes()
 		affixes = mMT.DB.mplusaffix.affixes
 		if affixes == nil then
 			affixes = C_MythicPlus.GetCurrentAffixes()
-			if affixes ~= nil then
-				mMT.DB.mplusaffix.affixes = affixes
-			end
+			if affixes ~= nil then mMT.DB.mplusaffix.affixes = affixes end
 		end
 	else
 		affixes = C_MythicPlus.GetCurrentAffixes()
@@ -84,16 +82,12 @@ function mMT:WeeklyAffixes()
 		end
 	else
 		affixes = C_MythicPlus.GetCurrentAffixes()
-		if not affixes == nil then
-			mMT.DB.mplusaffix.affixes = affixes
-		end
+		if not affixes == nil then mMT.DB.mplusaffix.affixes = affixes end
 	end
 
 	if AffixText ~= nil then
 		local seasonID = C_MythicPlus.GetCurrentSeason()
-		if seasonID <= 0 then
-			seasonID = mMT.DB.mplusaffix.season
-		end
+		if seasonID <= 0 then seasonID = mMT.DB.mplusaffix.season end
 
 		if seasonID >= 1 then
 			mMT.DB.mplusaffix.season = seasonID
@@ -112,46 +106,82 @@ function mMT:WeeklyAffixes()
 	end
 end
 
-local function isMaxLevel(unit)
-	local exp, maxxp = UnitXP("player"), UnitXPMax("player")
-	return "%s / %s", exp, maxxp
+--Great Vault Functions
+
+--  [16:47]   [1] table: 0000026AFCE2E360
+--  [16:47]         [type]  =  1
+--  [16:47]         [index]  =  1
+--  [16:47]         [activityTierID]  =  13
+--  [16:47]         [progress]  =  1
+--  [16:47]         [rewards]  >  table: 0000026AFCE2E3B0
+--  [16:47]         [threshold]  =  1
+--  [16:47]         [level]  =  0
+--  [16:47]         [raidString]  =  Besiegt %d Bosse im Palast der Nerub'ar
+--  [16:47]         [id]  =  134
+--  [16:47]   [2] table: 0000026AFCE2E400
+--  [16:47]         [type]  =  1
+--  [16:47]         [index]  =  2
+--  [16:47]         [activityTierID]  =  0
+--  [16:47]         [progress]  =  1
+--  [16:47]         [rewards]  >  table: 0000026AFCE2E450
+--  [16:47]         [threshold]  =  4
+--  [16:47]         [level]  =  0
+--  [16:47]         [raidString]  =  Besiegt %d Bosse im Palast der Nerub'ar
+--  [16:47]         [id]  =  135
+--  [16:47]   [3] table: 0000026AFCE2E4A0
+--  [16:47]         [type]  =  1
+--  [16:47]         [index]  =  3
+--  [16:47]         [activityTierID]  =  0
+--  [16:47]         [progress]  =  1
+--  [16:47]         [rewards]  >  table: 0000026AFCE2E4F0
+--  [16:47]         [threshold]  =  8
+--  [16:47]         [level]  =  0
+--  [16:47]         [raidString]  =  Besiegt %d Bosse im Palast der Nerub'ar
+--  [16:47]         [id]  =  136
+
+local GetKeystoneLevelRarityColor = C_ChallengeMode.GetKeystoneLevelRarityColor
+local GetActivities = C_WeeklyRewards.GetActivities
+local WrapTextInColorCode = WrapTextInColorCode
+local GetExampleRewardItemHyperlinks =  C_WeeklyRewards.GetExampleRewardItemHyperlinks
+
+local function padNumber(n, w)
+	n = n or 0
+	return format("%" .. w .. "s", n)
 end
 
---Great Vault Functions
 function mMT:mGetVaultInfo()
-	local vaultinfo = {}
-	vaultinfo = wipe(vaultinfo)
-	local vaultinforaid, vaultinfomplus, vaultinfopvp, vaultinfohighest, ok = {}, {}, {}, nil, false
-	vaultinforaid = wipe(vaultinforaid)
-	vaultinfomplus = wipe(vaultinfomplus)
-	vaultinfopvp = wipe(vaultinfopvp)
-	vaultinfo = C_WeeklyRewards.GetActivities(Enum.WeeklyRewardChestThresholdType.Activities)
-
-	if not vaultinfo then
-		return {}, {}, {}, nil, false
-	else
-		table.sort(vaultinfo, function(left, right)
-			return left.index < right.index
-		end)
-		for i = 1, 9 do
-			local id = vaultinfo[i] and vaultinfo[i].id or 0
-			local itemLink = C_WeeklyRewards.GetExampleRewardItemHyperlinks(id)
-			if itemLink then
-				local ItemLevelInfo = GetDetailedItemLevelInfo(itemLink)
-				if ItemLevelInfo then
-					vaultinfohighest = (vaultinfohighest and (vaultinfohighest < ItemLevelInfo) and ItemLevelInfo or vaultinfohighest) or (not vaultinfohighest and ItemLevelInfo)
-					if i < 4 then
-						tinsert(vaultinfomplus, format("%s%s|r", mMT:mColorGradient(ItemLevelInfo), ItemLevelInfo))
-					elseif i < 7 then
-						tinsert(vaultinfopvp, format("%s%s|r", mMT:mColorGradient(ItemLevelInfo), ItemLevelInfo))
-					else
-						tinsert(vaultinforaid, format("%s%s|r", mMT:mColorGradient(ItemLevelInfo), ItemLevelInfo))
-					end
-					ok = true
-				end
+	local tblRewards = {
+		raid = {
+			name = RAID,
+			rewards = {},
+		},
+		dungeons = {
+			name = DUNGEONS,
+			rewards = {},
+		},
+		world = {
+			name = WORLD,
+			rewards = {},
+		},
+	}
+
+	local function processRewards(rewardType, rewardTable)
+		local rewards = GetActivities(rewardType)
+		for _, reward in pairs(rewards) do
+			if reward.progress < reward.threshold then
+				tinsert(rewardTable, WrapTextInColorCode(reward.progress .. "/" .. reward.threshold, "ff9d9d9d"))
+			else
+				local itemLink = GetExampleRewardItemHyperlinks(reward.id)
+				local itemLevel = itemLink and GetDetailedItemLevelInfo(itemLink) or ""
+				local color = GetKeystoneLevelRarityColor(reward.level)
+				if color then tinsert(rewardTable, color:WrapTextInColorCode(padNumber("+" .. reward.level, 3) .. " (" .. itemLevel .. ")")) end
 			end
 		end
-		local vaultinfohighestString = format("%s%s|r", mMT:mColorGradient(tonumber(vaultinfohighest) or 0), vaultinfohighest or 0)
-		return vaultinforaid, vaultinfomplus, vaultinfopvp, vaultinfohighestString, ok
 	end
+
+	processRewards(Enum.WeeklyRewardChestThresholdType.Raid, tblRewards.raid.rewards)
+	processRewards(Enum.WeeklyRewardChestThresholdType.Activities, tblRewards.dungeons.rewards)
+	processRewards(Enum.WeeklyRewardChestThresholdType.World, tblRewards.world.rewards)
+
+	return tblRewards
 end
diff --git a/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua b/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua
index 707ceff9..cd876982 100644
--- a/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua
+++ b/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua
@@ -870,7 +870,7 @@ function module:Initialize(force)
 					_G["ElvUF_Arena" .. i].unit,
 					_G["ElvUF_Arena" .. i],
 					E.db.mMT.portraits.arena,
-					{ "ARENA_OPPONENT_UPDATE", "ARENA_PREP_OPPONENT_SPECIALIZATIONS" },
+					{ "ARENA_OPPONENT_UPDATE" },
 					{ "UNIT_NAME_UPDATE" }
 				)
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7adba1c1..fc46e67a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,25 @@
 # Changelog - ElvUI_mMediaTag
 [Eng] - All changes to this project will be documented in this file. The latest changes are at the top.
 
+## [ver. 3.61] - 13.10.2024
+### UPDATE
+- UPDATE - [Datatext-Score]: Update rewards infos.
+- UPDATE - [Datatext-Teleports]: Update Dungeon Teleport IDs for Siege.
+- UPDATE - [Dock-LFG]: Update rewards infos.
+- UPDATE - [System]: Some minor code improvements.
+### FIX 
+- FIX - [Datatext-Durability]: Removed dev print.
+- FIX - [Datatext-Profession]: Fixed Cooking menu entry.
+- FIX - [Datatext-Profession]: Fixed toggle Profession window for Cata & Classic.
+- FIX - [Objectivetracker]: Possible fix for overlapping Blocks.
+- FIX - [Objectivetracker]: Prevent multiple hooks.
+- FIX - [Portraits]: Cata & Classic unsupported event.
+### NEW
+- NEW - [MEDIA]: Fonts: Beep, RingLink, SimplySans.
+- NEW - [Minimap]: Add a function to Skin the Minimap.
+- NEW - [Minimap]: Add a function to change the aspect ratio of the Minimap.
+- NEW - [Role-Icons]: Three new (Tank/Heal/DD) Role Icons.
+
 ## [ver. 3.60] - 04.10.2024
 ### UPDATE
 - UPDATE - [Dock-Character]: Update tooltip.