diff --git a/ElvUI/Libraries/oUF/elements/elements.xml b/ElvUI/Libraries/oUF/elements/elements.xml
index c87e4d9..19b77f3 100644
--- a/ElvUI/Libraries/oUF/elements/elements.xml
+++ b/ElvUI/Libraries/oUF/elements/elements.xml
@@ -6,7 +6,7 @@
 	<Script file="leaderindicator.lua"/>
 	<Script file="combatindicator.lua"/>
 	<Script file="restingindicator.lua"/>
-	<!--<Script file="pvpindicator.lua"/>-->
+	<Script file="pvpindicator.lua"/>
 	<Script file="portrait.lua"/>
 <!--
 	<Script file="range.lua"/>-->
@@ -14,8 +14,7 @@
 	<Script file="tags.lua"/>
 	<Script file="masterlooterindicator.lua"/>
 	<Script file="assistantindicator.lua"/>
-	<!--<Script file="readycheckindicator.lua"/>
-	<Script file="combopoints.lua"/>
+	<!--<Script file="combopoints.lua"/>
 	<Script file="raidroleindicator.lua"/>
 	<Script file="happinessindicator.lua"/>
 -->
diff --git a/ElvUI/Libraries/oUF/elements/pvpindicator.lua b/ElvUI/Libraries/oUF/elements/pvpindicator.lua
index 3d8c436..a64e00b 100644
--- a/ElvUI/Libraries/oUF/elements/pvpindicator.lua
+++ b/ElvUI/Libraries/oUF/elements/pvpindicator.lua
@@ -87,7 +87,7 @@ local function Path(self, ...)
 	* event - the event triggering the update (string)
 	* ...   - the arguments accompanying the event
 	--]]
-	return (self.PvPIndicator.Override or Update) (self, ...)
+	return (self.PvPIndicator.Override or Update) (self, unpack(arg))
 end
 
 local function ForceUpdate(element)
diff --git a/ElvUI/Libraries/oUF/elements/readycheckindicator.lua b/ElvUI/Libraries/oUF/elements/readycheckindicator.lua
deleted file mode 100644
index 67c4139..0000000
--- a/ElvUI/Libraries/oUF/elements/readycheckindicator.lua
+++ /dev/null
@@ -1,152 +0,0 @@
---[[
-# Element: Ready Check Indicator
-
-Handles the visibility and updating of an indicator based on the unit's ready check status.
-
-## Widget
-
-ReadyCheckIndicator - A `Texture` representing ready check status.
-
-## Notes
-
-This element updates by changing the texture.
-Default textures will be applied if the layout does not provide custom ones. See Options.
-
-## Options
-
-.finishedTime    - For how many seconds the icon should stick after a check has completed. Defaults to 10 (number).
-.fadeTime        - For how many seconds the icon should fade away after the stick duration has completed. Defaults to
-                   1.5 (number).
-.readyTexture    - Path to an alternate texture for the ready check "ready" status.
-.notReadyTexture - Path to an alternate texture for the ready check "notready" status.
-.waitingTexture  - Path to an alternate texture for the ready check "waiting" status.
-
-## Attributes
-
-.status - the unit"s ready check status (string?)["ready", "noready", "waiting"]
-
-## Examples
-
-    -- Position and size
-    local ReadyCheckIndicator = self:CreateTexture(nil, "OVERLAY")
-    ReadyCheckIndicator:SetSize(16, 16)
-    ReadyCheckIndicator:SetPoint("TOP")
-
-    -- Register with oUF
-    self.ReadyCheckIndicator = ReadyCheckIndicator
---]]
-
-local ns = oUF
-local oUF = ns.oUF
-
-local sub = string.sub
-
-local GetReadyCheckStatus = GetReadyCheckStatus
-local UnitExists = UnitExists
-
-local function OnFinished(self)
-	local element = self:GetParent()
-	element:Hide()
-
-	--[[ Callback: ReadyCheckIndicator:PostUpdateFadeOut()
-	Called after the element has been faded out.
-
-	* self - the ReadyCheckIndicator element
-	--]]
-	if(element.PostUpdateFadeOut) then
-		element:PostUpdateFadeOut()
-	end
-end
-
-local function Update(self, event)
-	local element = self.ReadyCheckIndicator
-
-	--[[ Callback: ReadyCheckIndicator:PreUpdate()
-	Called before the element has been updated.
-
-	* self - the ReadyCheckIndicator element
-	--]]
-	if(element.PreUpdate) then
-		element:PreUpdate()
-	end
-
-	local unit = self.unit
-	local status = GetReadyCheckStatus(unit)
-	if(UnitExists(unit) and status) then
-		if(status == "ready") then
-			element:SetTexture(element.readyTexture)
-		elseif(status == "notready") then
-			element:SetTexture(element.notReadyTexture)
-		else
-			element:SetTexture(element.waitingTexture)
-		end
-
-		element.status = status
-		element:Show()
-	elseif(event ~= "READY_CHECK_FINISHED") then
-		element.status = nil
-		element:Hide()
-	end
-
-	if(event == "READY_CHECK_FINISHED") then
-		if(element.status == "waiting") then
-			element:SetTexture(element.notReadyTexture)
-		end
-	end
-
-	--[[ Callback: ReadyCheckIndicator:PostUpdate(status)
-	Called after the element has been updated.
-
-	* self   - the ReadyCheckIndicator element
-	* status - the unit"s ready check status (string?)["ready", "notready", "waiting"]
-	--]]
-	if(element.PostUpdate) then
-		return element:PostUpdate(status)
-	end
-end
-
-local function Path(self, ...)
-	--[[ Override: ReadyCheckIndicator.Override(self, event, ...)
-	Used to completely override the internal update function.
-
-	* self  - the parent object
-	* event - the event triggering the update (string)
-	* ...   - the arguments accompanying the event
-	--]]
-	return (self.ReadyCheckIndicator.Override or Update) (self, ...)
-end
-
-local function ForceUpdate(element)
-	return Path(element.__owner, "ForceUpdate")
-end
-
-local function Enable(self, unit)
-	local element = self.ReadyCheckIndicator
-	if(element and (unit and (sub(unit, 1, 5) == "party" or sub(unit, 1, 4) == "raid"))) then
-		element.__owner = self
-		element.ForceUpdate = ForceUpdate
-
-		element.readyTexture = element.readyTexture or READY_CHECK_READY_TEXTURE
-		element.notReadyTexture = element.notReadyTexture or READY_CHECK_NOT_READY_TEXTURE
-		element.waitingTexture = element.waitingTexture or READY_CHECK_WAITING_TEXTURE
-
-		self:RegisterEvent("READY_CHECK", Path, true)
-		self:RegisterEvent("READY_CHECK_CONFIRM", Path, true)
-		self:RegisterEvent("READY_CHECK_FINISHED", Path, true)
-
-		return true
-	end
-end
-
-local function Disable(self)
-	local element = self.ReadyCheckIndicator
-	if(element) then
-		element:Hide()
-
-		self:UnregisterEvent("READY_CHECK", Path)
-		self:UnregisterEvent("READY_CHECK_CONFIRM", Path)
-		self:UnregisterEvent("READY_CHECK_FINISHED", Path)
-	end
-end
-
-oUF:AddElement("ReadyCheckIndicator", Path, Enable, Disable)
\ No newline at end of file
diff --git a/ElvUI/Libraries/oUF/elements/tags.lua b/ElvUI/Libraries/oUF/elements/tags.lua
index 70c5fc5..97889d2 100644
--- a/ElvUI/Libraries/oUF/elements/tags.lua
+++ b/ElvUI/Libraries/oUF/elements/tags.lua
@@ -615,8 +615,8 @@ local function Tag(self, fs, tagstr)
 		tinsert(self.__mousetags, fs)
 		fs:SetAlpha(0)
 		if not self.__HookFunc then
