diff --git a/WeakAuras/Locales/zLocales.lua b/WeakAuras/Locales/zLocales.lua
index db52c40..3f5eca1 100644
--- a/WeakAuras/Locales/zLocales.lua
+++ b/WeakAuras/Locales/zLocales.lua
@@ -36,11 +36,8 @@ if (locale == "enUS" or locale == "enGB") then
 
   L["Beast"] = "Beast"
   L["Critter"] = "Critter"
-  L["Demon"] = "Demon"
   L["Dragonkin"] = "Dragonkin"
-  L["Elemental"] = "Elemental"
   L["Gas Cloud"] = "Gas Cloud"
-  L["Giant"] = "Giant"
   L["Humanoid"] = "Humanoid"
   L["Mechanical"] = "Mechanical"
   L["Non-combat Pet"] = "Non-combat Pet"
@@ -63,7 +60,6 @@ if (locale == "enUS" or locale == "enGB") then
   L["Voidwalker"] = "Voidwalker"
   L["Succubus"] = "Succubus"
   L["Doomguard"] = "Doomguard"
-  L["Scorpid"] = "Scorpid"
   L["Turtle"] = "Turtle"
   L["Imp"] = "Imp"
   L["Bat"] = "Bat"
@@ -73,7 +69,6 @@ if (locale == "enUS" or locale == "enGB") then
   L["Remote Control"] = "Remote Control"
   L["Felguard"] = "Felguard"
   L["Dragonhawk"] = "Dragonhawk"
-  L["Ravager"] = "Ravager"
   L["Warp Stalker"] = "Warp Stalker"
   L["Sporebat"] = "Sporebat"
   L["Nether Ray"] = "Nether Ray"
@@ -82,7 +77,6 @@ if (locale == "enUS" or locale == "enGB") then
   L["Chimaera"] = "Chimaera"
   L["Devilsaur"] = "Devilsaur"
   L["Ghoul"] = "Ghoul"
-  L["Silithid"] = "Silithid"
   L["Worm"] = "Worm"
   L["Rhino"] = "Rhino"
   L["Wasp"] = "Wasp"
@@ -152,11 +146,8 @@ elseif (locale == "deDE") then
 
   L["Beast"] = "Wildtier"
   L["Critter"] = "Tier"
-  L["Demon"] = "Dämon"
   L["Dragonkin"] = "Drachkin"
-  L["Elemental"] = "Elementar"
   L["Gas Cloud"] = "Gaswolke"
-  L["Giant"] = "Riese"
   L["Humanoid"] = "Humanoid"
   L["Mechanical"] = "Mechanisch"
   L["Non-combat Pet"] = "Haustier"
@@ -179,7 +170,6 @@ elseif (locale == "deDE") then
   L["Voidwalker"] = "Leerwandler"
   L["Succubus"] = "Sukkubus"
   L["Doomguard"] = "Verdammniswache"
-  L["Scorpid"] = "Skorpid"
   L["Turtle"] = "Schildkröte"
   L["Imp"] = "Wichtel"
   L["Bat"] = "Fledermaus"
@@ -189,7 +179,6 @@ elseif (locale == "deDE") then
   L["Remote Control"] = "Ferngesteuert"
   L["Felguard"] = "Teufelswache"
   L["Dragonhawk"] = "Drachenfalke"
-  L["Ravager"] = "Felshetzer"
   L["Warp Stalker"] = "Sphärenjäger"
   L["Sporebat"] = "Sporensegler"
   L["Nether Ray"] = "Netherrochen"
@@ -198,7 +187,6 @@ elseif (locale == "deDE") then
   L["Chimaera"] = "Schimäre"
   L["Devilsaur"] = "Teufelssaurier"
   L["Ghoul"] = "Ghul"
-  L["Silithid"] = "Silithid"
   L["Worm"] = "Wurm"
   L["Rhino"] = "Rhinozeros"
   L["Wasp"] = "Wespe"
@@ -267,11 +255,8 @@ elseif (locale == "esES") then
 
   L["Beast"] = "Bestia"
   L["Critter"] = "Alma"
