diff --git a/ElvUI/Core/Tags.lua b/ElvUI/Core/Tags.lua
index 8aea980..211719e 100644
--- a/ElvUI/Core/Tags.lua
+++ b/ElvUI/Core/Tags.lua
@@ -998,7 +998,7 @@ do
 end
 
 do
-	local gold, silver = '|A:nameplates-icon-elite-gold:16:16|a', '|A:nameplates-icon-elite-silver:16:16|a'
+	local gold, silver = CreateAtlasMarkup("nameplates-icon-elite-gold", 0.4, 0, 0), CreateAtlasMarkup("nameplates-icon-elite-silver", 0.4, 0, 0)
 	local typeIcon = { elite = gold, worldboss = gold, rareelite = silver, rare = silver }
 	E:AddTag('classification:icon', 'UNIT_NAME_UPDATE', function(unit)
 		if UnitIsPlayer(unit) then return end
diff --git a/ElvUI/Libraries/oUF/elements/health.lua b/ElvUI/Libraries/oUF/elements/health.lua
index 91522f4..34af5a3 100644
--- a/ElvUI/Libraries/oUF/elements/health.lua
+++ b/ElvUI/Libraries/oUF/elements/health.lua
@@ -138,14 +138,14 @@ local function ColorPath(self, ...)
 	--[[ Override: Health.UpdateColor(self, event, unit)
 	Used to completely override the internal function for updating the widgets' colors.
 
-	* self  - the parent object
-	* event - the event triggering the update (string)
-	* unit  - the unit accompanying the event (string)
-	--]]
-	local _, unit = ...
-	local args
-	if unit and self.isNamePlate then
-		if (event == "UNIT_THREAT_SITUATION_UPDATE" or event == "UNIT_FLAGS") and unit == "player" then
+		* self  - the parent object
+		* event - the event triggering the update (string)
+		* unit  - the unit accompanying the event (string)
+		--]]
+		local _, unit = ...
+		local args
+		if unit and self.isNamePlate then
+			if ((event == "UNIT_THREAT_SITUATION_UPDATE" or event == "UNIT_FLAGS") and unit == "player") or event == "UNIT_THREAT_LIST_UPDATE" then
 			args = { ... }
 			args[2] = self.unit
 		elseif unit:sub(1, 9) ~= "nameplate" then
diff --git a/ElvUI/Modules/Nameplates/Nameplates.lua b/ElvUI/Modules/Nameplates/Nameplates.lua
index ef2f0ca..68613af 100644
--- a/ElvUI/Modules/Nameplates/Nameplates.lua
+++ b/ElvUI/Modules/Nameplates/Nameplates.lua
@@ -145,6 +145,8 @@ function NP:SetCVars()
 	NP:SetCVar('nameplateShowFriendlyGuardians', NP.db.visibility.friendly.guardians and 1 or 0)
 	NP:SetCVar('nameplateShowFriendlyTotems', NP.db.visibility.friendly.totems and 1 or 0)
 	NP:SetCVar('nameplateShowFriendlyPets', NP.db.visibility.friendly.pets and 1 or 0)
+	NP:SetCVar('showVKeyCastbar', 1)
+	SetNamePlateCastBarMode(1)
 end
 
 function NP:PLAYER_REGEN_DISABLED()
diff --git a/ElvUI_Enhanced/Config/Config.lua b/ElvUI_Enhanced/Config/Config.lua
index 3343488..0226e59 100644
--- a/ElvUI_Enhanced/Config/Config.lua
+++ b/ElvUI_Enhanced/Config/Config.lua
@@ -1994,10 +1994,10 @@ function EE:GetOptions()
 			equipmentInfoGroup = EquipmentInfoOptions(),
 			mapGroup = MapOptions(),
 			minimapGroup = MinimapOptions(),
-			namePlatesGroup = NamePlatesOptions(),
+	--		namePlatesGroup = NamePlatesOptions(),
 			tooltipGroup = TooltipOptions(),
 			unitframesGroup = UnitFrameOptions(),
-			loseControlGroup = LoseControlOptions(),
+	--		loseControlGroup = LoseControlOptions(),
 			interruptGroup = InterruptTrackerOptions(),
 		}
 	}
diff --git a/ElvUI_Enhanced/Modules/Load_Modules.xml b/ElvUI_Enhanced/Modules/Load_Modules.xml
index 9261ad8..14e9a78 100644
--- a/ElvUI_Enhanced/Modules/Load_Modules.xml
+++ b/ElvUI_Enhanced/Modules/Load_Modules.xml
@@ -7,6 +7,5 @@
 	<Include file="Actionbars\Load_Actionbars.xml"/>
 	<Include file="Watchframe\Load_Watchframe.xml"/>
 	<Include file="Datatexts\Load_Datatexts.xml"/>
-	<Include file="Nameplates\Load_Nameplates.xml"/>
 	<Include file="Unitframes\Load_Unitframes.xml"/>
 </Ui>
diff --git a/ElvUI_Enhanced/Modules/Misc/Load_Misc.xml b/ElvUI_Enhanced/Modules/Misc/Load_Misc.xml
index bebb03b..54169da 100644
--- a/ElvUI_Enhanced/Modules/Misc/Load_Misc.xml
+++ b/ElvUI_Enhanced/Modules/Misc/Load_Misc.xml
@@ -5,7 +5,6 @@
 	<Script file="Movers.lua"/>
 	<Script file="QuestLevel.lua"/>
 	<Script file="QuestReward.lua"/>
-	<Script file="LoseControl.lua"/>
 	<Script file="AlreadyKnown.lua"/>
 	<Script file="TrainAllSkills.lua"/>
 	<Script file="UndressButton.lua"/>