-			self:HookScript('OnEnter', OnEnter)
-			self:HookScript('OnLeave', OnLeave)
+			HookScript(self, 'OnEnter', function() OnEnter(this) end)
+			HookScript(self, 'OnLeave', function() OnLeave(this) end)
 			self.__HookFunc = true;
 		end
 		tagstr = string.gsub(tagstr, '%[mouseover%]', '')
diff --git a/ElvUI/Libraries/oUF/ouf.lua b/ElvUI/Libraries/oUF/ouf.lua
index b71afbf..f27efa1 100644
--- a/ElvUI/Libraries/oUF/ouf.lua
+++ b/ElvUI/Libraries/oUF/ouf.lua
@@ -273,8 +273,8 @@ local function togglemenu(self, unit)
 	ToggleDropDownMenu(1, nil, secureDropdown, "cursor")
 end
 
-local function onShow()
-	return this:UpdateAllElements("OnShow")
+local function onShow(self)
+	return self:UpdateAllElements("OnShow")
 end
 
 local function initObject(unit, style, styleFunc, header, ...)
@@ -332,7 +332,7 @@ local function initObject(unit, style, styleFunc, header, ...)
 		styleFunc(object, objectUnit, not header)
 
 		--object:SetScript("OnAttributeChanged", onAttributeChanged)
-		object:SetScript("OnShow", onShow)
+		object:SetScript("OnShow", function() onShow(this) end)
 
 		activeElements[object] = {}
 		for element in next, elements do
diff --git a/ElvUI/Modules/UnitFrames/Elements/Load_Elements.xml b/ElvUI/Modules/UnitFrames/Elements/Load_Elements.xml
index a9a2bd7..88a95e6 100644
--- a/ElvUI/Modules/UnitFrames/Elements/Load_Elements.xml
+++ b/ElvUI/Modules/UnitFrames/Elements/Load_Elements.xml
@@ -9,6 +9,7 @@
 	<Script file="Portrait.lua"/>
 	<Script file="Power.lua"/>
 	<Script file="InfoPanel.lua"/>
+	<Script file="PvPIndicator.lua"/>
 	<Script file="RaidIcon.lua"/>
 	<Script file="RaidRoleIcons.lua"/>
 	<Script file="RestingIndicator.lua"/>
