diff --git a/CHANGELOG.md b/CHANGELOG.md
index d494347..cda8d02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [0.0.6]
+## [0.0.7]
 
 ### Updated
 
diff --git a/NoobTacoUIv2.toc b/NoobTacoUIv2.toc
index 7417800..33c7c85 100644
--- a/NoobTacoUIv2.toc
+++ b/NoobTacoUIv2.toc
@@ -4,7 +4,7 @@
 ## Interface-Wrath: 30400
 ## Title: |cFF16C3F2NoobTaco|r|cFFFFFFFFUI|rv2
 ## Author: NoobTaco
-## Version: 0.0.5
+## Version: 0.0.7
 ## Notes: Contains layouts from NoobTacoUIv2
 ## RequiredDeps: ElvUI
 ## DefaultState: enabled
diff --git a/modules/NamePlates.lua b/modules/NamePlates.lua
index ffbcb2d..0e588ad 100644
--- a/modules/NamePlates.lua
+++ b/modules/NamePlates.lua
@@ -139,6 +139,7 @@ function NoobTacoUIv2:SetupNamePlates()
     E.db["nameplates"]["units"]["ENEMY_PLAYER"]["power"]["height"] = 5
     E.db["nameplates"]["units"]["ENEMY_PLAYER"]["power"]["hideWhenEmpty"] = true
     E.db["nameplates"]["units"]["ENEMY_PLAYER"]["power"]["yOffset"] = -11
+    E.db["nameplates"]["units"]["ENEMY_PLAYER"]["portrait"]["enable"] = false
     E.db["nameplates"]["units"]["ENEMY_PLAYER"]["raidTargetIndicator"]["size"] = 30
     E.db["nameplates"]["units"]["ENEMY_PLAYER"]["title"]["format"] = "[guild]"
     E.db["nameplates"]["units"]["FRIENDLY_NPC"]["buffs"]["countFont"] = "Exo2-Bold"
diff --git a/modules/UnitFrames.lua b/modules/UnitFrames.lua
index 1f6fd90..ade7883 100644
--- a/modules/UnitFrames.lua
+++ b/modules/UnitFrames.lua
@@ -2,6 +2,39 @@ local NoobTacoUIv2, E, L, V, P, G = unpack(select(2, ...))
 
 function NoobTacoUIv2:SetupLayout()
 
+    -- CUSTOM TEXTS
+    -- Player Unit Frame
+    if E.db.unitframe.units.player.customTexts then
+        E.db["unitframe"]["units"]["player"]["customTexts"]["PlayerHealth"]["enable"] = false
+        E.db["unitframe"]["units"]["player"]["customTexts"]["PlayerName"]["enable"] = false
+        E.db["unitframe"]["units"]["player"]["customTexts"]["PlayerPower"]["enable"] = false
+    end
+    -- Focus Unit Frame
+    if E.db.unitframe.units.focus.customTexts then
+        E.db["unitframe"]["units"]["focus"]["customTexts"]["TargetHealth"]["enable"] = false
+        E.db["unitframe"]["units"]["focus"]["customTexts"]["TargetLevel"]["enable"] = false
+        E.db["unitframe"]["units"]["focus"]["customTexts"]["TargetName"]["enable"] = false
+        E.db["unitframe"]["units"]["focus"]["customTexts"]["TargetPower"]["enable"] = false
+    end
+
+    -- -- Pet Unit Frame
+    if E.db.unitframe.units.pet.customTexts then
+        E.db["unitframe"]["units"]["pet"]["customTexts"]["Pet Health"]["enable"] = false
+    end
+
+    -- Target Unit Frame
+    if E.db.unitframe.units.target.customTexts then
+        E.db["unitframe"]["units"]["target"]["customTexts"]["TargetHealth"]["enable"] = false
+        E.db["unitframe"]["units"]["target"]["customTexts"]["TargetPower"]["enable"] = false
+        E.db["unitframe"]["units"]["target"]["customTexts"]["TargetName"]["enable"] = false
+        E.db["unitframe"]["units"]["target"]["customTexts"]["TargetLevel"]["enable"] = false
+    end
+
+    -- Target of Target Unit Frame
+    if E.db.unitframe.units.targettarget.customTexts then
+        E.db["unitframe"]["units"]["targettarget"]["customTexts"]["TargetTargetName"]["enable"] = false
+    end
+
     -- Extra Options not Exported by base profile
 
     E.db["unitframe"]["units"]["target"]["infoPanel"]["enable"] = false