-  L["Demon"] = "Demonio"
   L["Dragonkin"] = "Dragón"
-  L["Elemental"] = "Elemental"
   L["Gas Cloud"] = "Nube de Gas"
-  L["Giant"] = "Gigante"
   L["Humanoid"] = "Humanoide"
   L["Mechanical"] = "Mecánico"
   L["Non-combat Pet"] = "Mascota no combatiente"
@@ -294,7 +279,6 @@ elseif (locale == "esES") then
   L["Voidwalker"] = "Abisario"
   L["Succubus"] = "Súcubo"
   L["Doomguard"] = "Guardia apocalíptico"
-  L["Scorpid"] = "Escórpido"
   L["Turtle"] = "Tortuga"
   L["Imp"] = "Diablillo"
   L["Bat"] = "Murciélago"
@@ -304,7 +288,6 @@ elseif (locale == "esES") then
   L["Remote Control"] = "Control remoto"
   L["Felguard"] = "Guardia vil"
   L["Dragonhawk"] = "Dracohalcón"
-  L["Ravager"] = "Devastador"
   L["Warp Stalker"] = "Acechador deformado"
   L["Sporebat"] = "Esporiélago"
   L["Nether Ray"] = "Raya abisal"
@@ -313,7 +296,6 @@ elseif (locale == "esES") then
   L["Chimaera"] = "Quimera"
   L["Devilsaur"] = "Demosaurio"
   L["Ghoul"] = "Necrófago"
-  L["Silithid"] = "Silítido"
   L["Worm"] = "Gusano"
   L["Rhino"] = "Rinoceronte"
   L["Wasp"] = "Avispa"
@@ -382,11 +364,8 @@ elseif (locale == "esMX") then
 
   L["Beast"] = "Bestia"
   L["Critter"] = "Alma"
-  L["Demon"] = "Demonio"
   L["Dragonkin"] = "Dragon"
-  L["Elemental"] = "Elemental"
   L["Gas Cloud"] = "Nube de Gas"
-  L["Giant"] = "Gigante"
   L["Humanoid"] = "Humanoide"
   L["Mechanical"] = "Mecánico"
   L["Non-combat Pet"] = "Mascota mansa"
@@ -409,7 +388,6 @@ elseif (locale == "esMX") then
   L["Voidwalker"] = "Abisario"
   L["Succubus"] = "Súcubo"
   L["Doomguard"] = "Guardia apocalíptico"
-  L["Scorpid"] = "Escórpido"
   L["Turtle"] = "Tortuga"
   L["Imp"] = "Diablillo"
   L["Bat"] = "Murciélago"
@@ -419,7 +397,6 @@ elseif (locale == "esMX") then
   L["Remote Control"] = "Control remoto"
   L["Felguard"] = "Guardia vil"
   L["Dragonhawk"] = "Dracohalcón"
-  L["Ravager"] = "Devastador"
   L["Warp Stalker"] = "Acechador deformado"
   L["Sporebat"] = "Esporiélago"
   L["Nether Ray"] = "Raya abisal"
@@ -428,7 +405,6 @@ elseif (locale == "esMX") then
   L["Chimaera"] = "Quimera"
   L["Devilsaur"] = "Demosaurio"
   L["Ghoul"] = "Necrófago"
-  L["Silithid"] = "Silítido"
   L["Worm"] = "Gusano"
   L["Rhino"] = "Rinoceronte"
   L["Wasp"] = "Avispa"
@@ -498,11 +474,8 @@ elseif (locale == "frFR") then
 
   L["Beast"] = "Bête"
   L["Critter"] = "Bestiole"
-  L["Demon"] = "Démon"
   L["Dragonkin"] = "Draconien"
-  L["Elemental"] = "Elémentaire"
   L["Gas Cloud"] = "Nuage de gaz"
-  L["Giant"] = "Géant"
   L["Humanoid"] = "Humanoïde"
   L["Mechanical"] = "Mécanique"
   L["Non-combat Pet"] = "Familier pacifique"