diff --git a/ElvUI/Modules/UnitFrames/Elements/PvPIndicator.lua b/ElvUI/Modules/UnitFrames/Elements/PvPIndicator.lua
new file mode 100644
index 0000000..8772ff8
--- /dev/null
+++ b/ElvUI/Modules/UnitFrames/Elements/PvPIndicator.lua
@@ -0,0 +1,23 @@
+local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
+local UF = E:GetModule("UnitFrames");
+
+--Cache global variables
+--Lua functions
+
+--WoW API / Variables
+
+function UF:Construct_PvPIndicator(frame)
+	local pvp = frame.RaisedElementParent:CreateFontString(nil, "OVERLAY")
+	UF:Configure_FontString(pvp)
+
+	return pvp
+end
+
+function UF:Configure_PVPIndicator(frame)
+	local pvp = frame.PvPText
+	local x, y = self:GetPositionOffset(frame.db.pvp.position)
+	pvp:ClearAllPoints()
+	E:Point(pvp, frame.db.pvp.position, frame.Health, frame.db.pvp.position, x, y)
+
+	frame:Tag(pvp, frame.db.pvp.text_format)
+end
\ No newline at end of file
diff --git a/ElvUI/Modules/UnitFrames/Groups/Raid.lua b/ElvUI/Modules/UnitFrames/Groups/Raid.lua
index 5a948b7..015a8f3 100644
--- a/ElvUI/Modules/UnitFrames/Groups/Raid.lua
+++ b/ElvUI/Modules/UnitFrames/Groups/Raid.lua
@@ -30,7 +30,7 @@ function UF:Construct_RaidFrames()
 	self.Portrait2D = UF:Construct_Portrait(self, "texture")
 	self.Name = UF:Construct_NameText(self)
 	self.RaidRoleFramesAnchor = UF:Construct_RaidRoleFrames(self)
-	self.RaidTargetIndicator = UF:Construct_RaidIcon(self);
+	self.RaidTargetIndicator = UF:Construct_RaidIcon(self)
 
 	self.GPS = UF:Construct_GPS(self)
 	self.InfoPanel = UF:Construct_InfoPanel(self)
diff --git a/ElvUI/Modules/UnitFrames/Tags.lua b/ElvUI/Modules/UnitFrames/Tags.lua
index 9b70e4f..1935e9b 100644
--- a/ElvUI/Modules/UnitFrames/Tags.lua
+++ b/ElvUI/Modules/UnitFrames/Tags.lua
@@ -485,6 +485,7 @@ end
 ElvUF.Tags.OnUpdateThrottle["pvptimer"] = 1
 ElvUF.Tags.Methods["pvptimer"] = function(unit)
 	if (UnitIsPVPFreeForAll(unit) or UnitIsPVP(unit)) then
+		--[[
 		local timer = GetPVPTimer()
 
 		if timer ~= 301000 and timer ~= -1 then
@@ -492,8 +493,9 @@ ElvUF.Tags.Methods["pvptimer"] = function(unit)
 			local secs = floor((timer / 1000) - (mins * 60))
 			return format("%s (%01.f:%02.f)", PVP, mins, secs)
 		else
+		]]
 			return PVP
-		end
+		--end
 	else
 		return ""
 	end
diff --git a/ElvUI/Modules/UnitFrames/Units/Player.lua b/ElvUI/Modules/UnitFrames/Units/Player.lua
index 69aae27..a61c843 100644
--- a/ElvUI/Modules/UnitFrames/Units/Player.lua
+++ b/ElvUI/Modules/UnitFrames/Units/Player.lua
@@ -28,6 +28,7 @@ function UF:Construct_PlayerFrame(frame)
 	frame.RaidTargetIndicator = UF:Construct_RaidIcon(frame)
 	frame.RestingIndicator = self:Construct_RestingIndicator(frame)
 	frame.CombatIndicator = self:Construct_CombatIndicator(frame)
+	frame.PvPText = self:Construct_PvPIndicator(frame)
 	frame.InfoPanel = self:Construct_InfoPanel(frame)
 
 	frame:SetPoint("BOTTOMLEFT", E.UIParent, "BOTTOM", -413, 68)
@@ -94,6 +95,8 @@ function UF:Update_PlayerFrame(frame, db)
 
 	UF:UpdateNameSettings(frame)
 
+	UF:Configure_PVPIndicator(frame)
+
 	UF:Configure_Power(frame)
 
 	UF:Configure_Portrait(frame)
diff --git a/ElvUI/Settings/Profile.lua b/ElvUI/Settings/Profile.lua
index 43bc16c..2be621f 100644
--- a/ElvUI/Settings/Profile.lua
+++ b/ElvUI/Settings/Profile.lua
@@ -1109,216 +1109,6 @@ P["unitframe"] = {
 				["yOffset"] = 8,
 			},
 		},
