diff --git a/env/translations_deDE.lua b/env/translations_deDE.lua
index b4c9d6ee..a43e6490 100644
--- a/env/translations_deDE.lua
+++ b/env/translations_deDE.lua
@@ -23,9 +23,9 @@ pfUI_translation["deDE"] = {
   ["Always Show Extended Vendor Values"] = nil,
   ["Always Show Health In Percent"] = nil,
   ["Always Show Item Comparison"] = nil,
+  ["Always Show On Target Units"] = nil,
+  ["Always Show On Units With Missing HP"] = nil,
   ["Always Show Self In Raid Frames"] = nil,
-  ["Always Show Target Units"] = nil,
-  ["Always Show Units With Missing HP"] = nil,
   ["Always Use 2D Portraits"] = nil,
   ["Ammo Counter"] = nil,
   ["A new installation of |cff33ffccpf|rUI ships with 4 prebuilt design profiles. Click below if you wish to load one of these profiles."] = nil,
@@ -191,6 +191,7 @@ pfUI_translation["deDE"] = {
   ["Do you really want to reset your configuration?\nThis also includes frame positions"] = nil,
   ["Do you want to disable the addon?"] = nil,
   ["Do you want to reload the UI now?"] = nil,
+  ["Draw Border Around Target Nameplate"] = nil,
   ["Draw Glow Around Target Nameplate"] = nil,
   ["Elastic Zoom"] = nil,
   ["Elysium Based Core"] = nil,
@@ -264,6 +265,7 @@ pfUI_translation["deDE"] = {
   ["Ended"] = nil,
   ["Energy Color"] = nil,
   ["Equipped Item Color"] = nil,
+  ["Estimate Debuffs"] = nil,
   ["Estimate Enemy Health Points"] = nil,
   ["Every feature that \"|cff33ffcc%s|r\" offers is already built into pfUI."] = nil,
   ["Exp"] = nil,
@@ -322,22 +324,21 @@ pfUI_translation["deDE"] = {
   ["Hide Channel Names"] = nil,
   ["Hide Chat When Bags Are Opened"] = nil,
   ["Hide Combat Log"] = nil,
-  ["Hide Critters"] = nil,
-  ["Hide Enemy NPCs"] = nil,
-  ["Hide Enemy Players"] = nil,
-  ["Hide Friendly NPCs"] = nil,
-  ["Hide Friendly Players"] = nil,
   ["Hide Group Frames While In Raid"] = nil,
-  ["Hide Neutral NPCs"] = nil,
+  ["Hide Healthbar On Critters"] = nil,
+  ["Hide Healthbar On Enemy NPCs"] = nil,
+  ["Hide Healthbar On Enemy Players"] = nil,
+  ["Hide Healthbar On Friendly NPCs"] = nil,
+  ["Hide Healthbar On Friendly Players"] = nil,
+  ["Hide Healthbar On Neutral NPCs"] = nil,
+  ["Hide Healthbar On Totems"] = nil,
   ["Hide Timeout"] = nil,
-  ["Hide Totems"] = nil,
   ["Hide When Entering Combat"] = nil,
   ["Highlight Equipped Items"] = nil,
   ["Highlight Not Usable Spells"] = nil,
   ["Highlight Out Of Mana Spells"] = nil,
   ["Highlight Out Of Range Spells"] = nil,
   ["Highlight Settings That Require Reload"] = nil,
-  ["Highlight Target Nameplate"] = nil,
   ["Highlight Unusable Items"] = nil,
   ["Honorable Kill"] = nil,
   ["Honorable Kill!"] = nil,
@@ -357,7 +358,6 @@ pfUI_translation["deDE"] = {
   ["Inputbox Height"] = nil,
   ["Inputbox Width"] = nil,
   ["Instant"] = nil,
-  ["Integrations"] = nil,
   ["Invert Health Bar"] = nil,
   ["is not allowed in profile name"] = nil,
   ["is now blacklisted."] = nil,
@@ -583,6 +583,8 @@ pfUI_translation["deDE"] = {
   ["Show Loot Icon"] = nil,
   ["Show Macro Text"] = nil,
   ["Show Meters By Default"] = nil,
+  ["Show On Friendly Units"] = nil,
+  ["Show On Hostile Units"] = nil,
   ["Show Procs Indicators"] = nil,
   ["Show Procs of all Classes"] = nil,
   ["Show PvP-Flag"] = nil,
diff --git a/env/translations_enUS.lua b/env/translations_enUS.lua
index 6b137777..049e147b 100644
--- a/env/translations_enUS.lua
+++ b/env/translations_enUS.lua
@@ -23,9 +23,9 @@ pfUI_translation["enUS"] = {
   ["Always Show Extended Vendor Values"] = nil,
   ["Always Show Health In Percent"] = nil,
   ["Always Show Item Comparison"] = nil,
+  ["Always Show On Target Units"] = nil,
+  ["Always Show On Units With Missing HP"] = nil,
   ["Always Show Self In Raid Frames"] = nil,
-  ["Always Show Target Units"] = nil,
-  ["Always Show Units With Missing HP"] = nil,
   ["Always Use 2D Portraits"] = nil,
   ["Ammo Counter"] = nil,
   ["A new installation of |cff33ffccpf|rUI ships with 4 prebuilt design profiles. Click below if you wish to load one of these profiles."] = nil,
@@ -191,6 +191,7 @@ pfUI_translation["enUS"] = {
   ["Do you really want to reset your configuration?\nThis also includes frame positions"] = nil,
   ["Do you want to disable the addon?"] = nil,
   ["Do you want to reload the UI now?"] = nil,
+  ["Draw Border Around Target Nameplate"] = nil,
   ["Draw Glow Around Target Nameplate"] = nil,
   ["Elastic Zoom"] = nil,
   ["Elysium Based Core"] = nil,
@@ -264,6 +265,7 @@ pfUI_translation["enUS"] = {
   ["Ended"] = nil,
   ["Energy Color"] = nil,
   ["Equipped Item Color"] = nil,
+  ["Estimate Debuffs"] = nil,
   ["Estimate Enemy Health Points"] = nil,
   ["Every feature that \"|cff33ffcc%s|r\" offers is already built into pfUI."] = nil,
   ["Exp"] = nil,
@@ -322,22 +324,21 @@ pfUI_translation["enUS"] = {
   ["Hide Channel Names"] = nil,
   ["Hide Chat When Bags Are Opened"] = nil,
   ["Hide Combat Log"] = nil,
-  ["Hide Critters"] = nil,
-  ["Hide Enemy NPCs"] = nil,
-  ["Hide Enemy Players"] = nil,
-  ["Hide Friendly NPCs"] = nil,
-  ["Hide Friendly Players"] = nil,
   ["Hide Group Frames While In Raid"] = nil,
-  ["Hide Neutral NPCs"] = nil,
+  ["Hide Healthbar On Critters"] = nil,
+  ["Hide Healthbar On Enemy NPCs"] = nil,
+  ["Hide Healthbar On Enemy Players"] = nil,
+  ["Hide Healthbar On Friendly NPCs"] = nil,
+  ["Hide Healthbar On Friendly Players"] = nil,
+  ["Hide Healthbar On Neutral NPCs"] = nil,
+  ["Hide Healthbar On Totems"] = nil,
   ["Hide Timeout"] = nil,
-  ["Hide Totems"] = nil,
   ["Hide When Entering Combat"] = nil,
   ["Highlight Equipped Items"] = nil,
   ["Highlight Not Usable Spells"] = nil,
   ["Highlight Out Of Mana Spells"] = nil,
   ["Highlight Out Of Range Spells"] = nil,
   ["Highlight Settings That Require Reload"] = nil,
-  ["Highlight Target Nameplate"] = nil,
   ["Highlight Unusable Items"] = nil,
   ["Honorable Kill"] = nil,
   ["Honorable Kill!"] = nil,
@@ -357,7 +358,6 @@ pfUI_translation["enUS"] = {
   ["Inputbox Height"] = nil,
   ["Inputbox Width"] = nil,
   ["Instant"] = nil,
-  ["Integrations"] = nil,
   ["Invert Health Bar"] = nil,
   ["is not allowed in profile name"] = nil,
   ["is now blacklisted."] = nil,
@@ -583,6 +583,8 @@ pfUI_translation["enUS"] = {
   ["Show Loot Icon"] = nil,
   ["Show Macro Text"] = nil,
   ["Show Meters By Default"] = nil,
+  ["Show On Friendly Units"] = nil,
+  ["Show On Hostile Units"] = nil,
   ["Show Procs Indicators"] = nil,
   ["Show Procs of all Classes"] = nil,
   ["Show PvP-Flag"] = nil,
diff --git a/env/translations_esES.lua b/env/translations_esES.lua
index 2045ba8c..ed1cfd3b 100644
--- a/env/translations_esES.lua
+++ b/env/translations_esES.lua
@@ -23,9 +23,9 @@ pfUI_translation["esES"] = {
   ["Always Show Extended Vendor Values"] = "Siempre mostrar los valores de vendedor extendidos",
   ["Always Show Health In Percent"] = nil,
   ["Always Show Item Comparison"] = "Siempre mostrar comparación de objetos",
+  ["Always Show On Target Units"] = nil,
+  ["Always Show On Units With Missing HP"] = nil,
   ["Always Show Self In Raid Frames"] = "Siempre se muestra a sí mismo en los marcos de banda",
-  ["Always Show Target Units"] = nil,
-  ["Always Show Units With Missing HP"] = nil,
   ["Always Use 2D Portraits"] = "Siempre usar retratos 2D",
   ["Ammo Counter"] = "Contador de munición",
   ["A new installation of |cff33ffccpf|rUI ships with 4 prebuilt design profiles. Click below if you wish to load one of these profiles."] = "Una nueva instalación de |cff33ffccpf|rUI se envía con 4 perfiles de diseño precompilados. Haga clic si desea cargar uno de estos perfiles.",
@@ -191,6 +191,7 @@ pfUI_translation["esES"] = {
   ["Do you really want to reset your configuration?\nThis also includes frame positions"] = "¿Estás seguro/a de que quieres reiniciar tu configuración?\nEsto también incluye la posición de los marcos",
   ["Do you want to disable the addon?"] = "¿Quieres desactivar el addon?",
   ["Do you want to reload the UI now?"] = "¿Quieres recargar la IU ahora?",
+  ["Draw Border Around Target Nameplate"] = nil,
   ["Draw Glow Around Target Nameplate"] = "Brillar alrededor de la placa identificativa del objetivo",
   ["Elastic Zoom"] = "Acerca elástico",
   ["Elysium Based Core"] = "Núcleo basado en Elysium",
@@ -264,6 +265,7 @@ pfUI_translation["esES"] = {
   ["Ended"] = "Terminado",
   ["Energy Color"] = "Color de energía",
   ["Equipped Item Color"] = "Color del objeto equipado",
+  ["Estimate Debuffs"] = nil,
   ["Estimate Enemy Health Points"] = nil,
   ["Every feature that \"|cff33ffcc%s|r\" offers is already built into pfUI."] = "Todas las características que \"|cff33ffcc%s|r\" ofrece ya están embutidas en pfUI.",
   ["Exp"] = "Exp",
@@ -322,22 +324,21 @@ pfUI_translation["esES"] = {
   ["Hide Channel Names"] = "Ocultar nombres de canales",
   ["Hide Chat When Bags Are Opened"] = "Ocultar el chat al abrir las bolsas",
   ["Hide Combat Log"] = "Ocultar el registro del combate",
-  ["Hide Critters"] = "Ocultar alimañas",
-  ["Hide Enemy NPCs"] = nil,
-  ["Hide Enemy Players"] = nil,
-  ["Hide Friendly NPCs"] = nil,
-  ["Hide Friendly Players"] = nil,
   ["Hide Group Frames While In Raid"] = "Ocultar los marcos de grupo mientras estés en banda",
-  ["Hide Neutral NPCs"] = nil,
+  ["Hide Healthbar On Critters"] = nil,
+  ["Hide Healthbar On Enemy NPCs"] = nil,
+  ["Hide Healthbar On Enemy Players"] = nil,
+  ["Hide Healthbar On Friendly NPCs"] = nil,
+  ["Hide Healthbar On Friendly Players"] = nil,
+  ["Hide Healthbar On Neutral NPCs"] = nil,
+  ["Hide Healthbar On Totems"] = nil,
   ["Hide Timeout"] = "Ocultar temporizador",
-  ["Hide Totems"] = "Ocultar tótems",
   ["Hide When Entering Combat"] = "Ocultar si entras combate",
   ["Highlight Equipped Items"] = "Resaltar objetos equipados",
   ["Highlight Not Usable Spells"] = "Resaltar hechizos inutilizables",
   ["Highlight Out Of Mana Spells"] = "Resaltar hechizos que faltas maná para lanzarse",
   ["Highlight Out Of Range Spells"] = "Resaltar hechizos fuera de alcance",
   ["Highlight Settings That Require Reload"] = "Resaltar opciones que requieren recarga",
-  ["Highlight Target Nameplate"] = "Resaltar la placa identificativa del objetivo",
   ["Highlight Unusable Items"] = "Resaltar objetos inutilizables",
   ["Honorable Kill"] = "Muerte con honor",
   ["Honorable Kill!"] = "¡Muerte con honor!",
@@ -357,7 +358,6 @@ pfUI_translation["esES"] = {
   ["Inputbox Height"] = "Altura de la barra de entrada",
   ["Inputbox Width"] = "Ancho de la barra de entrada",
   ["Instant"] = "Instantáneo",
-  ["Integrations"] = "Integraciones",
   ["Invert Health Bar"] = "Invertir la barra de salud",
   ["is not allowed in profile name"] = "no se permite en el nombre de perfil",
   ["is now blacklisted."] = "está en la lista negra.",
@@ -583,6 +583,8 @@ pfUI_translation["esES"] = {
   ["Show Loot Icon"] = "Mostrar icono de botín",
   ["Show Macro Text"] = "Mostrar texto de macro",
   ["Show Meters By Default"] = "Mostrar medidores por defecto",
+  ["Show On Friendly Units"] = nil,
+  ["Show On Hostile Units"] = nil,
   ["Show Procs Indicators"] = nil,
   ["Show Procs of all Classes"] = "Mostrar procs de todas las clases",
   ["Show PvP-Flag"] = "Mostrar bandera de JcJ",
diff --git a/env/translations_frFR.lua b/env/translations_frFR.lua
index 9273be5c..507442b4 100644
--- a/env/translations_frFR.lua
+++ b/env/translations_frFR.lua
@@ -23,9 +23,9 @@ pfUI_translation["frFR"] = {
   ["Always Show Extended Vendor Values"] = "Toujours afficher les valeurs étendues du vendeur",
   ["Always Show Health In Percent"] = nil,
   ["Always Show Item Comparison"] = "Toujours afficher la comparaison d'objet",
+  ["Always Show On Target Units"] = nil,
+  ["Always Show On Units With Missing HP"] = nil,
   ["Always Show Self In Raid Frames"] = nil,
-  ["Always Show Target Units"] = nil,
-  ["Always Show Units With Missing HP"] = nil,
   ["Always Use 2D Portraits"] = "Toujours utiliser les portraits 2D",
   ["Ammo Counter"] = "Compteur de munitions",
   ["A new installation of |cff33ffccpf|rUI ships with 4 prebuilt design profiles. Click below if you wish to load one of these profiles."] = nil,
@@ -191,6 +191,7 @@ pfUI_translation["frFR"] = {
   ["Do you really want to reset your configuration?\nThis also includes frame positions"] = "Souhaitez-vous vraiment réinitialiser votre configuration ?\nCela inclut la position des cadres",
   ["Do you want to disable the addon?"] = nil,
   ["Do you want to reload the UI now?"] = nil,
+  ["Draw Border Around Target Nameplate"] = nil,
   ["Draw Glow Around Target Nameplate"] = nil,
   ["Elastic Zoom"] = nil,
   ["Elysium Based Core"] = "Basé sur le core d'Elysium",
@@ -264,6 +265,7 @@ pfUI_translation["frFR"] = {
   ["Ended"] = nil,
   ["Energy Color"] = nil,
   ["Equipped Item Color"] = nil,
+  ["Estimate Debuffs"] = nil,
   ["Estimate Enemy Health Points"] = nil,
   ["Every feature that \"|cff33ffcc%s|r\" offers is already built into pfUI."] = nil,
   ["Exp"] = nil,
@@ -322,22 +324,21 @@ pfUI_translation["frFR"] = {
   ["Hide Channel Names"] = "Cacher le nom des canaux",
   ["Hide Chat When Bags Are Opened"] = nil,
   ["Hide Combat Log"] = "Cacher le journal de combat",
-  ["Hide Critters"] = "Cacher les Bestioles",
-  ["Hide Enemy NPCs"] = nil,
-  ["Hide Enemy Players"] = nil,
-  ["Hide Friendly NPCs"] = nil,
-  ["Hide Friendly Players"] = nil,
   ["Hide Group Frames While In Raid"] = "Cacher l'UI Groupe en Raid",
-  ["Hide Neutral NPCs"] = nil,
+  ["Hide Healthbar On Critters"] = nil,
+  ["Hide Healthbar On Enemy NPCs"] = nil,
+  ["Hide Healthbar On Enemy Players"] = nil,
+  ["Hide Healthbar On Friendly NPCs"] = nil,
+  ["Hide Healthbar On Friendly Players"] = nil,
+  ["Hide Healthbar On Neutral NPCs"] = nil,
+  ["Hide Healthbar On Totems"] = nil,
   ["Hide Timeout"] = nil,
-  ["Hide Totems"] = nil,
   ["Hide When Entering Combat"] = nil,
   ["Highlight Equipped Items"] = nil,
   ["Highlight Not Usable Spells"] = nil,
   ["Highlight Out Of Mana Spells"] = nil,
   ["Highlight Out Of Range Spells"] = nil,
   ["Highlight Settings That Require Reload"] = nil,
-  ["Highlight Target Nameplate"] = nil,
   ["Highlight Unusable Items"] = nil,
   ["Honorable Kill"] = nil,
   ["Honorable Kill!"] = nil,
@@ -357,7 +358,6 @@ pfUI_translation["frFR"] = {
   ["Inputbox Height"] = "Hauteur du champ de saisie du texte",
   ["Inputbox Width"] = "Largeur du champ de saisie du texte",
   ["Instant"] = "Instantané",
-  ["Integrations"] = nil,
   ["Invert Health Bar"] = "Inverser les barres de vie",
   ["is not allowed in profile name"] = "n'est pas autorisé comme nom de profil",
   ["is now blacklisted."] = nil,
@@ -583,6 +583,8 @@ pfUI_translation["frFR"] = {
   ["Show Loot Icon"] = nil,
   ["Show Macro Text"] = "Afficher le texte des macros",
   ["Show Meters By Default"] = nil,
+  ["Show On Friendly Units"] = nil,
+  ["Show On Hostile Units"] = nil,
   ["Show Procs Indicators"] = nil,
   ["Show Procs of all Classes"] = "Afficher les procs de chaque classe",
   ["Show PvP-Flag"] = nil,
diff --git a/env/translations_koKR.lua b/env/translations_koKR.lua
index b8c1da9e..0bd23439 100644
--- a/env/translations_koKR.lua
+++ b/env/translations_koKR.lua
@@ -23,9 +23,9 @@ pfUI_translation["koKR"] = {
   ["Always Show Extended Vendor Values"] = "항상 NPC에게 판매가 표시",
   ["Always Show Health In Percent"] = nil,
   ["Always Show Item Comparison"] = "항상 착용 장비와 비교 표시",
+  ["Always Show On Target Units"] = nil,
+  ["Always Show On Units With Missing HP"] = nil,
   ["Always Show Self In Raid Frames"] = nil,
-  ["Always Show Target Units"] = nil,
-  ["Always Show Units With Missing HP"] = nil,
   ["Always Use 2D Portraits"] = "항상 2D초상화 사용",
   ["Ammo Counter"] = "탄약 갯수",
   ["A new installation of |cff33ffccpf|rUI ships with 4 prebuilt design profiles. Click below if you wish to load one of these profiles."] = nil,
@@ -191,6 +191,7 @@ pfUI_translation["koKR"] = {
   ["Do you really want to reset your configuration?\nThis also includes frame positions"] = "정말로 구성을 재설정 하시겠습니까?\n여기에는 프레임 위치도 포함됩니다.",
   ["Do you want to disable the addon?"] = nil,
   ["Do you want to reload the UI now?"] = nil,
+  ["Draw Border Around Target Nameplate"] = nil,
   ["Draw Glow Around Target Nameplate"] = nil,
   ["Elastic Zoom"] = nil,
   ["Elysium Based Core"] = "엘리시움 기반 코어",
@@ -264,6 +265,7 @@ pfUI_translation["koKR"] = {
   ["Ended"] = nil,
   ["Energy Color"] = nil,
   ["Equipped Item Color"] = nil,
+  ["Estimate Debuffs"] = nil,
   ["Estimate Enemy Health Points"] = nil,
   ["Every feature that \"|cff33ffcc%s|r\" offers is already built into pfUI."] = nil,
   ["Exp"] = "경험치",
@@ -322,22 +324,21 @@ pfUI_translation["koKR"] = {
   ["Hide Channel Names"] = "채널 이름 숨기기",
   ["Hide Chat When Bags Are Opened"] = nil,
   ["Hide Combat Log"] = "전투 기록 숨기기",
-  ["Hide Critters"] = "동물 가리기",
-  ["Hide Enemy NPCs"] = nil,
-  ["Hide Enemy Players"] = nil,
-  ["Hide Friendly NPCs"] = nil,
-  ["Hide Friendly Players"] = nil,
   ["Hide Group Frames While In Raid"] = nil,
-  ["Hide Neutral NPCs"] = nil,
+  ["Hide Healthbar On Critters"] = nil,
+  ["Hide Healthbar On Enemy NPCs"] = nil,
+  ["Hide Healthbar On Enemy Players"] = nil,
+  ["Hide Healthbar On Friendly NPCs"] = nil,
+  ["Hide Healthbar On Friendly Players"] = nil,
+  ["Hide Healthbar On Neutral NPCs"] = nil,
+  ["Hide Healthbar On Totems"] = nil,
   ["Hide Timeout"] = nil,
-  ["Hide Totems"] = nil,
   ["Hide When Entering Combat"] = nil,
   ["Highlight Equipped Items"] = nil,
   ["Highlight Not Usable Spells"] = nil,
   ["Highlight Out Of Mana Spells"] = nil,
   ["Highlight Out Of Range Spells"] = nil,
   ["Highlight Settings That Require Reload"] = nil,
-  ["Highlight Target Nameplate"] = nil,
   ["Highlight Unusable Items"] = nil,
   ["Honorable Kill"] = nil,
   ["Honorable Kill!"] = nil,
@@ -357,7 +358,6 @@ pfUI_translation["koKR"] = {
   ["Inputbox Height"] = "챗팅 입력창 높이",
   ["Inputbox Width"] = "챗팅 입력창 넓이",
   ["Instant"] = "즉시",
-  ["Integrations"] = nil,
   ["Invert Health Bar"] = "체력바 반전",
   ["is not allowed in profile name"] = "프로필 이름에 허용되지 않습니다.",
   ["is now blacklisted."] = nil,
@@ -583,6 +583,8 @@ pfUI_translation["koKR"] = {
   ["Show Loot Icon"] = nil,
   ["Show Macro Text"] = "매크로 텍스트 표시",
   ["Show Meters By Default"] = nil,
+  ["Show On Friendly Units"] = nil,
+  ["Show On Hostile Units"] = nil,
   ["Show Procs Indicators"] = nil,
   ["Show Procs of all Classes"] = "모든 클래스 무기활성화 버프 보기",
   ["Show PvP-Flag"] = nil,
diff --git a/env/translations_ruRU.lua b/env/translations_ruRU.lua
index a8f384b3..7a4618f4 100644
--- a/env/translations_ruRU.lua
+++ b/env/translations_ruRU.lua
@@ -23,9 +23,9 @@ pfUI_translation["ruRU"] = {
   ["Always Show Extended Vendor Values"] = "Всегда показывать стоимость покупки/продажи предметов",
   ["Always Show Health In Percent"] = nil,
   ["Always Show Item Comparison"] = "Всегда показывать сравнение предметов",
+  ["Always Show On Target Units"] = nil,
+  ["Always Show On Units With Missing HP"] = nil,
   ["Always Show Self In Raid Frames"] = "Всегда показывать себя в рейде",
-  ["Always Show Target Units"] = "Всегда показывать цель юнитов",
-  ["Always Show Units With Missing HP"] = "Всегда показывать юнитов с отсутствующим здоровьем",
   ["Always Use 2D Portraits"] = "Всегда использовать 2D портреты",
   ["Ammo Counter"] = "Счетчик боеприпасов",
   ["A new installation of |cff33ffccpf|rUI ships with 4 prebuilt design profiles. Click below if you wish to load one of these profiles."] = "Новая установка |cff33ffccpf|rUI предлагает 4 предварительно созданных профиля дизайна. Нажмите ниже, если вы хотите загрузить один из этих профилей.",
@@ -191,6 +191,7 @@ pfUI_translation["ruRU"] = {
   ["Do you really want to reset your configuration?\nThis also includes frame positions"] = "Вы действительно хотите сбросить вашу конфигурацию?\nЭто также включает расположение окон",
   ["Do you want to disable the addon?"] = "Вы хотите отключить аддон?",
   ["Do you want to reload the UI now?"] = "Вы хотите перезагрузить интерфейс сейчас?",
+  ["Draw Border Around Target Nameplate"] = nil,
   ["Draw Glow Around Target Nameplate"] = "Рисовать свечение около индикатора здоровья цели",
   ["Elastic Zoom"] = "Эластичное увеличение",
   ["Elysium Based Core"] = "Ядро на основе Elysium",
@@ -264,6 +265,7 @@ pfUI_translation["ruRU"] = {
   ["Ended"] = "Окончание",
   ["Energy Color"] = "Цвет энергии",
   ["Equipped Item Color"] = "Цвет экипированных предметов",
+  ["Estimate Debuffs"] = nil,
   ["Estimate Enemy Health Points"] = nil,
   ["Every feature that \"|cff33ffcc%s|r\" offers is already built into pfUI."] = "Каждая функция, которую предлагает \"|cff33ffcc%s|r\", уже встроена в pfUI.",
   ["Exp"] = "Опыт",
@@ -322,22 +324,21 @@ pfUI_translation["ruRU"] = {
   ["Hide Channel Names"] = "Скрыть названия каналов",
   ["Hide Chat When Bags Are Opened"] = "Скрыть чат, когда сумки открыты",
   ["Hide Combat Log"] = "Скрыть журнал боя",
-  ["Hide Critters"] = "Скрыть существ",
-  ["Hide Enemy NPCs"] = "Скрыть вражеских NPC",
-  ["Hide Enemy Players"] = "Скрыть вражеских игроков",
-  ["Hide Friendly NPCs"] = "Скрыть дружеских NPC",
-  ["Hide Friendly Players"] = "Скрыть дружеских игроков",
   ["Hide Group Frames While In Raid"] = "Скрыть окно группы, когда в рейде",
-  ["Hide Neutral NPCs"] = "Скрыть нейтральных NPC",
+  ["Hide Healthbar On Critters"] = nil,
+  ["Hide Healthbar On Enemy NPCs"] = nil,
+  ["Hide Healthbar On Enemy Players"] = nil,
+  ["Hide Healthbar On Friendly NPCs"] = nil,
+  ["Hide Healthbar On Friendly Players"] = nil,
+  ["Hide Healthbar On Neutral NPCs"] = nil,
+  ["Hide Healthbar On Totems"] = nil,
   ["Hide Timeout"] = "Время до скрытия",
-  ["Hide Totems"] = "Скрыть тотемы",
   ["Hide When Entering Combat"] = "Скрыть при вхождении в режим боя",
   ["Highlight Equipped Items"] = "Выделять экипированные предметы",
   ["Highlight Not Usable Spells"] = "Выделять заклинания, которые нельзя использовать",
   ["Highlight Out Of Mana Spells"] = "Выделять заклинания для которых недостаточно маны",
   ["Highlight Out Of Range Spells"] = "Выделять заклинания вне зоны действия",
   ["Highlight Settings That Require Reload"] = "Выделить параметры, требующие перезагрузки",
-  ["Highlight Target Nameplate"] = "Выделить индикатор здоровья цели",
   ["Highlight Unusable Items"] = "Выделить предметы, которые не могут быть использованы",
   ["Honorable Kill"] = "Почетная победа",
   ["Honorable Kill!"] = "Почетная победа!",
@@ -357,7 +358,6 @@ pfUI_translation["ruRU"] = {
   ["Inputbox Height"] = "Высота поля ввода",
   ["Inputbox Width"] = "Ширина поля ввода",
   ["Instant"] = "Мгновенно",
-  ["Integrations"] = "Интеграции",
   ["Invert Health Bar"] = "Инвертировать панель здоровья",
   ["is not allowed in profile name"] = "не разрешено в имени профиля",
   ["is now blacklisted."] = " в \"черном\" списке.",
@@ -583,6 +583,8 @@ pfUI_translation["ruRU"] = {
   ["Show Loot Icon"] = "Показать иконку добычи",
   ["Show Macro Text"] = "Показать текст макросов",
   ["Show Meters By Default"] = "Показать счетчики по умолчанию",
+  ["Show On Friendly Units"] = nil,
+  ["Show On Hostile Units"] = nil,
   ["Show Procs Indicators"] = nil,
   ["Show Procs of all Classes"] = "Показать проки (Procs) всех классов",
   ["Show PvP-Flag"] = "Показать PvP иконку",
diff --git a/env/translations_zhCN.lua b/env/translations_zhCN.lua
index 4e452af2..1d2a0d63 100644
--- a/env/translations_zhCN.lua
+++ b/env/translations_zhCN.lua
@@ -23,9 +23,9 @@ pfUI_translation["zhCN"] = {
   ["Always Show Extended Vendor Values"] = "始终显示售卖价格",
   ["Always Show Health In Percent"] = nil,
   ["Always Show Item Comparison"] = "始终显示装备比较(或按SHIFT键)",
+  ["Always Show On Target Units"] = nil,
+  ["Always Show On Units With Missing HP"] = nil,
   ["Always Show Self In Raid Frames"] = nil,
-  ["Always Show Target Units"] = nil,
-  ["Always Show Units With Missing HP"] = nil,
   ["Always Use 2D Portraits"] = "始终使用2D头像",
   ["Ammo Counter"] = "弹药数量",
   ["A new installation of |cff33ffccpf|rUI ships with 4 prebuilt design profiles. Click below if you wish to load one of these profiles."] = "pfUI的新安装自带4以下四种预设风格.点击下方可选择其一",
@@ -191,6 +191,7 @@ pfUI_translation["zhCN"] = {
   ["Do you really want to reset your configuration?\nThis also includes frame positions"] = "你是否要还原设置？\n这将包括框架位置。",
   ["Do you want to disable the addon?"] = nil,
   ["Do you want to reload the UI now?"] = nil,
+  ["Draw Border Around Target Nameplate"] = nil,
   ["Draw Glow Around Target Nameplate"] = nil,
   ["Elastic Zoom"] = "弹性变焦",
   ["Elysium Based Core"] = "Elysium Based Core",
@@ -264,6 +265,7 @@ pfUI_translation["zhCN"] = {
   ["Ended"] = nil,
   ["Energy Color"] = nil,
   ["Equipped Item Color"] = "已装备物品颜色",
+  ["Estimate Debuffs"] = nil,
   ["Estimate Enemy Health Points"] = nil,
   ["Every feature that \"|cff33ffcc%s|r\" offers is already built into pfUI."] = nil,
   ["Exp"] = "经验",
@@ -322,22 +324,21 @@ pfUI_translation["zhCN"] = {
   ["Hide Channel Names"] = "隐藏频道名称",
   ["Hide Chat When Bags Are Opened"] = "打开背包后隐藏聊天框",
   ["Hide Combat Log"] = "隐藏战斗日志",
-  ["Hide Critters"] = "隐藏小动物",
-  ["Hide Enemy NPCs"] = nil,
-  ["Hide Enemy Players"] = nil,
-  ["Hide Friendly NPCs"] = nil,
-  ["Hide Friendly Players"] = nil,
   ["Hide Group Frames While In Raid"] = "在团队框架下隐藏小队框架",
-  ["Hide Neutral NPCs"] = nil,
+  ["Hide Healthbar On Critters"] = nil,
+  ["Hide Healthbar On Enemy NPCs"] = nil,
+  ["Hide Healthbar On Enemy Players"] = nil,
+  ["Hide Healthbar On Friendly NPCs"] = nil,
+  ["Hide Healthbar On Friendly Players"] = nil,
+  ["Hide Healthbar On Neutral NPCs"] = nil,
+  ["Hide Healthbar On Totems"] = nil,
   ["Hide Timeout"] = nil,
-  ["Hide Totems"] = "隐藏图腾",
   ["Hide When Entering Combat"] = "进入战斗时隐藏",
   ["Highlight Equipped Items"] = "高亮已装备的物品",
   ["Highlight Not Usable Spells"] = "高亮无法使用的法术",
   ["Highlight Out Of Mana Spells"] = "高亮缺能量(蓝)而无法施放的法术",
   ["Highlight Out Of Range Spells"] = "高亮超出范围的法术",
   ["Highlight Settings That Require Reload"] = "用[!]突出需要重新加载UI的设置",
-  ["Highlight Target Nameplate"] = "高亮目标姓名板",
   ["Highlight Unusable Items"] = "高亮无法使用的物品",
   ["Honorable Kill"] = nil,
   ["Honorable Kill!"] = nil,
@@ -357,7 +358,6 @@ pfUI_translation["zhCN"] = {
   ["Inputbox Height"] = "输入框高度",
   ["Inputbox Width"] = "输入框宽度",
   ["Instant"] = "极快",
-  ["Integrations"] = "pfUI自带接口",
   ["Invert Health Bar"] = "血量反色显示",
   ["is not allowed in profile name"] = "在配置文件名中不允许",
   ["is now blacklisted."] = "已加入黑名单",
@@ -583,6 +583,8 @@ pfUI_translation["zhCN"] = {
   ["Show Loot Icon"] = nil,
   ["Show Macro Text"] = "显示宏的名字",
   ["Show Meters By Default"] = "由默认显示其他接口表",
+  ["Show On Friendly Units"] = nil,
+  ["Show On Hostile Units"] = nil,
   ["Show Procs Indicators"] = nil,
   ["Show Procs of all Classes"] = "显示所有职业的触发效果",
   ["Show PvP-Flag"] = "显示PvP指示器",
diff --git a/env/translations_zhTW.lua b/env/translations_zhTW.lua
index 46536823..0a3a303a 100644
--- a/env/translations_zhTW.lua
+++ b/env/translations_zhTW.lua
@@ -23,9 +23,9 @@ pfUI_translation["zhTW"] = {
   ["Always Show Extended Vendor Values"] = "始終顯示售賣價格",
   ["Always Show Health In Percent"] = nil,
   ["Always Show Item Comparison"] = "始終顯示裝備比較",
+  ["Always Show On Target Units"] = nil,
+  ["Always Show On Units With Missing HP"] = nil,
   ["Always Show Self In Raid Frames"] = nil,
-  ["Always Show Target Units"] = nil,
-  ["Always Show Units With Missing HP"] = nil,
   ["Always Use 2D Portraits"] = "始終使用2D頭像",
   ["Ammo Counter"] = "彈藥數量",
   ["A new installation of |cff33ffccpf|rUI ships with 4 prebuilt design profiles. Click below if you wish to load one of these profiles."] = "pfUI的安裝內建有四種風格.點選以下讀取其一",
@@ -191,6 +191,7 @@ pfUI_translation["zhTW"] = {
   ["Do you really want to reset your configuration?\nThis also includes frame positions"] = "你是否要還原設置？\n這將包括框架位置。",
   ["Do you want to disable the addon?"] = nil,
   ["Do you want to reload the UI now?"] = nil,
+  ["Draw Border Around Target Nameplate"] = nil,
   ["Draw Glow Around Target Nameplate"] = nil,
   ["Elastic Zoom"] = nil,
   ["Elysium Based Core"] = "Elysium Based Core",
@@ -264,6 +265,7 @@ pfUI_translation["zhTW"] = {
   ["Ended"] = nil,
   ["Energy Color"] = nil,
   ["Equipped Item Color"] = nil,
+  ["Estimate Debuffs"] = nil,
   ["Estimate Enemy Health Points"] = nil,
   ["Every feature that \"|cff33ffcc%s|r\" offers is already built into pfUI."] = nil,
   ["Exp"] = "經驗",
@@ -322,22 +324,21 @@ pfUI_translation["zhTW"] = {
   ["Hide Channel Names"] = "隱藏頻道名稱",
   ["Hide Chat When Bags Are Opened"] = "打開背包後隱藏聊天框",
   ["Hide Combat Log"] = "隱藏戰鬥日誌",
-  ["Hide Critters"] = "隱藏小動物",
-  ["Hide Enemy NPCs"] = nil,
-  ["Hide Enemy Players"] = nil,
-  ["Hide Friendly NPCs"] = nil,
-  ["Hide Friendly Players"] = nil,
   ["Hide Group Frames While In Raid"] = "在團隊框架下隱藏小隊框架",
-  ["Hide Neutral NPCs"] = nil,
+  ["Hide Healthbar On Critters"] = nil,
+  ["Hide Healthbar On Enemy NPCs"] = nil,
+  ["Hide Healthbar On Enemy Players"] = nil,
+  ["Hide Healthbar On Friendly NPCs"] = nil,
+  ["Hide Healthbar On Friendly Players"] = nil,
+  ["Hide Healthbar On Neutral NPCs"] = nil,
+  ["Hide Healthbar On Totems"] = nil,
   ["Hide Timeout"] = nil,
-  ["Hide Totems"] = "隱藏圖騰",
   ["Hide When Entering Combat"] = nil,
   ["Highlight Equipped Items"] = nil,
   ["Highlight Not Usable Spells"] = nil,
   ["Highlight Out Of Mana Spells"] = nil,
   ["Highlight Out Of Range Spells"] = nil,
   ["Highlight Settings That Require Reload"] = "用[!]突出需要重新加載UI的設置",
-  ["Highlight Target Nameplate"] = "高亮目標姓名板",
   ["Highlight Unusable Items"] = "高光不可使用道具",
   ["Honorable Kill"] = nil,
   ["Honorable Kill!"] = nil,
@@ -357,7 +358,6 @@ pfUI_translation["zhTW"] = {
   ["Inputbox Height"] = "輸入框高度",
   ["Inputbox Width"] = "輸入框寬度",
   ["Instant"] = "極快",
-  ["Integrations"] = nil,
   ["Invert Health Bar"] = "血量反色顯示",
   ["is not allowed in profile name"] = "在設定檔名中不允許",
   ["is now blacklisted."] = "已加入黑名單",
@@ -583,6 +583,8 @@ pfUI_translation["zhTW"] = {
   ["Show Loot Icon"] = nil,
   ["Show Macro Text"] = "顯示巨集的名字",
   ["Show Meters By Default"] = "由默認顯示其他介面表",
+  ["Show On Friendly Units"] = nil,
+  ["Show On Hostile Units"] = nil,
   ["Show Procs Indicators"] = nil,
   ["Show Procs of all Classes"] = "顯示所有職業的觸發效果",
   ["Show PvP-Flag"] = "顯示PvP指示器",