@@ -525,7 +498,6 @@ elseif (locale == "frFR") then
   L["Voidwalker"] = "Marcheur du Vide"
   L["Succubus"] = "Succube"
   L["Doomguard"] = "Garde funeste"
-  L["Scorpid"] = "Scorpide"
   L["Turtle"] = "Tortue"
   L["Imp"] = "Diablotin"
   L["Bat"] = "Chauve-souris"
@@ -535,7 +507,6 @@ elseif (locale == "frFR") then
   L["Remote Control"] = "Télécommande"
   L["Felguard"] = "Gangregarde"
   L["Dragonhawk"] = "Faucon-dragon"
-  L["Ravager"] = "Ravageur"
   L["Warp Stalker"] = "Traqueur dim."
   L["Sporebat"] = "Sporoptère"
   L["Nether Ray"] = "Raie du Néant"
@@ -544,7 +515,6 @@ elseif (locale == "frFR") then
   L["Chimaera"] = "Chimère"
   L["Devilsaur"] = "Diablosaure"
   L["Ghoul"] = "Goule"
-  L["Silithid"] = "Silithide"
   L["Worm"] = "Ver"
   L["Rhino"] = "Rhinocéros"
   L["Wasp"] = "Guêpe"
@@ -615,11 +585,8 @@ elseif (locale == "itIT") then
   --[[Translation missing --]]
   L["Beast"] = "Beast"
   L["Critter"] = "Critter"
-  L["Demon"] = "Demon"
   L["Dragonkin"] = "Dragonkin"
-  L["Elemental"] = "Elemental"
   L["Gas Cloud"] = "Gas Cloud"
-  L["Giant"] = "Giant"
   L["Humanoid"] = "Humanoid"
   L["Mechanical"] = "Mechanical"
   L["Non-combat Pet"] = "Non-combat Pet"
@@ -643,7 +610,6 @@ elseif (locale == "itIT") then
   L["Voidwalker"] = "Voidwalker"
   L["Succubus"] = "Succubus"
   L["Doomguard"] = "Doomguard"
-  L["Scorpid"] = "Scorpid"
   L["Turtle"] = "Turtle"
   L["Imp"] = "Imp"
   L["Bat"] = "Bat"
@@ -653,7 +619,6 @@ elseif (locale == "itIT") then
   L["Remote Control"] = "Remote Control"
   L["Felguard"] = "Felguard"
   L["Dragonhawk"] = "Dragonhawk"
-  L["Ravager"] = "Ravager"
   L["Warp Stalker"] = "Warp Stalker"
   L["Sporebat"] = "Sporebat"
   L["Nether Ray"] = "Nether Ray"
@@ -662,7 +627,6 @@ elseif (locale == "itIT") then
   L["Chimaera"] = "Chimaera"
   L["Devilsaur"] = "Devilsaur"
   L["Ghoul"] = "Ghoul"
-  L["Silithid"] = "Silithid"
   L["Worm"] = "Worm"
   L["Rhino"] = "Rhino"
   L["Wasp"] = "Wasp"
@@ -731,11 +695,8 @@ elseif (locale == "koKR") then
 
   L["Beast"] = "야수"
   L["Critter"] = "동물"
-  L["Demon"] = "악마"
   L["Dragonkin"] = "용족"
-  L["Elemental"] = "정령"
   L["Gas Cloud"] = "가스"
-  L["Giant"] = "거인"
   L["Humanoid"] = "인간형"
   L["Mechanical"] = "기계"
   L["Non-combat Pet"] = "애완동물"
@@ -758,7 +719,6 @@ elseif (locale == "koKR") then
   L["Voidwalker"] = "보이드워커"
   L["Succubus"] = "서큐버스"
   L["Doomguard"] = "파멸의 수호병"
-  L["Scorpid"] = "전갈"
   L["Turtle"] = "거북"
   L["Imp"] = "임프"
   L["Bat"] = "박쥐"