-		["focus"] = {
-			["enable"] = true,
-			["rangeCheck"] = true,
-			["threatStyle"] = "GLOW",
-			["orientation"] = "MIDDLE",
-			["smartAuraPosition"] = "DISABLED",
-			["colorOverride"] = "USE_DEFAULT",
-			["width"] = 190,
-			["height"] = 36,
-			["healPrediction"] = true,
-			["health"] = {
-				["text_format"] = "",
-				["position"] = "RIGHT",
-				["xOffset"] = -2,
-				["yOffset"] = 0,
-				["attachTextTo"] = "Health",
-			},
-			["power"] = {
-				["enable"] = true,
-				["text_format"] = "",
-				["width"] = "fill",
-				["height"] = 7,
-				["offset"] = 0,
-				["position"] = "LEFT",
-				["hideonnpc"] = false,
-				["xOffset"] = 2,
-				["yOffset"] = 0,
-				["attachTextTo"] = "Health",
-			},
-			["infoPanel"] = {
-				["enable"] = false,
-				["height"] = 14,
-				["transparent"] = false,
-			},
-			["name"] = {
-				["position"] = "CENTER",
-				["text_format"] = "[namecolor][name:medium]",
-				["xOffset"] = 0,
-				["yOffset"] = 0,
-				["attachTextTo"] = "Health",
-			},
-			["portrait"] = {
-				["enable"] = false,
-				["width"] = 45,
-				["overlay"] = false,
-				["style"] = "3D",
-			},
-			["buffs"] = {
-				["enable"] = false,
-				["perrow"] = 7,
-				["numrows"] = 1,
-				["attachTo"] = "FRAME",
-				["anchorPoint"] = "BOTTOMLEFT",
-				["fontSize"] = 10,
-				["clickThrough"] = false,
-				["sortMethod"] = "TIME_REMAINING",
-				["sortDirection"] = "DESCENDING",
-				["minDuration"] = 0,
-				["maxDuration"] = 300,
-				["priority"] = "Blacklist,Personal,PlayerBuffs,CastByUnit,Dispellable", --Focus Buffs
-				["xOffset"] = 0,
-				["yOffset"] = 0,
-			},
-			["debuffs"] = {
-				["enable"] = true,
-				["perrow"] = 5,
-				["numrows"] = 1,
-				["attachTo"] = "FRAME",
-				["anchorPoint"] = "TOPRIGHT",
-				["fontSize"] = 10,
-				["clickThrough"] = false,
-				["sortMethod"] = "TIME_REMAINING",
-				["sortDirection"] = "DESCENDING",
-				["minDuration"] = 0,
-				["maxDuration"] = 300,
-				["priority"] = "Blacklist,Personal,RaidDebuffs,Dispellable,Whitelist", --Focus Debuffs
-				["xOffset"] = 0,
-				["yOffset"] = 0,
-			},
-			["castbar"] = {
-				["enable"] = true,
-				["width"] = 190,
-				["height"] = 18,
-				["icon"] = true,
-				["format"] = "REMAINING",
-				["spark"] = true,
-				["iconSize"] = 32,
-				["iconAttached"] = true,
-				["insideInfoPanel"] = true,
-				["iconAttachedTo"] = "Frame",
-				["iconPosition"] = "LEFT",
-				["iconXOffset"] = -10,
-				["iconYOffset"] = 0,
-			},
-			["aurabar"] = {
-				["enable"] = false,
-				["anchorPoint"] = "ABOVE",
-				["attachTo"] = "DEBUFFS",
-				["maxBars"] = 3,
-				["minDuration"] = 0,
-				["maxDuration"] = 120,
-				["priority"] = "Blacklist,blockNoDuration,Personal,PlayerBuffs,RaidDebuffs", --Focus AuraBars
-				["friendlyAuraType"] = "HELPFUL",
-				["enemyAuraType"] = "HARMFUL",
-				["height"] = 20,
-				["sort"] = "TIME_REMAINING",
-				["uniformThreshold"] = 0,
-				["yOffset"] = 0,
-			},
-			["raidicon"] = {
-				["enable"] = true,
-				["size"] = 18,
-				["attachTo"] = "TOP",
-				["attachToObject"] = "Frame",
-				["xOffset"] = 0,
-				["yOffset"] = 8,
-			},
-			["GPSArrow"] = {
-				["enable"] = true,
-				["size"] = 45,
-				["xOffset"] = 0,
-				["yOffset"] = 0,
-				["onMouseOver"] = true,
-				["outOfRange"] = true,
-			},
-		},
-		["focustarget"] = {
-			["enable"] = false,
-			["rangeCheck"] = true,
-			["threatStyle"] = "NONE",
-			["orientation"] = "MIDDLE",
-			["smartAuraPosition"] = "DISABLED",
-			["colorOverride"] = "USE_DEFAULT",
-			["width"] = 190,
-			["height"] = 26,
-			["health"] = {
-				["text_format"] = "",
-				["position"] = "RIGHT",
-				["xOffset"] = -2,
-				["yOffset"] = 0,
-			},
-			["power"] = {
-				["enable"] = false,
-				["text_format"] = "",
-				["width"] = "fill",
-				["height"] = 7,
-				["offset"] = 0,
-				["position"] = "LEFT",
-				["hideonnpc"] = false,
-				["xOffset"] = 2,
-				["yOffset"] = 0,
-			},
-			["infoPanel"] = {
-				["enable"] = false,
-				["height"] = 12,
-				["transparent"] = false,
-			},
-			["name"] = {
-				["position"] = "CENTER",
-				["text_format"] = "[namecolor][name:medium]",
-				["yOffset"] = 0,
-				["xOffset"] = 0,
-			},
-			["portrait"] = {
-				["enable"] = false,
-				["width"] = 45,
-				["overlay"] = false,
-				["style"] = "3D",
-			},
-			["buffs"] = {
-				["enable"] = false,
-				["perrow"] = 7,
-				["numrows"] = 1,
-				["attachTo"] = "FRAME",
-				["anchorPoint"] = "BOTTOMLEFT",
-				["fontSize"] = 10,
-				["clickThrough"] = false,
-				["sortMethod"] = "TIME_REMAINING",
-				["sortDirection"] = "DESCENDING",
-				["minDuration"] = 0,
-				["maxDuration"] = 300,
-				["priority"] = "Blacklist,Personal,PlayerBuffs,Dispellable,CastByUnit", --FocusTarget Buffs
-				["xOffset"] = 0,
-				["yOffset"] = 0,
-			},
-			["debuffs"] = {
-				["enable"] = false,
-				["perrow"] = 5,
-				["numrows"] = 1,
-				["attachTo"] = "FRAME",
-				["anchorPoint"] = "BOTTOMRIGHT",
-				["fontSize"] = 10,
-				["clickThrough"] = false,
-				["sortMethod"] = "TIME_REMAINING",
-				["sortDirection"] = "DESCENDING",
-				["minDuration"] = 0,
-				["maxDuration"] = 300,
-				["priority"] = "Blacklist,Personal,RaidDebuffs,Dispellable,Whitelist", --FocusTarget Debuffs
-				["xOffset"] = 0,
-				["yOffset"] = 0,
-			},
-			["raidicon"] = {
-				["enable"] = true,
-				["size"] = 18,
-				["attachTo"] = "TOP",
-				["attachToObject"] = "Frame",
-				["xOffset"] = 0,
-				["yOffset"] = 8,
-			},
-		},
 		["pet"] = {
 			["enable"] = true,
 			["rangeCheck"] = true,
@@ -1492,218 +1282,6 @@ P["unitframe"] = {
 				["yOffset"] = 0,
 			},
 		},
