diff --git a/env/translations_deDE.lua b/env/translations_deDE.lua
index 914fd8bc..b36be66f 100644
--- a/env/translations_deDE.lua
+++ b/env/translations_deDE.lua
@@ -34,6 +34,7 @@ pfUI_translation["deDE"] = {
   ["Buff Indicator Size"] = nil,
   ["Buff Limit"] = nil,
   ["Buff Position"] = nil,
+  ["Buffs Class Buffs"] = nil,
   ["Buff Size"] = nil,
   ["Buffs"] = nil,
   ["Buff Spacing"] = nil,
@@ -68,7 +69,11 @@ pfUI_translation["deDE"] = {
   ["Clickcast Spells"] = nil,
   ["Clock"] = nil,
   ["Close"] = nil,
+  ["Colorize Unknown Classes"] = nil,
   ["Combat"] = nil,
+  ["Combat Text Font"] = nil,
+  ["Combat Text"] = nil,
+  ["Combat Text Size"] = nil,
   ["Combat Timer"] = nil,
   ["Combopoint Size"] = nil,
   ["Compare Item Base Stats"] = nil,
@@ -95,6 +100,10 @@ pfUI_translation["deDE"] = {
   ["Custom Health Bar Color"] = nil,
   ["Customize"] = nil,
   ["Custom Transparency"] = nil,
+  ["Debuff Indicator Display"] = nil,
+  ["Debuff Indicator Position"] = nil,
+  ["Debuff Indicator Size"] = nil,
+  ["Debuff Indicators"] = nil,
   ["Debuff Limit"] = nil,
   ["Debuff Position"] = nil,
   ["Debuff Size"] = nil,
@@ -147,7 +156,6 @@ pfUI_translation["deDE"] = {
   ["Enable Autohide For Right Chat Panel"] = nil,
   ["Enable Auto-Resize Loot Frame"] = nil,
   ["Enable Buff Display"] = nil,
-  ["Enable Buff Indicators"] = nil,
   ["Enable Castbars"] = nil,
   ["Enable Chat Bubbles"] = nil,
   ["Enable Chat Dock Background"] = nil,
@@ -167,14 +175,12 @@ pfUI_translation["deDE"] = {
   ["Enable Custom Colors"] = nil,
   ["Enable Custom Incoming Whispers Layout"] = nil,
   ["Enable Debuff Display"] = nil,
-  ["Enable Debuff Indicators"] = nil,
   ["Enable Debuffs"] = nil,
   ["Enable Durations On Blizzard Frames"] = nil,
   ["Enable Durations On Foreign Frames"] = nil,
   ["Enable Energy Ticks"] = nil,
   ["Enable Extended Guild Information"] = nil,
   ["Enable Health Color"] = nil,
-  ["Enable Hit Indicator"] = nil,
   ["Enable Item Quality Color For Equipment Only"] = nil,
   ["Enable Left Actionbar (BottomRight)"] = nil,
   ["Enable Level Color"] = nil,
@@ -222,6 +228,7 @@ pfUI_translation["deDE"] = {
   ["Friends Online"] = nil,
   ["General"] = nil,
   ["Global Border Size"] = nil,
+  ["Glow"] = nil,
   ["GM-Mode"] = nil,
   ["Gold"] = nil,
   ["Graphic Renderer"] = nil,
@@ -251,11 +258,9 @@ pfUI_translation["deDE"] = {
   ["Highlight Settings That Require Reload"] = nil,
   ["Highlight Target Nameplate"] = nil,
   ["Highlight Unusable Items"] = nil,
-  ["Hit Indicator"] = nil,
-  ["Hit Indicator Text Font"] = nil,
-  ["Hit Indicator Text Size"] = nil,
   ["Hoverbind"] = nil,
   ["Huge (PixelPerfect)"] = nil,
+  ["Icon"] = nil,
   ["Icon Size"] = nil,
   ["Ignore Layout"] = nil,
   ["Import"] = nil,
@@ -280,6 +285,7 @@ pfUI_translation["deDE"] = {
   ["Left Panel: Right"] = nil,
   ["Left Text"] = nil,
   ["Legacy Click Handlers (Breaks Vertical Position and Overlap)"] = nil,
+  ["Legacy"] = nil,
   ["Level"] = nil,
   ["Load profile"] = nil,
   ["Localtime"] = nil,
@@ -387,6 +393,7 @@ pfUI_translation["deDE"] = {
   ["Settings"] = nil,
   ["Shapeshift Bar (BarShapeShift)"] = nil,
   ["Shift-Click Action"] = nil,
+  ["Show Combat Text"] = nil,
   ["Show Duration Inside Buff"] = nil,
   ["Show Equipped Items"] = nil,
   ["Show Health Points"] = nil,
@@ -402,7 +409,7 @@ pfUI_translation["deDE"] = {
   ["Show Players Only"] = nil,
   ["Show Procs as Buff Indicators"] = nil,
   ["Show Procs of all Classes"] = nil,
-  ["Show PvP-Flag Indicator"] = nil,
+  ["Show PvP-Flag"] = nil,
   ["Show PvP Icon"] = nil,
   ["Show Self in Group Frames"] = nil,
   ["Show Totems as Buff Indicators"] = nil,
@@ -414,6 +421,7 @@ pfUI_translation["deDE"] = {
   ["Soulshard Counter"] = nil,
   ["Soulshards"] = nil,
   ["Special Recipient"] = nil,
+  ["Square"] = nil,
   ["Standard Text Font"] = nil,
   ["Standard Text Font Size"] = nil,
   ["Status Bar Texture"] = nil,
@@ -447,6 +455,7 @@ pfUI_translation["deDE"] = {
   ["Unit Frame Text Font"] = nil,
   ["Unit Frame Text Size"] = nil,
   ["Unit String"] = nil,
+  ["Unknown Class Color"] = nil,
   ["Unlock"] = nil,
   ["Unusable Item Color"] = nil,
   ["Use Chat Colors for Meters"] = nil,
diff --git a/env/translations_enUS.lua b/env/translations_enUS.lua
index bc00d8e2..04611625 100644
--- a/env/translations_enUS.lua
+++ b/env/translations_enUS.lua
@@ -34,6 +34,7 @@ pfUI_translation["enUS"] = {
   ["Buff Indicator Size"] = nil,
   ["Buff Limit"] = nil,
   ["Buff Position"] = nil,
+  ["Buffs Class Buffs"] = nil,
   ["Buff Size"] = nil,
   ["Buffs"] = nil,
   ["Buff Spacing"] = nil,
@@ -68,7 +69,11 @@ pfUI_translation["enUS"] = {
   ["Clickcast Spells"] = nil,
   ["Clock"] = nil,
   ["Close"] = nil,
+  ["Colorize Unknown Classes"] = nil,
   ["Combat"] = nil,
+  ["Combat Text Font"] = nil,
+  ["Combat Text"] = nil,
+  ["Combat Text Size"] = nil,
   ["Combat Timer"] = nil,
   ["Combopoint Size"] = nil,
   ["Compare Item Base Stats"] = nil,
@@ -95,6 +100,10 @@ pfUI_translation["enUS"] = {
   ["Custom Health Bar Color"] = nil,
   ["Customize"] = nil,
   ["Custom Transparency"] = nil,
+  ["Debuff Indicator Display"] = nil,
+  ["Debuff Indicator Position"] = nil,
+  ["Debuff Indicator Size"] = nil,
+  ["Debuff Indicators"] = nil,
   ["Debuff Limit"] = nil,
   ["Debuff Position"] = nil,
   ["Debuff Size"] = nil,
@@ -147,7 +156,6 @@ pfUI_translation["enUS"] = {
   ["Enable Autohide For Right Chat Panel"] = nil,
   ["Enable Auto-Resize Loot Frame"] = nil,
   ["Enable Buff Display"] = nil,
-  ["Enable Buff Indicators"] = nil,
   ["Enable Castbars"] = nil,
   ["Enable Chat Bubbles"] = nil,
   ["Enable Chat Dock Background"] = nil,
@@ -167,14 +175,12 @@ pfUI_translation["enUS"] = {
   ["Enable Custom Colors"] = nil,
   ["Enable Custom Incoming Whispers Layout"] = nil,
   ["Enable Debuff Display"] = nil,
-  ["Enable Debuff Indicators"] = nil,
   ["Enable Debuffs"] = nil,
   ["Enable Durations On Blizzard Frames"] = nil,
   ["Enable Durations On Foreign Frames"] = nil,
   ["Enable Energy Ticks"] = nil,
   ["Enable Extended Guild Information"] = nil,
   ["Enable Health Color"] = nil,
-  ["Enable Hit Indicator"] = nil,
   ["Enable Item Quality Color For Equipment Only"] = nil,
   ["Enable Left Actionbar (BottomRight)"] = nil,
   ["Enable Level Color"] = nil,
@@ -222,6 +228,7 @@ pfUI_translation["enUS"] = {
   ["Friends Online"] = nil,
   ["General"] = nil,
   ["Global Border Size"] = nil,
+  ["Glow"] = nil,
   ["GM-Mode"] = nil,
   ["Gold"] = nil,
   ["Graphic Renderer"] = nil,
@@ -251,11 +258,9 @@ pfUI_translation["enUS"] = {
   ["Highlight Settings That Require Reload"] = nil,
   ["Highlight Target Nameplate"] = nil,
   ["Highlight Unusable Items"] = nil,
-  ["Hit Indicator"] = nil,
-  ["Hit Indicator Text Font"] = nil,
-  ["Hit Indicator Text Size"] = nil,
   ["Hoverbind"] = nil,
   ["Huge (PixelPerfect)"] = nil,
+  ["Icon"] = nil,
   ["Icon Size"] = nil,
   ["Ignore Layout"] = nil,
   ["Import"] = nil,
@@ -280,6 +285,7 @@ pfUI_translation["enUS"] = {
   ["Left Panel: Right"] = nil,
   ["Left Text"] = nil,
   ["Legacy Click Handlers (Breaks Vertical Position and Overlap)"] = nil,
+  ["Legacy"] = nil,
   ["Level"] = nil,
   ["Load profile"] = nil,
   ["Localtime"] = nil,
@@ -387,6 +393,7 @@ pfUI_translation["enUS"] = {
   ["Settings"] = nil,
   ["Shapeshift Bar (BarShapeShift)"] = nil,
   ["Shift-Click Action"] = nil,
+  ["Show Combat Text"] = nil,
   ["Show Duration Inside Buff"] = nil,
   ["Show Equipped Items"] = nil,
   ["Show Health Points"] = nil,
@@ -402,7 +409,7 @@ pfUI_translation["enUS"] = {
   ["Show Players Only"] = nil,
   ["Show Procs as Buff Indicators"] = nil,
   ["Show Procs of all Classes"] = nil,
-  ["Show PvP-Flag Indicator"] = nil,
+  ["Show PvP-Flag"] = nil,
   ["Show PvP Icon"] = nil,
   ["Show Self in Group Frames"] = nil,
   ["Show Totems as Buff Indicators"] = nil,
@@ -414,6 +421,7 @@ pfUI_translation["enUS"] = {
   ["Soulshard Counter"] = nil,
   ["Soulshards"] = nil,
   ["Special Recipient"] = nil,
+  ["Square"] = nil,
   ["Standard Text Font"] = nil,
   ["Standard Text Font Size"] = nil,
   ["Status Bar Texture"] = nil,
@@ -447,6 +455,7 @@ pfUI_translation["enUS"] = {
   ["Unit Frame Text Font"] = nil,
   ["Unit Frame Text Size"] = nil,
   ["Unit String"] = nil,
+  ["Unknown Class Color"] = nil,
   ["Unlock"] = nil,
   ["Unusable Item Color"] = nil,
   ["Use Chat Colors for Meters"] = nil,
diff --git a/env/translations_esES.lua b/env/translations_esES.lua
index 9a0ff6a5..d16e53c8 100644
--- a/env/translations_esES.lua
+++ b/env/translations_esES.lua
@@ -34,6 +34,7 @@ pfUI_translation["esES"] = {
   ["Buff Indicator Size"] = "Tamaño del Indicador de los Buffs",
   ["Buff Limit"] = "Límite de Buff",
   ["Buff Position"] = "Posición de los Buffs",
+  ["Buffs Class Buffs"] = nil,
   ["Buff Size"] = "Tamaño de los Buffs",
   ["Buffs"] = nil,
   ["Buff Spacing"] = "Espaciado Entre los Buffs",
@@ -68,7 +69,11 @@ pfUI_translation["esES"] = {
   ["Clickcast Spells"] = "Hechizos de Lanzamiento en Hacer Clic",
   ["Clock"] = "Reloj",
   ["Close"] = "Cerrar",
+  ["Colorize Unknown Classes"] = nil,
   ["Combat"] = "Combate",
+  ["Combat Text Font"] = nil,
+  ["Combat Text"] = nil,
+  ["Combat Text Size"] = nil,
   ["Combat Timer"] = "Temporizador de Combate",
   ["Combopoint Size"] = "Tamaño del Punto de Combo",
   ["Compare Item Base Stats"] = "Comparar Estadísticas Bases de Objetos",
@@ -95,6 +100,10 @@ pfUI_translation["esES"] = {
   ["Custom Health Bar Color"] = "Color de la barra de Salud Personalizado",
   ["Customize"] = "Personalizar",
   ["Custom Transparency"] = "Transparencia Personalizada",
+  ["Debuff Indicator Display"] = nil,
+  ["Debuff Indicator Position"] = nil,
+  ["Debuff Indicator Size"] = nil,
+  ["Debuff Indicators"] = nil,
   ["Debuff Limit"] = "Límite de Debuff",
   ["Debuff Position"] = "Posición de Debuff",
   ["Debuff Size"] = "Tamaño de Debuff",
@@ -147,7 +156,6 @@ pfUI_translation["esES"] = {
   ["Enable Autohide For Right Chat Panel"] = "Activar Ocultar Automáticamente al Panel de Chat Derecho",
   ["Enable Auto-Resize Loot Frame"] =  "Activar Redimensionamiento Automático del Marco del Botín",
   ["Enable Buff Display"] = "Activar la Muestra de Buffs",
-  ["Enable Buff Indicators"] = "Activar Indicador de Buff",
   ["Enable Castbars"] = "Activar Barras de Lanzamiento",
   ["Enable Chat Bubbles"] = "Activar Bocadillos de Chat",
   ["Enable Chat Dock Background"] = "Activar el Fondo del Dársena de Chat",
@@ -167,14 +175,12 @@ pfUI_translation["esES"] = {
   ["Enable Custom Colors"] = "Activar Colores Personalizados",
   ["Enable Custom Incoming Whispers Layout"] = "Activar Disposición de Susurros Entrantes Personalizada",
   ["Enable Debuff Display"] = "Activar la Muestra de Debuffs",
-  ["Enable Debuff Indicators"] = "Activar Indicador de Debuff",
   ["Enable Debuffs"] = "Activar Debuffs",
   ["Enable Durations On Blizzard Frames"] = "Activar Duración en los Marcos de Blizzard",
   ["Enable Durations On Foreign Frames"] = "Activar Duración en los Marcos Extranjeros",
   ["Enable Energy Ticks"] = "Activar Tic de Energía",
   ["Enable Extended Guild Information"] = "Activar Información de Hermandad Extendida",
   ["Enable Health Color"] = "Activar Color de Salud",
-  ["Enable Hit Indicator"] = "Activar Indicador de Golpe",
   ["Enable Item Quality Color For Equipment Only"] = "Activar Color de Calidad de Objetos solo para Equipo",
   ["Enable Left Actionbar (BottomRight)"] = "Activar la Barra de Acción Izquierda (Inferior Derecha)",
   ["Enable Level Color"] = "Activar Color de Nivel",
@@ -222,6 +228,7 @@ pfUI_translation["esES"] = {
   ["Friends Online"] = "Amigos Conectados",
   ["General"] = "General",
   ["Global Border Size"] = "Tamaño del Borde Global",
+  ["Glow"] = nil,
   ["GM-Mode"] = "Modo-MJ",
   ["Gold"] = "Oro",
   ["Graphic Renderer"] = "Renderización de Gráficos",
@@ -251,11 +258,9 @@ pfUI_translation["esES"] = {
   ["Highlight Settings That Require Reload"] = "Resaltar las Configuraciones que Requieren Recarga",
   ["Highlight Target Nameplate"] = "Resaltar las Placas Indentificativas del Objetivo",
   ["Highlight Unusable Items"] = "Resaltar los Objetos Inutilizables",
-  ["Hit Indicator"] = "Indicador de Golpe",
-  ["Hit Indicator Text Font"] = "Fuente del Texto del Indicador de Golpe",
-  ["Hit Indicator Text Size"] = "Tamaño del Texto del Indicador de Golpe",
   ["Hoverbind"] = "Teclado",
   ["Huge (PixelPerfect)"] = "Enorme (Píxel Perfecta)",
+  ["Icon"] = nil,
   ["Icon Size"] = "Tamaño del Icono",
   ["Ignore Layout"] = "Ignorar Disposición",
   ["Import"] = "Importar",
@@ -280,6 +285,7 @@ pfUI_translation["esES"] = {
   ["Left Panel: Right"] = "Panel Izquierdo: Derecho",
   ["Left Text"] = "Texto Izquierdo",
   ["Legacy Click Handlers (Breaks Vertical Position and Overlap)"] = "Operarios Informáticos de clics legados (rompe la posición vertical y superposición)",
+  ["Legacy"] = nil,
   ["Level"] = "Nivel",
   ["Load profile"] = "Cargar Perfil",
   ["Localtime"] = "Hora Local",
@@ -387,6 +393,7 @@ pfUI_translation["esES"] = {
   ["Settings"] = "Configuración",
   ["Shapeshift Bar (BarShapeShift)"] = "Barra de Forma Metamórfica",
   ["Shift-Click Action"] = "Acción de Shift-Clic",
+  ["Show Combat Text"] = nil,
   ["Show Duration Inside Buff"] = "Mostrar la Duración Dentro del Buff",
   ["Show Equipped Items"] = "Mostrar Objetos Equipados",
   ["Show Health Points"] = "Mostrar Puntos de Salud",
@@ -402,7 +409,7 @@ pfUI_translation["esES"] = {
   ["Show Players Only"] = "Solamente Mostrar Jugadores",
   ["Show Procs as Buff Indicators"] = "Mostrar Ocurrencias Aleatorias Programadas (Procs) como Indicadores de Buffs",
   ["Show Procs of all Classes"] = "Mostrar Ocurrencias Aleatorias Programadas (Procs) de Todas las Clases",
-  ["Show PvP-Flag Indicator"] = "Mostrar Indicador de la Marca de JcJ",
+  ["Show PvP-Flag"] = nil,
   ["Show PvP Icon"] = "Mostrar Icono de JcJ",
   ["Show Self in Group Frames"] = "Mostrar a ti Mismo en los Marcos del Grupo",
   ["Show Totems as Buff Indicators"] = "Mostrar Tótems como Indicadores de los Buffs",
@@ -414,6 +421,7 @@ pfUI_translation["esES"] = {
   ["Soulshard Counter"] = "Contador de Fragmentos de alma",
   ["Soulshards"] = "Fragmentos de alma",
   ["Special Recipient"] = "Destinatario Especial",
+  ["Square"] = nil,
   ["Standard Text Font"] = "Fuente de Texto Estándar",
   ["Standard Text Font Size"] = "Tamaño de la Fuente de Texto Estándar",
   ["Status Bar Texture"] = "Textura de la Barra de Estado",
@@ -447,6 +455,7 @@ pfUI_translation["esES"] = {
   ["Unit Frame Text Font"] = "Fuente del Texto del Marco de Unidad",
   ["Unit Frame Text Size"] = "Tamaño del Texto del Marco de Unidad",
   ["Unit String"] = "Cadena de Caracteres de Unidad",
+  ["Unknown Class Color"] = nil,
   ["Unlock"] = "Desbloquear",
   ["Unusable Item Color"] = "Color de Objetos Inutilizables",
   ["Use Chat Colors for Meters"] = "Usar los Colores del Chat para los Medidores",
diff --git a/env/translations_frFR.lua b/env/translations_frFR.lua
index 7ce85675..0defd0ef 100644
--- a/env/translations_frFR.lua
+++ b/env/translations_frFR.lua
@@ -34,6 +34,7 @@ pfUI_translation["frFR"] = {
   ["Buff Indicator Size"] = nil,
   ["Buff Limit"] = "Limite des améliorations",
   ["Buff Position"] = "Position des améliorations",
+  ["Buffs Class Buffs"] = nil,
   ["Buff Size"] = "Taille des améliorations",
   ["Buffs"] = nil,
   ["Buff Spacing"] = nil,
@@ -68,7 +69,11 @@ pfUI_translation["frFR"] = {
   ["Clickcast Spells"] = "Sorts à lancer au clic",
   ["Clock"] = "Horloge",
   ["Close"] = "Fermer",
+  ["Colorize Unknown Classes"] = nil,
   ["Combat"] = "Combat",
+  ["Combat Text Font"] = nil,
+  ["Combat Text"] = nil,
+  ["Combat Text Size"] = nil,
   ["Combat Timer"] = "Chronomètre de combat",
   ["Combopoint Size"] = "Taille des points de combo",
   ["Compare Item Base Stats"] = nil,
@@ -95,6 +100,10 @@ pfUI_translation["frFR"] = {
   ["Custom Health Bar Color"] = "Couleur de la barre de vie personnalisée",
   ["Customize"] = "Personnaliser",
   ["Custom Transparency"] = "Transparence personnalisée",
+  ["Debuff Indicator Display"] = nil,
+  ["Debuff Indicator Position"] = nil,
+  ["Debuff Indicator Size"] = nil,
+  ["Debuff Indicators"] = nil,
   ["Debuff Limit"] = "Nombre maximum d'affaiblissements",
   ["Debuff Position"] = "Position des affaiblissements",
   ["Debuff Size"] = "Taille des affaiblissements",
@@ -147,7 +156,6 @@ pfUI_translation["frFR"] = {
   ["Enable Autohide For Right Chat Panel"] = nil,
   ["Enable Auto-Resize Loot Frame"] = "Activer l'ajustement automatique de la fenêtre de butin",
   ["Enable Buff Display"] = nil,
-  ["Enable Buff Indicators"] = "Activer les indications des améliorations",
   ["Enable Castbars"] = "Activer les barres d'incantation",
   ["Enable Chat Bubbles"] = nil,
   ["Enable Chat Dock Background"] = "Activer les onglets de la fenêtre du chat",
@@ -167,14 +175,12 @@ pfUI_translation["frFR"] = {
   ["Enable Custom Colors"] = "Activer les couleurs personnalisées",
   ["Enable Custom Incoming Whispers Layout"] = "Activer la personnalisation de la fenêtre des Chuchotements entrants",
   ["Enable Debuff Display"] = nil,
-  ["Enable Debuff Indicators"] = "Activer l'indicateur des affaiblissements",
   ["Enable Debuffs"] = "Activer les affaiblissements",
   ["Enable Durations On Blizzard Frames"] = nil,
   ["Enable Durations On Foreign Frames"] = nil,
   ["Enable Energy Ticks"] = "Activer la barre de rechargement d'énergie",
   ["Enable Extended Guild Information"] = "Activer les informations de guilde étendues",
   ["Enable Health Color"] = nil,
-  ["Enable Hit Indicator"] = nil,
   ["Enable Item Quality Color For Equipment Only"] = "Activer la couleur de la qualité des objets seulement sur les pièces d'équipement",
   ["Enable Left Actionbar (BottomRight)"] = nil,
   ["Enable Level Color"] = nil,
@@ -222,6 +228,7 @@ pfUI_translation["frFR"] = {
   ["Friends Online"] = "Amis connectés",
   ["General"] = "Général",
   ["Global Border Size"] = "Taille globale des bordures",
+  ["Glow"] = nil,
   ["GM-Mode"] = "Mode GM",
   ["Gold"] = "Or",
   ["Graphic Renderer"] = "Rendu Graphic",
@@ -251,11 +258,9 @@ pfUI_translation["frFR"] = {
   ["Highlight Settings That Require Reload"] = nil,
   ["Highlight Target Nameplate"] = nil,
   ["Highlight Unusable Items"] = nil,
-  ["Hit Indicator"] = nil,
-  ["Hit Indicator Text Font"] = nil,
-  ["Hit Indicator Text Size"] = nil,
   ["Hoverbind"] = "Mode Raccourcis",
   ["Huge (PixelPerfect)"] = nil,
+  ["Icon"] = nil,
   ["Icon Size"] = "Taille des icônes",
   ["Ignore Layout"] = nil,
   ["Import"] = nil,
@@ -280,6 +285,7 @@ pfUI_translation["frFR"] = {
   ["Left Panel: Right"] = "Panneau de gauche : texte de droite",
   ["Left Text"] = "Texte de gauche",
   ["Legacy Click Handlers (Breaks Vertical Position and Overlap)"] = nil,
+  ["Legacy"] = nil,
   ["Level"] = "Niveau",
   ["Load profile"] = "Charger un profil",
   ["Localtime"] = "Heure Local",
@@ -387,6 +393,7 @@ pfUI_translation["frFR"] = {
   ["Settings"] = "Options",
   ["Shapeshift Bar (BarShapeShift)"] = "Barre des changements formes",
   ["Shift-Click Action"] = "Action au Shift+Clic",
+  ["Show Combat Text"] = nil,
   ["Show Duration Inside Buff"] = nil,
   ["Show Equipped Items"] = nil,
   ["Show Health Points"] = "Afficher les points de vie",
@@ -402,7 +409,7 @@ pfUI_translation["frFR"] = {
   ["Show Players Only"] = "Afficher les joueurs uniquement",
   ["Show Procs as Buff Indicators"] = "Afficher les procs en tant qu'indicateur d'amélioration",
   ["Show Procs of all Classes"] = "Afficher les procs de chaque classe",
-  ["Show PvP-Flag Indicator"] = nil,
+  ["Show PvP-Flag"] = nil,
   ["Show PvP Icon"] = "Afficher l'icône JcJ",
   ["Show Self in Group Frames"] = "S'afficher dans l'UI Groupe",
   ["Show Totems as Buff Indicators"] = nil,
@@ -414,6 +421,7 @@ pfUI_translation["frFR"] = {
   ["Soulshard Counter"] = "Compteur des éclats d'âme",
   ["Soulshards"] = "Pierre d'âme",
   ["Special Recipient"] = nil,
+  ["Square"] = nil,
   ["Standard Text Font"] = "Police standard du texte",
   ["Standard Text Font Size"] = "Taille de la police standard du texte",
   ["Status Bar Texture"] = nil,
@@ -447,6 +455,7 @@ pfUI_translation["frFR"] = {
   ["Unit Frame Text Font"] = "Police du texte des cadres d'unité",
   ["Unit Frame Text Size"] = "Taille de la police du texte des cadres d'unité",
   ["Unit String"] = "Texte des cadres d'unité",
+  ["Unknown Class Color"] = nil,
   ["Unlock"] = "Débloquer l'interface",
   ["Unusable Item Color"] = nil,
   ["Use Chat Colors for Meters"] = nil,
diff --git a/env/translations_koKR.lua b/env/translations_koKR.lua
index ee46cfec..54a31134 100644
--- a/env/translations_koKR.lua
+++ b/env/translations_koKR.lua
@@ -34,6 +34,7 @@ pfUI_translation["koKR"] = {
   ["Buff Indicator Size"] = nil,
   ["Buff Limit"] = "버프 한도",
   ["Buff Position"] = "버프 위치",
+  ["Buffs Class Buffs"] = nil,
   ["Buff Size"] = "버프 크기",
   ["Buffs"] = nil,
   ["Buff Spacing"] = nil,
@@ -68,7 +69,11 @@ pfUI_translation["koKR"] = {
   ["Clickcast Spells"] = "스펠 클릭캐스트",
   ["Clock"] = "시계",
   ["Close"] = "닫기",
+  ["Colorize Unknown Classes"] = nil,
   ["Combat"] = "전투",
+  ["Combat Text Font"] = nil,
+  ["Combat Text"] = nil,
+  ["Combat Text Size"] = nil,
   ["Combat Timer"] = "전투 타이머",
   ["Combopoint Size"] = "콤보포인트 크기",
   ["Compare Item Base Stats"] = nil,
@@ -95,6 +100,10 @@ pfUI_translation["koKR"] = {
   ["Custom Health Bar Color"] = "사용자 지정 체력바 색",
   ["Customize"] = "사용자 정의",
   ["Custom Transparency"] = "사용자 지정 투명도",
+  ["Debuff Indicator Display"] = nil,
+  ["Debuff Indicator Position"] = nil,
+  ["Debuff Indicator Size"] = nil,
+  ["Debuff Indicators"] = nil,
   ["Debuff Limit"] = "디버프 갯수 한도",
   ["Debuff Position"] = "디버프 위치",
   ["Debuff Size"] = "디버프 크기",
@@ -147,7 +156,6 @@ pfUI_translation["koKR"] = {
   ["Enable Autohide For Right Chat Panel"] = nil,
   ["Enable Auto-Resize Loot Frame"] = "자동 크기 조정 룻팅프레임 활성화",
   ["Enable Buff Display"] = nil,
-  ["Enable Buff Indicators"] = "버프 표시기 활성화",
   ["Enable Castbars"] = "캐스트바 활성화",
   ["Enable Chat Bubbles"] = nil,
   ["Enable Chat Dock Background"] = "채팅 덕 활성화",
@@ -167,14 +175,12 @@ pfUI_translation["koKR"] = {
   ["Enable Custom Colors"] = "사용자 정의 색상 사용",
   ["Enable Custom Incoming Whispers Layout"] = "사용자 지정 귓속말 레이아웃 활성화",
   ["Enable Debuff Display"] = nil,
-  ["Enable Debuff Indicators"] = "디버프 표시기 활성화",
   ["Enable Debuffs"] = "디버프 활성화",
   ["Enable Durations On Blizzard Frames"] = nil,
   ["Enable Durations On Foreign Frames"] = nil,
   ["Enable Energy Ticks"] = "Energy Ticks 활성화",
   ["Enable Extended Guild Information"] = "길드 정보 확장 사용",
   ["Enable Health Color"] = nil,
-  ["Enable Hit Indicator"] = nil,
   ["Enable Item Quality Color For Equipment Only"] = "착용장비 전용  아이템품질 색상 활성화",
   ["Enable Left Actionbar (BottomRight)"] = nil,
   ["Enable Level Color"] = nil,
@@ -222,6 +228,7 @@ pfUI_translation["koKR"] = {
   ["Friends Online"] = "접속중인 친구",
   ["General"] = "일반 설정",
   ["Global Border Size"] = "글로벌 테두리 크기",
+  ["Glow"] = nil,
   ["GM-Mode"] = "GM 모드",
   ["Gold"] = "골드",
   ["Graphic Renderer"] = "그래픽 랜더",
@@ -251,11 +258,9 @@ pfUI_translation["koKR"] = {
   ["Highlight Settings That Require Reload"] = nil,
   ["Highlight Target Nameplate"] = nil,
   ["Highlight Unusable Items"] = nil,
-  ["Hit Indicator"] = nil,
-  ["Hit Indicator Text Font"] = nil,
-  ["Hit Indicator Text Size"] = nil,
   ["Hoverbind"] = "단축키 설정",
   ["Huge (PixelPerfect)"] = nil,
+  ["Icon"] = nil,
   ["Icon Size"] = "아이콘 크기",
   ["Ignore Layout"] = nil,
   ["Import"] = nil,
@@ -280,6 +285,7 @@ pfUI_translation["koKR"] = {
   ["Left Panel: Right"] = "왼쪽 패널: 우측",
   ["Left Text"] = "왼쪽 텍스트",
   ["Legacy Click Handlers (Breaks Vertical Position and Overlap)"] = nil,
+  ["Legacy"] = nil,
   ["Level"] = "레벨",
   ["Load profile"] = "프로파일 불러오기",
   ["Localtime"] = "지역시간(한국)",
@@ -387,6 +393,7 @@ pfUI_translation["koKR"] = {
   ["Settings"] = "설정",
   ["Shapeshift Bar (BarShapeShift)"] = "태새바(BarShapeShift)",
   ["Shift-Click Action"] = "쉬프트-클릭 액션",
+  ["Show Combat Text"] = nil,
   ["Show Duration Inside Buff"] = nil,
   ["Show Equipped Items"] = nil,
   ["Show Health Points"] = "체력 상태 표시",
@@ -402,7 +409,7 @@ pfUI_translation["koKR"] = {
   ["Show Players Only"] = "플레이어만 보기",
   ["Show Procs as Buff Indicators"] = "무기활성화버프 버프표시기에 보기",
   ["Show Procs of all Classes"] = "모든 클래스 무기활성화 버프 보기",
-  ["Show PvP-Flag Indicator"] = nil,
+  ["Show PvP-Flag"] = nil,
   ["Show PvP Icon"] = "PvP아이콘 표시",
   ["Show Self in Group Frames"] = nil,
   ["Show Totems as Buff Indicators"] = nil,
@@ -414,6 +421,7 @@ pfUI_translation["koKR"] = {
   ["Soulshard Counter"] = "영혼조각 갯수",
   ["Soulshards"] = "영혼의 조각",
   ["Special Recipient"] = nil,
+  ["Square"] = nil,
   ["Standard Text Font"] = "기본 텍스트 폰트",
   ["Standard Text Font Size"] = "기본 텍스트 폰트크기",
   ["Status"] = "상태",
@@ -447,6 +455,7 @@ pfUI_translation["koKR"] = {
   ["Unit Frame Text Font"] = "유닛프레임 텍스트 폰트",
   ["Unit Frame Text Size"] = "유닛프레임 텍스트 크기",
   ["Unit String"] = "단위 문자열",
+  ["Unknown Class Color"] = nil,
   ["Unlock"] = "잠그 해체",
   ["Unusable Item Color"] = nil,
   ["Use Chat Colors for Meters"] = nil,
diff --git a/env/translations_ruRU.lua b/env/translations_ruRU.lua
index 5b378db5..c412eaf3 100644
--- a/env/translations_ruRU.lua
+++ b/env/translations_ruRU.lua
@@ -34,6 +34,7 @@ pfUI_translation["ruRU"] = {
   ["Buff Indicator Size"] = "Размер индикатора баффов",
   ["Buff Limit"] = "Предел баффов",
   ["Buff Position"] = "Расположение баффов",
+  ["Buffs Class Buffs"] = nil,
   ["Buff Size"] = "Размер баффов",
   ["Buff Spacing"] = "Расстояние между баффами",
   ["Buffs Per Row"] = "Баффы в строке",
@@ -68,6 +69,10 @@ pfUI_translation["ruRU"] = {
   ["Clickcast Spells"] = "Произнесение заклинаний по нажатию",
   ["Clock"] = "Часы",
   ["Close"] = "Закрыть",
+  ["Colorize Unknown Classes"] = nil,
+  ["Combat Text Font"] = nil,
+  ["Combat Text"] = nil,
+  ["Combat Text Size"] = nil,
   ["Combat Timer"] = "Таймер боя",
   ["Combat"] = "Бой",
   ["Combopoint Size"] = "Размер очков комбо",
@@ -95,6 +100,10 @@ pfUI_translation["ruRU"] = {
   ["Custom Health Bar Color"] = "Пользовательский цвет панели здоровья",
   ["Customize"] = "Настроить",
   ["Custom Transparency"] = "Пользовательская прозрачность",
+  ["Debuff Indicator Display"] = nil,
+  ["Debuff Indicator Position"] = nil,
+  ["Debuff Indicator Size"] = nil,
+  ["Debuff Indicators"] = nil,
   ["Debuff Limit"] = "Предел дебаффов",
   ["Debuff Position"] = "Расположение дебаффов",
   ["Debuff Size"] = "Размер дебаффов",
@@ -147,7 +156,6 @@ pfUI_translation["ruRU"] = {
   ["Enable Autohide For Right Chat Panel"] = "Вкл. автом-ое скрытие панели правого чата (PanelRight)",
   ["Enable Auto-Resize Loot Frame"] = "Включить автоматическое изменение размера окна добычи",
   ["Enable Buff Display"] = "Включить отображение баффов",
-  ["Enable Buff Indicators"] = "Включить индикаторы баффов",
   ["Enable Castbars"] = "Включить панели применения",
   ["Enable Chat Bubbles"] = "Включить пузыри чата",
   ["Enable Chat Dock Background"] = "Включить фон панели чата",
@@ -167,14 +175,12 @@ pfUI_translation["ruRU"] = {
   ["Enable Custom Colors"] = "Включить пользовательские цвета",
   ["Enable Custom Incoming Whispers Layout"] = "Включить пользовательский макет входящего шепота",
   ["Enable Debuff Display"] = "Включить отображение дебаффов",
-  ["Enable Debuff Indicators"] = "Включить индикаторы дебаффов",
   ["Enable Debuffs"] = "Включить дебаффы",
   ["Enable Durations On Blizzard Frames"] = "Включить длительность на окнах Blizzard",
   ["Enable Durations On Foreign Frames"] = "Включить длительность на внешних окнах",
   ["Enable Energy Ticks"] = "Включить восполнение энергии",
   ["Enable Extended Guild Information"] = "Включить расширенную информацию о гильдии",
   ["Enable Health Color"] = "Включить цвет здоровья",
-  ["Enable Hit Indicator"] = "Включить индикатор попадания",
   ["Enable Item Quality Color For Equipment Only"] = "Включить цвет качества предметов только для экипировки",
   ["Enable Left Actionbar (BottomRight)"] = "Включить левую панель действий (BottomRight)",
   ["Enable Level Color"] = "Включить цвет уровня",
@@ -222,6 +228,7 @@ pfUI_translation["ruRU"] = {
   ["Friends Online"] = "Друзья в сети",
   ["General"] = "Общее",
   ["Global Border Size"] = "Размер глобальной границы",
+  ["Glow"] = nil,
   ["GM-Mode"] = "Режим ГМ",
   ["Gold"] = "Золото",
   ["Graphic Renderer"] = "Графическая визуализация",
@@ -251,11 +258,9 @@ pfUI_translation["ruRU"] = {
   ["Highlight Settings That Require Reload"] = "Выделить параметры, требующие перезагрузки",
   ["Highlight Target Nameplate"] = "Выделить индикатор здоровья цели",
   ["Highlight Unusable Items"] = "Выделить предметы, которые не могут быть использованы",
-  ["Hit Indicator Text Font"] = "Шрифт текста индикатора попадания",
-  ["Hit Indicator Text Size"] = "Размер текста индикатора попадания",
-  ["Hit Indicator"] = "Индикатор попадания",
   ["Hoverbind"] = "Назначение клавиш",
   ["Huge (PixelPerfect)"] = "Огромный (идеальный пиксель)",
+  ["Icon"] = nil,
   ["Icon Size"] = "Размер иконки",
   ["Ignore Layout"] = "Игнорировать макет",
   ["Import"] = "Импорт",
@@ -280,6 +285,7 @@ pfUI_translation["ruRU"] = {
   ["Left Text"] = "Текст слева",
   ["Left"] = "Слева",
   ["Legacy Click Handlers (Breaks Vertical Position and Overlap)"] = "Наследств-ые обработч. кликов (Прерыв. вертикал. полож-е и перек-е)", --?
+  ["Legacy"] = nil,
   ["Level"] = "Уровень",
   ["Load profile"] = "Загрузить профиль",
   ["Localtime"] = "Местное время",
@@ -387,6 +393,7 @@ pfUI_translation["ruRU"] = {
   ["Settings"] = "Настройки",
   ["Shapeshift Bar (BarShapeShift)"] = "Панель стоек (BarShapeShift)",
   ["Shift-Click Action"] = "Действие при Shift+нажатие",
+  ["Show Combat Text"] = nil,
   ["Show Duration Inside Buff"] = "Показать продолжительность внутри баффа",
   ["Show Equipped Items"] = "Показать экипированные предметы",
   ["Show Health Points"] = "Показать здоровье",
@@ -402,7 +409,7 @@ pfUI_translation["ruRU"] = {
   ["Show Players Only"] = "Показать только игроков",
   ["Show Procs as Buff Indicators"] = "Показать проки (Procs) как индикаторы баффов",
   ["Show Procs of all Classes"] = "Показать проки (Procs) всех классов",
-  ["Show PvP-Flag Indicator"] = "Показать индикатор PvP флага",
+  ["Show PvP-Flag"] = nil,
   ["Show PvP Icon"] = "Показать PvP иконку",
   ["Show Self in Group Frames"] = "Показать себя в окне группы",
   ["Show Totems as Buff Indicators"] = "Показать тотемы как индикаторы баффов",
@@ -414,6 +421,7 @@ pfUI_translation["ruRU"] = {
   ["Soulshard Counter"] = "Счетчик камней душ",
   ["Soulshards"] = "Камни душ",
   ["Special Recipient"] = "Специальный получатель",
+  ["Square"] = nil,
   ["Standard Text Font Size"] = "Размер шрифта стандартного текста",
   ["Standard Text Font"] = "Шрифт стандартного текста",
   ["Status Bar Texture"] = "Текстура статус панели",
@@ -447,6 +455,7 @@ pfUI_translation["ruRU"] = {
   ["Unit Frame Text Font"] = "Шрифт текста окна юнита",
   ["Unit Frame Text Size"] = "Размер текста окна юнита",
   ["Unit String"] = "Уровень и имя",
+  ["Unknown Class Color"] = nil,
   ["Unlock"] = "Разблокировать",
   ["Unusable Item Color"] = "Цвет предметов, которые не могут быть использованы",
   ["Use Chat Colors for Meters"] = "Использовать цвета чата для счетчиков",
diff --git a/env/translations_zhCN.lua b/env/translations_zhCN.lua
index 00369fe2..6f325a11 100644
--- a/env/translations_zhCN.lua
+++ b/env/translations_zhCN.lua
@@ -34,6 +34,7 @@ pfUI_translation["zhCN"] = {
   ["Buff Indicator Size"] = "在血条上显示BUFF大小(若不显示请输入-1)",
   ["Buff Limit"] = "Buff总数量",
   ["Buff Position"] = "Buff显示的位置",
+  ["Buffs Class Buffs"] = nil,
   ["Buff Size"] = "Buff图标大小",
   ["Buffs"] = nil,
   ["Buff Spacing"] = "Buff间距",
@@ -68,6 +69,10 @@ pfUI_translation["zhCN"] = {
   ["Clickcast Spells"] = "点击施法(直接输入技能名称)",
   ["Clock"] = "时间",
   ["Close"] = "关闭",
+  ["Colorize Unknown Classes"] = nil,
+  ["Combat Text Font"] = nil,
+  ["Combat Text"] = nil,
+  ["Combat Text Size"] = nil,
   ["Combat Timer"] = "战斗计时器",
   ["Combat"] = "战斗报警",
   ["Combopoint Size"] = "连击点大小",
@@ -95,6 +100,10 @@ pfUI_translation["zhCN"] = {
   ["Custom Health Bar Color"] = "血条颜色",
   ["Customize"] = "定制",
   ["Custom Transparency"] = "透明度",
+  ["Debuff Indicator Display"] = nil,
+  ["Debuff Indicator Position"] = nil,
+  ["Debuff Indicator Size"] = nil,
+  ["Debuff Indicators"] = nil,
   ["Debuff Limit"] = "Debuff总数量",
   ["Debuff Position"] = "Debuff显示的位置",
   ["Debuff Size"] = "Debuff图标大小",
@@ -147,7 +156,6 @@ pfUI_translation["zhCN"] = {
   ["Enable Autohide For Right Chat Panel"] = "启用自动隐藏右聊天面板",
   ["Enable Auto-Resize Loot Frame"] = "自动调整拾取框大小",
   ["Enable Buff Display"] = "启用Buff显示",
-  ["Enable Buff Indicators"] = "在头像框架上显示Buff",
   ["Enable Castbars"] = "显示敌对施法条",
   ["Enable Chat Bubbles"] = "启用聊天框气泡效果",
   ["Enable Chat Dock Background"] = "显示聊天窗口停靠栏",
@@ -167,14 +175,12 @@ pfUI_translation["zhCN"] = {
   ["Enable Custom Colors"] = "使用自定义颜色",
   ["Enable Custom Incoming Whispers Layout"] = "启用私聊样式",
   ["Enable Debuff Display"] = "启用Debuff显示",
-  ["Enable Debuff Indicators"] = "在头像框架上显示Debuff",
   ["Enable Debuffs"] = "显示Debuff",
   ["Enable Durations On Blizzard Frames"] = "启用持续时间在暴雪框架上",
   ["Enable Durations On Foreign Frames"] = "启用持续时间在外来框架上",
   ["Enable Energy Ticks"] = "显示能量刻度",
   ["Enable Extended Guild Information"] = "公会信息扩展显示",
   ["Enable Health Color"] = "启用生命条颜色",
-  ["Enable Hit Indicator"] = "启用命中指示器",
   ["Enable Item Quality Color For Equipment Only"] = "仅在装备上显示品质颜色",
   ["Enable Left Actionbar (BottomRight)"] = "启用左边动作栏 (右下)",
   ["Enable Level Color"] = "启用等级颜色",
@@ -222,6 +228,7 @@ pfUI_translation["zhCN"] = {
   ["Friends Online"] = "在线好友",
   ["General"] = "默认",
   ["Global Border Size"] = "全局边框大小",
+  ["Glow"] = nil,
   ["GM-Mode"] = "GM模式",
   ["Gold"] = "金钱",
   ["Graphic Renderer"] = "图形渲染器",
@@ -251,11 +258,9 @@ pfUI_translation["zhCN"] = {
   ["Highlight Settings That Require Reload"] = "用[!]突出需要重新加载UI的设置",
   ["Highlight Target Nameplate"] = "高亮目标姓名板",
   ["Highlight Unusable Items"] = "高亮无法使用的物品",
-  ["Hit Indicator Text Font"] = "命中指示器文本字体",
-  ["Hit Indicator Text Size"] = "命中指示器文本大小",
-  ["Hit Indicator"] = "启用命中指示器",
   ["Hoverbind"] = "悬停设置",
   ["Huge (PixelPerfect)"] = "巨大(像素完美)",
+  ["Icon"] = nil,
   ["Icon Size"] = "图标大小",
   ["Ignore Layout"] = "忽略布局",
   ["Import"] = "导入",
@@ -280,6 +285,7 @@ pfUI_translation["zhCN"] = {
   ["Left Text"] = "左侧文字",
   ["Left"] = "左边",
   ["Legacy Click Handlers (Breaks Vertical Position and Overlap)"] = "点击遗留处理(分解垂直位置和覆盖)",
+  ["Legacy"] = nil,
   ["Level"] = "等级",
   ["Load profile"] = "加载配置",
   ["Localtime"] = "本地时间",
@@ -387,6 +393,7 @@ pfUI_translation["zhCN"] = {
   ["Settings"] = "默认设置",
   ["Shapeshift Bar (BarShapeShift)"] = "姿态条",
   ["Shift-Click Action"] = "SHIFT点击操作",
+  ["Show Combat Text"] = nil,
   ["Show Duration Inside Buff"] = "显示持续时间在Buff里面",
   ["Show Equipped Items"] = "显示已装备的物品",
   ["Show Health Points"] = "显示生命值",
@@ -402,7 +409,7 @@ pfUI_translation["zhCN"] = {
   ["Show Players Only"] = "仅显示自己",
   ["Show Procs as Buff Indicators"] = "在框架的Buff指示器显示触发效果",
   ["Show Procs of all Classes"] = "显示所有职业的触发效果",
-  ["Show PvP-Flag Indicator"] = "显示PVP标志指示器",
+  ["Show PvP-Flag"] = nil,
   ["Show PvP Icon"] = "显示PVP图标",
   ["Show Self in Group Frames"] = "在小队列表中显示自己",
   ["Show Totems as Buff Indicators"] = "显示图腾作为buff指示器",
@@ -414,6 +421,7 @@ pfUI_translation["zhCN"] = {
   ["Soulshard Counter"] = "灵魂碎片",
   ["Soulshards"] = "灵魂碎片",
   ["Special Recipient"] = "特殊指定角色",
+  ["Square"] = nil,
   ["Standard Text Font Size"] = "标准字体字号",
   ["Standard Text Font"] = "标准字体",
   ["Status Bar Texture"] = "状态条纹理材质",
@@ -447,6 +455,7 @@ pfUI_translation["zhCN"] = {
   ["Unit Frame Text Font"] = "头像框架字体",
   ["Unit Frame Text Size"] = "头像框架字体字号",
   ["Unit String"] = "等级和名字",
+  ["Unknown Class Color"] = nil,
   ["Unlock"] = "解锁排版",
   ["Unusable Item Color"] = "无法使用的物品的颜色",
   ["Use Chat Colors for Meters"] = "使用聊天框着色(其他插件的接口,如DPSMate,KTM等)",
diff --git a/env/translations_zhTW.lua b/env/translations_zhTW.lua
index b00a2a05..c24a3648 100644
--- a/env/translations_zhTW.lua
+++ b/env/translations_zhTW.lua
@@ -34,6 +34,7 @@ pfUI_translation["zhTW"] = {
   ["Buff Indicator Size"] = "在血條上顯示buff(若不顯示請輸入-1)",
   ["Buff Limit"] = "Buff總數量",
   ["Buff Position"] = "Buff顯示的位置",
+  ["Buffs Class Buffs"] = nil,
   ["Buff Size"] = "Buff圖示大小",
   ["Buffs"] = nil,
   ["Buff Spacing"] = "Buff間距",
@@ -68,6 +69,10 @@ pfUI_translation["zhTW"] = {
   ["Clickcast Spells"] = "點擊施法",
   ["Clock"] = "時間",
   ["Close"] = "關閉",
+  ["Colorize Unknown Classes"] = nil,
+  ["Combat Text Font"] = nil,
+  ["Combat Text"] = nil,
+  ["Combat Text Size"] = nil,
   ["Combat Timer"] = "戰鬥計時器",
   ["Combat"] = "戰鬥報警",
   ["Combopoint Size"] = "連擊點大小",
@@ -95,6 +100,10 @@ pfUI_translation["zhTW"] = {
   ["Custom Health Bar Color"] = "血條顏色",
   ["Customize"] = "定制",
   ["Custom Transparency"] = "透明度",
+  ["Debuff Indicator Display"] = nil,
+  ["Debuff Indicator Position"] = nil,
+  ["Debuff Indicator Size"] = nil,
+  ["Debuff Indicators"] = nil,
   ["Debuff Limit"] = "Debuff總數量",
   ["Debuff Position"] = "Debuff顯示的位置",
   ["Debuff Size"] = "Debuff圖示大小",
@@ -147,7 +156,6 @@ pfUI_translation["zhTW"] = {
   ["Enable Autohide For Right Chat Panel"] = "啟用自動隱藏右聊天面板",
   ["Enable Auto-Resize Loot Frame"] = "自動調整拾取框大小",
   ["Enable Buff Display"] = "啟用Buff顯示",
-  ["Enable Buff Indicators"] = "在頭像框架上顯示Buff",
   ["Enable Castbars"] = "顯示敵對施法條",
   ["Enable Chat Bubbles"] = "啟用聊天框氣泡效果",
   ["Enable Chat Dock Background"] = "顯示聊天視窗停靠欄",
@@ -167,14 +175,12 @@ pfUI_translation["zhTW"] = {
   ["Enable Custom Colors"] = "使用自訂顏色",
   ["Enable Custom Incoming Whispers Layout"] = "啟用私聊樣式",
   ["Enable Debuff Display"] = "啟用Debuff顯示",
-  ["Enable Debuff Indicators"] = "在頭像框架上顯示Debuff",
   ["Enable Debuffs"] = "顯示Debuff",
   ["Enable Durations On Blizzard Frames"] = "啟用持續時間在暴雪框架上",
   ["Enable Durations On Foreign Frames"] = "啟用持續時間在外來框架上",
   ["Enable Energy Ticks"] = "顯示能量刻度",
   ["Enable Extended Guild Information"] = "公會資訊擴展顯示",
   ["Enable Health Color"] = "啟用生命條顏色",
-  ["Enable Hit Indicator"] = "啟用命中指示器",
   ["Enable Item Quality Color For Equipment Only"] = "僅在裝備上顯示品質顏色",
   ["Enable Left Actionbar (BottomRight)"] = "啟用左邊動作欄 (右下)",
   ["Enable Level Color"] = "啟用等級顏色",
@@ -222,6 +228,7 @@ pfUI_translation["zhTW"] = {
   ["Friends Online"] = "線上好友",
   ["General"] = "默認",
   ["Global Border Size"] = "全域邊框大小",
+  ["Glow"] = nil,
   ["GM-Mode"] = "GM模式",
   ["Gold"] = "金錢",
   ["Graphic Renderer"] = "圖形渲染器",
@@ -251,11 +258,9 @@ pfUI_translation["zhTW"] = {
   ["Highlight Settings That Require Reload"] = "用[!]突出需要重新加載UI的設置",
   ["Highlight Target Nameplate"] = "高亮目標姓名板",
   ["Highlight Unusable Items"] = nil,
-  ["Hit Indicator Text Font"] = "命中指示器文本字體",
-  ["Hit Indicator Text Size"] = "命中指示器文本大小",
-  ["Hit Indicator"] = "命中指示器",
   ["Hoverbind"] = "懸停設置",
   ["Huge (PixelPerfect)"] = "巨大(像素完美)",
+  ["Icon"] = nil,
   ["Icon Size"] = "圖示大小",
   ["Ignore Layout"] = "忽略佈局",
   ["Import"] = "導入",
@@ -280,6 +285,7 @@ pfUI_translation["zhTW"] = {
   ["Left Text"] = "左側文字",
   ["Left"] = "左邊",
   ["Legacy Click Handlers (Breaks Vertical Position and Overlap)"] = "點擊遺留處理(分解垂直位置和覆蓋)",
+  ["Legacy"] = nil,
   ["Level"] = "等級",
   ["Load profile"] = "載入配置",
   ["Localtime"] = "本地時間",
@@ -387,6 +393,7 @@ pfUI_translation["zhTW"] = {
   ["Settings"] = "默認設置",
   ["Shapeshift Bar (BarShapeShift)"] = "姿態條",
   ["Shift-Click Action"] = "SHIFT點擊操作",
+  ["Show Combat Text"] = nil,
   ["Show Duration Inside Buff"] = "顯示持續時間在Buff裏面",
   ["Show Equipped Items"] = "顯示已裝備的物品",
   ["Show Health Points"] = "顯示生命值",
@@ -402,7 +409,7 @@ pfUI_translation["zhTW"] = {
   ["Show Players Only"] = "僅顯示自己",
   ["Show Procs as Buff Indicators"] = "在框架的Buff指示器顯示觸發效果",
   ["Show Procs of all Classes"] = "顯示所有職業的觸發效果",
-  ["Show PvP-Flag Indicator"] = "顯示PVP標誌指示器",
+  ["Show PvP-Flag"] = nil,
   ["Show PvP Icon"] = "顯示PVP圖示",
   ["Show Self in Group Frames"] = "在小隊清單中顯示自己",
   ["Show Totems as Buff Indicators"] = "顯示圖騰作為buff指示器",
@@ -414,6 +421,7 @@ pfUI_translation["zhTW"] = {
   ["Soulshard Counter"] = "靈魂碎片",
   ["Soulshards"] = "靈魂碎片",
   ["Special Recipient"] = "特殊指定角色",
+  ["Square"] = nil,
   ["Standard Text Font Size"] = "標準字體字型大小",
   ["Standard Text Font"] = "標準字體",
   ["Status Bar Texture"] = "狀態條紋理材質",
@@ -447,6 +455,7 @@ pfUI_translation["zhTW"] = {
   ["Unit Frame Text Font"] = "頭像框架字體",
   ["Unit Frame Text Size"] = "頭像框架字體字型大小",
   ["Unit String"] = "等級和名字",
+  ["Unknown Class Color"] = nil,
   ["Unlock"] = "解鎖排版",
   ["Unusable Item Color"] = nil,
   ["Use Chat Colors for Meters"] = "使用聊天框著色(其他插件的介面,如DPSMate,KTM等)",
diff --git a/modules/gui.lua b/modules/gui.lua
index cb3a1fcd..781a8f5f 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -500,13 +500,13 @@ pfUI:RegisterModule("gui", function ()
   }
 
   pfUI.gui.dropdowns.uf_debuff_indicator_size = {
-    ".10:" .. T["10%"],
-    ".25:" .. T["25%"],
-    ".35:" .. T["35%"],
-    ".50:" .. T["50%"],
-    ".65:" .. T["65%"],
-    ".75:" .. T["75%"],
-    ".90:" .. T["90%"],
+    ".10:10%",
+    ".25:25%",
+    ".35:35%",
+    ".50:50%",
+    ".65:65%",
+    ".75:75%",
+    ".90:90%",
   }
 
   pfUI.gui.dropdowns.uf_layout = {