@@ -768,7 +728,6 @@ elseif (locale == "koKR") then
   L["Remote Control"] = "무선조종 장난감"
   L["Felguard"] = "지옥수호병"
   L["Dragonhawk"] = "용매"
-  L["Ravager"] = "칼날발톱"
   L["Warp Stalker"] = "차원의 추적자"
   L["Sporebat"] = "포자날개"
   L["Nether Ray"] = "황천의 가오리"
@@ -777,7 +736,6 @@ elseif (locale == "koKR") then
   L["Chimaera"] = "키메라"
   L["Devilsaur"] = "데빌사우루스"
   L["Ghoul"] = "구울"
-  L["Silithid"] = "실리시드"
   L["Worm"] = "벌레"
   L["Rhino"] = "코뿔소"
   L["Wasp"] = "말벌"
@@ -847,11 +805,8 @@ elseif (locale == "ptBR") then
 
   L["Beast"] = "Fera"
   L["Critter"] = "Bicho"
-  L["Demon"] = "Demônio"
   L["Dragonkin"] = "Draconiano"
-  L["Elemental"] = "Elemental"
   L["Gas Cloud"] = "Nuvem de Gás"
-  L["Giant"] = "Gigante"
   L["Humanoid"] = "Humanoide"
   L["Mechanical"] = "Mecânico"
   L["Non-combat Pet"] = "Mascote"
@@ -874,7 +829,6 @@ elseif (locale == "ptBR") then
   L["Voidwalker"] = "Emissário do Caos"
   L["Succubus"] = "Súcubo"
   L["Doomguard"] = "Demonarca"
-  L["Scorpid"] = "Escorpídeo"
   L["Turtle"] = "Tartaruga"
   L["Imp"] = "Diabrete"
   L["Bat"] = "Morcego"
@@ -884,7 +838,6 @@ elseif (locale == "ptBR") then
   L["Remote Control"] = "Controle Remoto"
   L["Felguard"] = "Guarda Vil"
   L["Dragonhawk"] = "Falcodrago"
-  L["Ravager"] = "Assolador"
   L["Warp Stalker"] = "Espreitador Dimens."
   L["Sporebat"] = "Quirósporo"
   L["Nether Ray"] = "Arraia Etérea"
@@ -893,7 +846,6 @@ elseif (locale == "ptBR") then
   L["Chimaera"] = "Quimera"
   L["Devilsaur"] = "Demossauro"
   L["Ghoul"] = "Carniçal"
-  L["Silithid"] = "Silitídeo"
   L["Worm"] = "Verme"
   L["Rhino"] = "Rinoceronte"
   L["Wasp"] = "Vespa"
@@ -962,11 +914,8 @@ elseif (locale == "ruRU") then
 
   L["Beast"] = "Животное"
   L["Critter"] = "Существо"
-  L["Demon"] = "Демон"
   L["Dragonkin"] = "Дракон"
-  L["Elemental"] = "Элементаль"
   L["Gas Cloud"] = "Газовое облако"
-  L["Giant"] = "Великан"
   L["Humanoid"] = "Гуманоид"
   L["Mechanical"] = "Механизм"
   L["Non-combat Pet"] = "Спутник"
@@ -989,7 +938,6 @@ elseif (locale == "ruRU") then
   L["Voidwalker"] = "Демон Бездны"
   L["Succubus"] = "Суккуб"
   L["Doomguard"] = "Стражник ужаса"
-  L["Scorpid"] = "Скорпид"
   L["Turtle"] = "Черепаха"
   L["Imp"] = "Бес"
   L["Bat"] = "Летучая мышь"
@@ -999,7 +947,6 @@ elseif (locale == "ruRU") then
   L["Remote Control"] = "Управление"
   L["Felguard"] = "Страж Скверны"
   L["Dragonhawk"] = "Дракондор"
-  L["Ravager"] = "Опустошитель"
   L["Warp Stalker"] = "Прыгуана"
   L["Sporebat"] = "Спороскат"
   L["Nether Ray"] = "Скат Пустоты"