-		["boss"] = {
-			["enable"] = true,
-			["rangeCheck"] = true,
-			["growthDirection"] = "DOWN",
-			["orientation"] = "RIGHT",
-			["smartAuraPosition"] = "DISABLED",
-			["colorOverride"] = "USE_DEFAULT",
-			["width"] = 216,
-			["height"] = 46,
-			["spacing"] = 25,
-			["targetGlow"] = true,
-			["health"] = {
-				["text_format"] = "[healthcolor][health:current]",
-				["position"] = "LEFT",
-				["yOffset"] = 0,
-				["xOffset"] = 2,
-				["attachTextTo"] = "Health",
-			},
-			["power"] = {
-				["enable"] = true,
-				["text_format"] = "[powercolor][power:current]",
-				["width"] = "fill",
-				["height"] = 7,
-				["offset"] = 0,
-				["position"] = "RIGHT",
-				["hideonnpc"] = false,
-				["yOffset"] = 0,
-				["xOffset"] = -2,
-				["attachTextTo"] = "Health",
-			},
-			["portrait"] = {
-				["enable"] = false,
-				["width"] = 35,
-				["overlay"] = false,
-				["style"] = "3D",
-			},
-			["infoPanel"] = {
-				["enable"] = false,
-				["height"] = 16,
-				["transparent"] = false,
-			},
-			["name"] = {
-				["position"] = "CENTER",
-				["text_format"] = "[namecolor][name:medium]",
-				["yOffset"] = 0,
-				["xOffset"] = 0,
-				["attachTextTo"] = "Health",
-			},
-			["buffs"] = {
-				["enable"] = true,
-				["perrow"] = 3,
-				["numrows"] = 1,
-				["attachTo"] = "FRAME",
-				["anchorPoint"] = "LEFT",
-				["fontSize"] = 10,
-				["sortMethod"] = "TIME_REMAINING",
-				["sortDirection"] = "DESCENDING",
-				["clickThrough"] = false,
-				["minDuration"] = 0,
-				["maxDuration"] = 0,
-				["priority"] = "Blacklist,CastByUnit,Whitelist", --Boss Buffs
-				["xOffset"] = 0,
-				["yOffset"] = 20,
-				["sizeOverride"] = 22,
-			},
-			["debuffs"] = {
-				["enable"] = true,
-				["perrow"] = 3,
-				["numrows"] = 2,
-				["attachTo"] = "FRAME",
-				["anchorPoint"] = "LEFT",
-				["fontSize"] = 10,
-				["sortMethod"] = "TIME_REMAINING",
-				["sortDirection"] = "DESCENDING",
-				["clickThrough"] = false,
-				["minDuration"] = 0,
-				["maxDuration"] = 0,
-				["priority"] = "Blacklist,Personal,RaidDebuffs,CastByUnit,Whitelist", --Boss Debuffs
-				["xOffset"] = 0,
-				["yOffset"] = -3,
-				["sizeOverride"] = 22,
-			},
-			["castbar"] = {
-				["enable"] = true,
-				["width"] = 215,
-				["height"] = 18,
-				["icon"] = true,
-				["format"] = "REMAINING",
-				["spark"] = true,
-				["iconSize"] = 32,
-				["iconAttached"] = true,
-				["insideInfoPanel"] = true,
-				["iconAttachedTo"] = "Frame",
-				["iconPosition"] = "LEFT",
-				["iconXOffset"] = -10,
-				["iconYOffset"] = 0,
-			},
-			["raidicon"] = {
-				["enable"] = true,
-				["size"] = 18,
-				["attachTo"] = "TOP",
-				["attachToObject"] = "Frame",
-				["xOffset"] = 0,
-				["yOffset"] = 8,
-			},
-		},
-		["arena"] = {
-			["enable"] = true,
-			["rangeCheck"] = true,
-			["growthDirection"] = "DOWN",
-			["orientation"] = "RIGHT",
-			["smartAuraPosition"] = "DISABLED",
-			["spacing"] = 25,
-			["width"] = 246,
-			["height"] = 47,
-			["healPrediction"] = true,
-			["colorOverride"] = "USE_DEFAULT",
-			["targetGlow"] = true,
-			["health"] = {
-				["text_format"] = "[healthcolor][health:current]",
-				["position"] = "LEFT",
-				["yOffset"] = 0,
-				["xOffset"] = 2,
-				["attachTextTo"] = "Health",
-			},
-			["power"] = {
-				["enable"] = true,
-				["text_format"] = "[powercolor][power:current]",
-				["width"] = "fill",
-				["height"] = 7,
-				["offset"] = 0,
-				["attachTextTo"] = "Health",
-				["position"] = "RIGHT",
-				["hideonnpc"] = false,
-				["yOffset"] = 0,
-				["xOffset"] = -2,
-			},
-			["infoPanel"] = {
-				["enable"] = false,
-				["height"] = 17,
-				["transparent"] = false,
-			},
-			["name"] = {
-				["position"] = "CENTER",
-				["text_format"] = "[namecolor][name:medium]",
-				["yOffset"] = 0,
-				["xOffset"] = 0,
-				["attachTextTo"] = "Health",
-			},
-			["portrait"] = {
-				["enable"] = false,
-				["width"] = 45,
-				["overlay"] = false,
-				["style"] = "3D",
-			},
-			["buffs"] = {
-				["enable"] = true,
-				["perrow"] = 3,
-				["numrows"] = 1,
-				["attachTo"] = "FRAME",
-				["anchorPoint"] = "LEFT",
-				["fontSize"] = 10,
-				["clickThrough"] = false,
-				["sortMethod"] = "TIME_REMAINING",
-				["sortDirection"] = "DESCENDING",
-				["minDuration"] = 0,
-				["maxDuration"] = 300,
-				["priority"] = "Blacklist,TurtleBuffs,PlayerBuffs,Dispellable", --Arena Buffs
-				["sizeOverride"] = 27,
-				["xOffset"] = 0,
-				["yOffset"] = 16,
-			},
-			["debuffs"] = {
-				["enable"] = true,
-				["perrow"] = 3,
-				["numrows"] = 1,
-				["attachTo"] = "FRAME",
-				["anchorPoint"] = "LEFT",
-				["fontSize"] = 10,
-				["clickThrough"] = false,
-				["sortMethod"] = "TIME_REMAINING",
-				["sortDirection"] = "DESCENDING",
-				["minDuration"] = 0,
-				["maxDuration"] = 300,
-				["priority"] = "Blacklist,blockNoDuration,Personal,CCDebuffs,Whitelist", --Arena Debuffs
-				["sizeOverride"] = 27,
-				["xOffset"] = 0,
-				["yOffset"] = -16,
-			},
-			["castbar"] = {
-				["enable"] = true,
-				["width"] = 256,
-				["height"] = 18,
-				["icon"] = true,
-				["format"] = "REMAINING",
-				["spark"] = true,
-				["iconSize"] = 32,
-				["iconAttached"] = true,
-				["insideInfoPanel"] = true,
-				["iconAttachedTo"] = "Frame",
-				["iconPosition"] = "LEFT",
-				["iconXOffset"] = -10,
-				["iconYOffset"] = 0,
-			},
-			["pvpTrinket"] = {
-				["enable"] = true,
-				["position"] = "RIGHT",
-				["size"] = 46,
-				["xOffset"] = 1,
-				["yOffset"] = 0,
-			},
-		},
 		["party"] = {
 			["enable"] = true,
 			["rangeCheck"] = true,
@@ -2051,163 +1629,6 @@ P["unitframe"] = {
 				["yOffset"] = 2,
 			},
 		},
