diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/24000-24099.xml
index f7e4f81303..45cc2db5a7 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/24000-24099.xml
@@ -1911,290 +1911,430 @@
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
+
+ DEMONIC
FEMALE
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
+
+ UNDEAD
FEMALE
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
+
+ HUMANOID
FEMALE
+
+
-
+
+
+
-
-
+
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
+
+ HUMANOID
FEMALE
+
+
-
+
+
+
-
-
+
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
-
+
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
-
+
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -2291,100 +2431,145 @@
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
+
+ DEMONIC
FEMALE
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
+
+ DEMONIC
FEMALE
+
-
+
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/29300-29399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/29300-29399.xml
index 0c8ef7e631..575d43588f 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/29300-29399.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/29300-29399.xml
@@ -643,139 +643,352 @@
-
-
- ETC
- FEMALE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
HUMANOID
+ MALE
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
+ HUMANOID
+ MALE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
icon.skillraid
- A1
+ P
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/32400-32499.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/32400-32499.xml
new file mode 100644
index 0000000000..7d92018a69
--- /dev/null
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/32400-32499.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ icon.skillboss
+ P
+
+
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/24000-24099.xml
index 74b284e46b..5186aff1e6 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/24000-24099.xml
@@ -1912,298 +1912,430 @@
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
+
+ DEMONIC
FEMALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
+
+ UNDEAD
FEMALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
-
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
-
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
+
+ HUMANOID
FEMALE
-
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
+
+ HUMANOID
FEMALE
-
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
-
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
-
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -2300,100 +2432,145 @@
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
+
+ DEMONIC
FEMALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
+
+ DEMONIC
FEMALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/24100-24199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/24100-24199.xml
index 7192787bdd..14cda4f58e 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/24100-24199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/24100-24199.xml
@@ -1759,45 +1759,59 @@
-
-
- ETC
- FEMALE
-
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
-
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
@@ -1819,25 +1833,32 @@
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
@@ -1858,24 +1879,31 @@
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
@@ -1896,24 +1924,31 @@
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
@@ -1953,24 +1988,31 @@
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
@@ -2010,24 +2052,30 @@
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
HUMANOID
@@ -2055,64 +2103,89 @@
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
-
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
-
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -2134,25 +2207,34 @@
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -2173,24 +2255,33 @@
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -2211,24 +2302,33 @@
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -2268,24 +2368,33 @@
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -2325,24 +2434,30 @@
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
HUMANOID
@@ -2370,84 +2485,109 @@
-
-
- ETC
- FEMALE
-
-
+
+ DEMONIC
+ MALE
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
- ETC
+
+ HUMANOID
FEMALE
-
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
- ETC
+
+ HUMANOID
FEMALE
-
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
-
+
+ HUMANOID
+ MALE
+
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/26300-26399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/26300-26399.xml
index c303e0e999..432acf5941 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/26300-26399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/26300-26399.xml
@@ -915,24 +915,31 @@
-
-
- ETC
- FEMALE
+
+ DEMONIC
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
@@ -953,43 +960,146 @@
-
-
- ETC
- FEMALE
-
-
+
+ HUMANOID
+ MALE
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
-
-
+
+ HUMANOID
+ MALE
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/16900-16999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/16900-16999.xml
index ffa8195bb1..0ce70e96d0 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/16900-16999.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/16900-16999.xml
@@ -1,9 +1,9 @@
-
+
icon.skillraid
- A1
+ P
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/32400-32499.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/32400-32499.xml
index 8c26dba182..4305ee32ee 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/32400-32499.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/32400-32499.xml
@@ -74,7 +74,7 @@
icon.skillboss
- A1
+ P