@@ -1008,7 +955,6 @@ elseif (locale == "ruRU") then
   L["Chimaera"] = "Химера"
   L["Devilsaur"] = "Дьявозавр"
   L["Ghoul"] = "Вурдалак"
-  L["Silithid"] = "Силитид"
   L["Worm"] = "Червь"
   L["Rhino"] = "Люторог"
   L["Wasp"] = "Оса"
@@ -1077,11 +1023,8 @@ elseif (locale == "zhCN") then
 
   L["Beast"] = "野兽"
   L["Critter"] = "小动物"
-  L["Demon"] = "恶魔"
   L["Dragonkin"] = "龙类"
-  L["Elemental"] = "元素生物"
   L["Gas Cloud"] = "气体云雾"
-  L["Giant"] = "巨人"
   L["Humanoid"] = "人型生物"
   L["Mechanical"] = "机械"
   L["Non-combat Pet"] = "非战斗宠物"
@@ -1104,7 +1047,6 @@ elseif (locale == "zhCN") then
   L["Voidwalker"] = "虚空行者"
   L["Succubus"] = "魅魔"
   L["Doomguard"] = "末日守卫"
-  L["Scorpid"] = "蝎子"
   L["Turtle"] = "海龟"
   L["Imp"] = "小鬼"
   L["Bat"] = "蝙蝠"
@@ -1114,7 +1056,6 @@ elseif (locale == "zhCN") then
   L["Remote Control"] = "远程控制"
   L["Felguard"] = "恶魔卫士"
   L["Dragonhawk"] = "龙鹰"
-  L["Ravager"] = "掠食者"
   L["Warp Stalker"] = "迁跃捕猎者"
   L["Sporebat"] = "孢子蝠"
   L["Nether Ray"] = "虚空鳐"
@@ -1123,7 +1064,6 @@ elseif (locale == "zhCN") then
   L["Chimaera"] = "奇美拉"
   L["Devilsaur"] = "魔暴龙"
   L["Ghoul"] = "食尸鬼"
-  L["Silithid"] = "异种虫"
   L["Worm"] = "蠕虫"
   L["Rhino"] = "犀牛"
   L["Wasp"] = "巨蜂"
@@ -1192,11 +1132,8 @@ elseif (locale == "zhTW") then
 
   L["Beast"] = "野獸"
   L["Critter"] = "小動物"
-  L["Demon"] = "惡魔"
   L["Dragonkin"] = "龍類"
-  L["Elemental"] = "元素生物"
   L["Gas Cloud"] = "氣體雲"
-  L["Giant"] = "巨人"
   L["Humanoid"] = "人型生物"
   L["Mechanical"] = "機械"
   L["Non-combat Pet"] = "非戰鬥寵物"
@@ -1219,7 +1156,6 @@ elseif (locale == "zhTW") then
   L["Voidwalker"] = "虛無行者"
   L["Succubus"] = "魅魔"
   L["Doomguard"] = "末日守衛"
-  L["Scorpid"] = "蠍子"
   L["Turtle"] = "海龜"
   L["Imp"] = "小鬼"
   L["Bat"] = "蝙蝠"
@@ -1229,7 +1165,6 @@ elseif (locale == "zhTW") then
   L["Remote Control"] = "遙控"
   L["Felguard"] = "惡魔守衛"
   L["Dragonhawk"] = "龍鷹"
-  L["Ravager"] = "劫毀者"
   L["Warp Stalker"] = "扭曲巡者"
   L["Sporebat"] = "孢子蝙蝠"
   L["Nether Ray"] = "虛空鰭刺"
@@ -1238,7 +1173,6 @@ elseif (locale == "zhTW") then
   L["Chimaera"] = "奇美拉"
   L["Devilsaur"] = "魔暴龍"
   L["Ghoul"] = "食屍鬼"
-  L["Silithid"] = "異種蟲族"
   L["Worm"] = "蟲"
   L["Rhino"] = "犀牛"
   L["Wasp"] = "黃蜂"
diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua
index 5303525..190a496 100644
--- a/WeakAuras/Types.lua
+++ b/WeakAuras/Types.lua
@@ -2639,9 +2639,9 @@ end
 Private.creature_type_types = {
   [1] = L["Beast"],
   [2] = L["Dragonkin"],
-  [3] = L["Demon"],
-  [4] = L["Elemental"],
-  [5] = L["Giant"],
+  [3] = GetFactionInfoByID(73) or "", -- Demon
+  [4] = GetFactionInfoByID(74) or "", -- Elemental
+  [5] = GetFactionInfoByID(511) or "", -- Giant
   [6] = L["Undead"],
   [7] = L["Humanoid"],
   [8] = L["Critter"],
@@ -2657,9 +2657,9 @@ Private.creature_type_types = {
 Private.ExecEnv.creature_type_name_to_id = {
   [L["Beast"]] = 1,
   [L["Dragonkin"]] = 2,
-  [L["Demon"]] = 3,
-  [L["Elemental"]] = 4,
-  [L["Giant"]] = 5,
+  [GetFactionInfoByID(73) or ""] = 3, -- Demon
+  [GetFactionInfoByID(74) or ""] = 4, -- Elemental
+  [GetFactionInfoByID(511) or ""] = 5, -- Giant
   [L["Undead"]] = 6,
   [L["Humanoid"]] = 7,
   [L["Critter"]] = 8,
@@ -2688,7 +2688,7 @@ Private.creature_family_types = {
   [16] = L["Voidwalker"],
   [17] = L["Succubus"],
   [19] = L["Doomguard"],
-  [20] = L["Scorpid"],
+  [20] = L[GetFactionInfoByID(309) or ""], -- Scorpid
   [21] = L["Turtle"],
   [23] = L["Imp"],
   [24] = L["Bat"],
@@ -2698,7 +2698,7 @@ Private.creature_family_types = {
   [28] = L["Remote Control"],
   [29] = L["Felguard"],
   [30] = L["Dragonhawk"],
-  [31] = L["Ravager"],
+  [31] = GetFactionInfoByID(1039) or "", -- Ravager
   [32] = L["Warp Stalker"],
   [33] = L["Sporebat"],
   [34] = L["Nether Ray"],
@@ -2707,7 +2707,7 @@ Private.creature_family_types = {
   [38] = L["Chimaera"],
   [39] = L["Devilsaur"],
   [40] = L["Ghoul"],
-  [41] = L["Silithid"],
+  [41] = GetFactionInfoByID(249) or "", -- Silithid
   [42] = L["Worm"],
   [43] = L["Rhino"],
   [44] = L["Wasp"],
@@ -2732,7 +2732,7 @@ Private.ExecEnv.creature_family_name_to_id = {
   [L["Voidwalker"]] = 16,
   [L["Succubus"]] = 17,
   [L["Doomguard"]] = 19,
-  [L["Scorpid"]] = 20,
+  [GetFactionInfoByID(309) or ""] = 20, -- Scorpid
   [L["Turtle"]] = 21,
   [L["Imp"]] = 23,
   [L["Bat"]] = 24,
@@ -2742,7 +2742,7 @@ Private.ExecEnv.creature_family_name_to_id = {
   [L["Remote Control"]] = 28,
   [L["Felguard"]] = 29,
   [L["Dragonhawk"]] = 30,
-  [L["Ravager"]] = 31,
+  [GetFactionInfoByID(1039) or ""] = 31, -- Ravager
   [L["Warp Stalker"]] = 32,
   [L["Sporebat"]] = 33,
   [L["Nether Ray"]] = 34,
@@ -2751,7 +2751,7 @@ Private.ExecEnv.creature_family_name_to_id = {
   [L["Chimaera"]] = 38,
   [L["Devilsaur"]] = 39,
   [L["Ghoul"]] = 40,
-  [L["Silithid"]] = 41,
+  [GetFactionInfoByID(249) or ""] = 41, -- Silithid
   [L["Worm"]] = 42,
   [L["Rhino"]] = 43,
   [L["Wasp"]] = 44,