-		["raid40"] = {
-			["enable"] = true,
-			["rangeCheck"] = true,
-			["threatStyle"] = "GLOW",
-			["orientation"] = "MIDDLE",
-			["visibility"] = "[@raid26,noexists] hide;show",
-			["growthDirection"] = "RIGHT_DOWN",
-			["horizontalSpacing"] = 3,
-			["verticalSpacing"] = 3,
-			["numGroups"] = 8,
-			["groupsPerRowCol"] = 1,
-			["groupBy"] = "GROUP",
-			["sortDir"] = "ASC",
-			["showPlayer"] = true,
-			["healPrediction"] = false,
-			["colorOverride"] = "USE_DEFAULT",
-			["width"] = 80,
-			["height"] = 27,
-			["targetGlow"] = true,
-			["health"] = {
-				["text_format"] = "[healthcolor][health:deficit]",
-				["position"] = "BOTTOM",
-				["orientation"] = "HORIZONTAL",
-				["frequentUpdates"] = false,
-				["attachTextTo"] = "Health",
-				["yOffset"] = 2,
-				["xOffset"] = 0,
-			},
-			["power"] = {
-				["enable"] = false,
-				["text_format"] = "",
-				["width"] = "fill",
-				["height"] = 7,
-				["offset"] = 0,
-				["position"] = "BOTTOMRIGHT",
-				["hideonnpc"] = false,
-				["yOffset"] = 2,
-				["xOffset"] = -2,
-			},
-			["infoPanel"] = {
-				["enable"] = false,
-				["height"] = 12,
-				["transparent"] = false,
-			},
-			["name"] = {
-				["position"] = "CENTER",
-				["text_format"] = "[namecolor][name:short]",
-				["yOffset"] = 0,
-				["xOffset"] = 0,
-				["attachTextTo"] = "Health",
-			},
-			["portrait"] = {
-				["enable"] = false,
-				["width"] = 45,
-				["overlay"] = false,
-				["style"] = "3D",
-			},
-			["buffs"] = {
-				["enable"] = false,
-				["perrow"] = 3,
-				["numrows"] = 1,
-				["attachTo"] = "FRAME",
-				["anchorPoint"] = "LEFT",
-				["fontSize"] = 10,
-				["countFontSize"] = 10,
-				["sortMethod"] = "TIME_REMAINING",
-				["sortDirection"] = "DESCENDING",
-				["clickThrough"] = false,
-				["minDuration"] = 0,
-				["maxDuration"] = 300,
-				["priority"] = "Blacklist,TurtleBuffs", --Raid40 Buffs
-				["xOffset"] = 0,
-				["yOffset"] = 0,
-			},
-			["debuffs"] = {
-				["enable"] = false,
-				["perrow"] = 3,
-				["numrows"] = 1,
-				["attachTo"] = "FRAME",
-				["anchorPoint"] = "RIGHT",
-				["fontSize"] = 10,
-				["countFontSize"] = 10,
-				["sortMethod"] = "TIME_REMAINING",
-				["sortDirection"] = "DESCENDING",
-				["clickThrough"] = false,
-				["minDuration"] = 0,
-				["maxDuration"] = 300,
-				["priority"] = "Blacklist,RaidDebuffs,CCDebuffs,Dispellable,Whitelist", --Raid40 Debuffs
-				["xOffset"] = 0,
-				["yOffset"] = 0,
-			},
-			["rdebuffs"] = {
-				["enable"] = false,
-				["showDispellableDebuff"] = true,
-				["onlyMatchSpellID"] = true,
-				["fontSize"] = 10,
-				["font"] = "Homespun",
-				["fontOutline"] = "MONOCHROMEOUTLINE",
-				["size"] = 22,
-				["xOffset"] = 0,
-				["yOffset"] = 0,
-				["duration"] = {
-					["position"] = "CENTER",
-					["xOffset"] = 0,
-					["yOffset"] = 0,
-					["color"] = {r = 1, g = 0.9, b = 0, a = 1}
-				},
-				["stack"] = {
-					["position"] = "BOTTOMRIGHT",
-					["xOffset"] = 0,
-					["yOffset"] = 2,
-					["color"] = {r = 1, g = 0.9, b = 0, a = 1}
-				},
-			},
-			["roleIcon"] = {
-				["enable"] = false,
-				["position"] = "BOTTOMRIGHT",
-				["attachTo"] = "Health",
-				["xOffset"] = -1,
-				["yOffset"] = 1,
-				["size"] = 15,
-			},
-			["raidRoleIcons"] = {
-				["enable"] = true,
-				["position"] = "TOPLEFT",
-			},
-			["buffIndicator"] = {
-				["enable"] = true,
-				["size"] = 8,
-				["fontSize"] = 10,
-				["profileSpecific"] = false,
-			},
-			["raidicon"] = {
-				["enable"] = true,
-				["size"] = 18,
-				["attachTo"] = "TOP",
-				["attachToObject"] = "Frame",
-				["xOffset"] = 0,
-				["yOffset"] = 8,
-			},
-			["GPSArrow"] = {
-				["enable"] = true,
-				["size"] = 45,
-				["xOffset"] = 0,
-				["yOffset"] = 0,
-				["onMouseOver"] = true,
-				["outOfRange"] = true,
-			},
-			["readycheckIcon"] = {
-				["enable"] = true,
-				["size"] = 12,
-				["attachTo"] = "Health",
-				["position"] = "BOTTOM",
-				["xOffset"] = 0,
-				["yOffset"] = 2,
-			},
-		},
 		["raidpet"] = {
 			["enable"] = false,
 			["rangeCheck"] = true,
@@ -2322,172 +1743,6 @@ P["unitframe"] = {
 				["yOffset"] = 8,
 			},
 		},
-		["tank"] = {
-			["enable"] = true,
-			["orientation"] = "LEFT",
-			["threatStyle"] = "GLOW",
-			["colorOverride"] = "USE_DEFAULT",
-			["rangeCheck"] = true,
-			["width"] = 120,
-			["height"] = 28,
-			["disableDebuffHighlight"] = true,
-			["verticalSpacing"] = 7,
-			["buffs"] = {
-				["enable"] = false,
-				["perrow"] = 6,
-				["numrows"] = 1,
-				["attachTo"] = "FRAME",
-				["anchorPoint"] = "TOPLEFT",
-				["fontSize"] = 10,
-				["countFontSize"] = 10,
-				["sortMethod"] = "TIME_REMAINING",
-				["sortDirection"] = "DESCENDING",
-				["clickThrough"] = false,
-				["minDuration"] = 0,
-				["maxDuration"] = 0,
-				["priority"] = "",
-				["xOffset"] = 0,
-				["yOffset"] = 2,
-			},
-			["debuffs"] = {
-				["enable"] = false,
-				["perrow"] = 6,
-				["numrows"] = 1,
-				["attachTo"] = "BUFFS",
-				["anchorPoint"] = "TOPRIGHT",
-				["fontSize"] = 10,
-				["countFontSize"] = 10,
-				["sortMethod"] = "TIME_REMAINING",
-				["sortDirection"] = "DESCENDING",
-				["clickThrough"] = false,
-				["minDuration"] = 0,
-				["maxDuration"] = 0,
-				["priority"] = "",
-				["xOffset"] = 0,
-				["yOffset"] = 1,
-			},
-			["buffIndicator"] = {
-				["enable"] = true,
-				["size"] = 8,
-				["fontSize"] = 10,
-				["profileSpecific"] = false,
-			},
-			["rdebuffs"] = {
-				["enable"] = true,
-				["showDispellableDebuff"] = true,
-				["onlyMatchSpellID"] = true,
-				["fontSize"] = 10,
-				["font"] = "Homespun",
-				["fontOutline"] = "MONOCHROMEOUTLINE",
-				["size"] = 26,
-				["xOffset"] = 0,
-				["yOffset"] = 0,
-				["duration"] = {
-					["position"] = "CENTER",
-					["xOffset"] = 0,
-					["yOffset"] = 0,
-					["color"] = {r = 1, g = 0.9, b = 0, a = 1}
-				},
-				["stack"] = {
-					["position"] = "BOTTOMRIGHT",
-					["xOffset"] = 0,
-					["yOffset"] = 2,
-					["color"] = {r = 1, g = 0.9, b = 0, a = 1}
-				},
-			},
-			["targetsGroup"] = {
-				["enable"] = true,
-				["anchorPoint"] = "RIGHT",
-				["xOffset"] = 1,
-				["yOffset"] = 0,
-				["width"] = 120,
-				["height"] = 28,
-				["colorOverride"] = "USE_DEFAULT",
-			},
-		},
-		["assist"] = {
-			["enable"] = true,
-			["orientation"] = "LEFT",
-			["threatStyle"] = "GLOW",
-			["colorOverride"] = "USE_DEFAULT",
-			["rangeCheck"] = true,
-			["width"] = 120,
-			["height"] = 28,
-			["disableDebuffHighlight"] = true,
-			["verticalSpacing"] = 7,
-			["buffs"] = {
-				["enable"] = false,
-				["perrow"] = 6,
-				["numrows"] = 1,
-				["attachTo"] = "FRAME",
-				["anchorPoint"] = "TOPLEFT",
-				["fontSize"] = 10,
-				["countFontSize"] = 10,
-				["sortMethod"] = "TIME_REMAINING",
-				["sortDirection"] = "DESCENDING",
-				["clickThrough"] = false,
-				["minDuration"] = 0,
-				["maxDuration"] = 0,
-				["priority"] = "",
-				["xOffset"] = 0,
-				["yOffset"] = 2,
-			},
-			["debuffs"] = {
-				["enable"] = false,
-				["perrow"] = 6,
-				["numrows"] = 1,
-				["attachTo"] = "BUFFS",
-				["anchorPoint"] = "TOPRIGHT",
-				["fontSize"] = 10,
-				["countFontSize"] = 10,
-				["sortMethod"] = "TIME_REMAINING",
-				["sortDirection"] = "DESCENDING",
-				["clickThrough"] = false,
-				["minDuration"] = 0,
-				["maxDuration"] = 0,
-				["priority"] = "",
-				["xOffset"] = 0,
-				["yOffset"] = 1,
-			},
-			["buffIndicator"] = {
-				["enable"] = true,
-				["size"] = 8,
-				["fontSize"] = 10,
-				["profileSpecific"] = false,
-			},
-			["rdebuffs"] = {
-				["enable"] = true,
-				["showDispellableDebuff"] = true,
-				["onlyMatchSpellID"] = true,
-				["fontSize"] = 10,
-				["font"] = "Homespun",
-				["fontOutline"] = "MONOCHROMEOUTLINE",
-				["size"] = 26,
-				["xOffset"] = 0,
-				["yOffset"] = 0,
-				["duration"] = {
-					["position"] = "CENTER",
-					["xOffset"] = 0,
-					["yOffset"] = 0,
-					["color"] = {r = 1, g = 0.9, b = 0, a = 1}
-				},
-				["stack"] = {
-					["position"] = "BOTTOMRIGHT",
-					["xOffset"] = 0,
-					["yOffset"] = 2,
-					["color"] = {r = 1, g = 0.9, b = 0, a = 1}
-				},
-			},
-			["targetsGroup"] = {
-				["enable"] = true,
-				["anchorPoint"] = "RIGHT",
-				["xOffset"] = 1,
-				["yOffset"] = 0,
-				["width"] = 120,
-				["height"] = 28,
-				["colorOverride"] = "USE_DEFAULT",
-			},
-		},
 	},
 }