diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Incarnation.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Incarnation.java
index 86365678a9..353e4f7202 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Incarnation.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Incarnation.java
@@ -50,6 +50,8 @@ public class Incarnation extends AbstractNpcAI
 	@Id(13455)
 	@Id(13456)
 	@Id(13457)
+	@Id(13578)
+	@Id(13579)
 	public void onNpcSpawn(OnNpcSpawn event)
 	{
 		final Npc npc = event.getNpc();
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/13300-13399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/13300-13399.xml
index 2dd6f8a05e..3786f134d5 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/13300-13399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/13300-13399.xml
@@ -58,7 +58,6 @@
 		</collision>
 	</npc>
 	<npc id="13302" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="1" />
 			<skill name="Skill02_ID" id="10551" level="1" />
@@ -71,7 +70,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1120.6" magical="581.85" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -79,6 +78,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -92,7 +92,6 @@
 		</collision>
 	</npc>
 	<npc id="13303" level="90" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="2" />
 			<skill name="Skill02_ID" id="10551" level="2" />
@@ -105,7 +104,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1236.65" magical="658.8" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -113,6 +112,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -126,7 +126,6 @@
 		</collision>
 	</npc>
 	<npc id="13304" level="95" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="3" />
 			<skill name="Skill02_ID" id="10551" level="3" />
@@ -139,7 +138,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1320.9" magical="366" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1320.9" magical="366" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1364.85" magical="745.2" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -147,6 +146,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -160,7 +160,6 @@
 		</collision>
 	</npc>
 	<npc id="13305" level="97" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="4" />
 			<skill name="Skill02_ID" id="10551" level="4" />
@@ -173,7 +172,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -181,6 +180,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -330,7 +330,6 @@
 		</collision>
 	</npc>
 	<npc id="13310" level="85" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2422,7 +2421,6 @@
 		</collision>
 	</npc>
 	<npc id="13377" level="87" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2457,7 +2455,6 @@
 		</collision>
 	</npc>
 	<npc id="13378" level="90" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2492,7 +2489,6 @@
 		</collision>
 	</npc>
 	<npc id="13379" level="93" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2527,7 +2523,6 @@
 		</collision>
 	</npc>
 	<npc id="13380" level="96" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2562,7 +2557,6 @@
 		</collision>
 	</npc>
 	<npc id="13381" level="99" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml
index 40b047714c..4327f05dc1 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml
@@ -1611,6 +1611,12 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="MagicalDefence" fromLevel="2" toLevel="3" fromSubLevel="3001" toSubLevel="3030">
+				<amount>
+					<value fromLevel="2" toLevel="3" fromSubLevel="3001" toSubLevel="3030">{0.6 + 0.4 * subIndex}</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10525" toLevel="7" name="Shadow Dash">
@@ -1879,7 +1885,7 @@
 			<value fromLevel="1" toLevel="4">600</value>
 			<value fromLevel="1" toLevel="4" fromSubLevel="2001" toSubLevel="2030">{base + 10 * subIndex}</value>
 		</castRange>
-		<castRange>1100</castRange>
+		<castRange>600</castRange>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>300000</reuseDelay>
@@ -2063,7 +2069,6 @@
 			<value level="6">51</value>
 			<value level="7">53</value>
 		</mpConsume>
-		<nextAction>ATTACK</nextAction>
 		<castRange>400</castRange>
 		<effectRange>900</effectRange>
 		<hitTime>3000</hitTime>
@@ -2079,7 +2084,6 @@
 		</effectPoint>
 		<reuseDelay>300000</reuseDelay>
 		<isMagic>4</isMagic>
-		<staticReuse>true</staticReuse>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
@@ -2105,7 +2109,7 @@
 					<value level="7">13457</value>
 				</npcId>
 				<npcCount>3</npcCount>
-				<despawnDelay>30000</despawnDelay>
+				<despawnDelay>17000</despawnDelay>
 			</effect>
 		</effects>
 		<endEffects>
@@ -2358,7 +2362,6 @@
 			<value level="11">-709</value>
 		</effectPoint>
 		<isDebuff>true</isDebuff>
-		<staticReuse>true</staticReuse>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
@@ -2419,6 +2422,7 @@
 			<value fromLevel="4" toLevel="8" fromSubLevel="2001" toSubLevel="2030">{base + base / 100 * subIndex}</value>
 		</activateRate>
 		<operateType>A2</operateType>
+		<effectPoint>-709</effectPoint>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>
 			<value level="1">85</value>
@@ -3295,6 +3299,7 @@
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
 		<reuseDelay>1000</reuseDelay>
+		<nextAction>ATTACK</nextAction>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
@@ -3342,7 +3347,7 @@
 			<effect name="CriticalRatePositionBonus">
 				<amount>
 					<value level="1">30</value>
-					<value level="1">40</value>
+					<value level="2">40</value>
 				</amount>
 				<mode>PER</mode>
 				<position>SIDE</position>
@@ -3350,7 +3355,7 @@
 			<effect name="CriticalRatePositionBonus">
 				<amount>
 					<value level="1">60</value>
-					<value level="1">70</value>
+					<value level="2">70</value>
 				</amount>
 				<mode>PER</mode>
 				<position>BACK</position>
@@ -3401,6 +3406,18 @@
 				<chance>80</chance>
 				<targetType>SELF</targetType>
 			</effect>
+			<effect name="PhysicalDefence" fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1030">
+				<amount>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1030">{0.6 + 0.4 * subIndex}</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence" fromLevel="1" toLevel="1" fromSubLevel="2001" toSubLevel="2030">
+				<amount>
+					<value fromLevel="1" toLevel="1" fromSubLevel="2001" toSubLevel="2030">{0.6 + 0.4 * subIndex}</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10559" toLevel="1" name="Elusive Mirage">
@@ -3455,6 +3472,18 @@
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="PhysicalDefence" fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1030">
+				<amount>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1030">{0.6 + 0.4 * subIndex}</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence" fromLevel="1" toLevel="1" fromSubLevel="2001" toSubLevel="2030">
+				<amount>
+					<value fromLevel="1" toLevel="1" fromSubLevel="2001" toSubLevel="2030">{0.6 + 0.4 * subIndex}</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10561" toLevel="4" name="Superior Vitality">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AreaSkillNpc.java
index 155cfb90b1..7cc32dc91c 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AreaSkillNpc.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AreaSkillNpc.java
@@ -61,6 +61,19 @@ public class AreaSkillNpc extends AbstractNpcAI
 		13452, // Solo Dance
 		13453, // Solo Dance
 		13454, // Solo Dance
+		13576, // Solo Dance
+		13577, // Solo Dance
+		13541, // Solo Dance
+		13542, // Solo Dance
+		13543, // Solo Dance
+		13544, // Solo Dance
+		13545, // Solo Dance
+		13546, // Solo Dance
+		13547, // Solo Dance
+		13548, // Solo Dance
+		13549, // Solo Dance
+		13580, // Solo Dance
+		13581, // Solo Dance
 	};
 	private static final int[] DECOY = // ai_decoy
 	{
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Incarnation.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Incarnation.java
index 86365678a9..353e4f7202 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Incarnation.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Incarnation.java
@@ -50,6 +50,8 @@ public class Incarnation extends AbstractNpcAI
 	@Id(13455)
 	@Id(13456)
 	@Id(13457)
+	@Id(13578)
+	@Id(13579)
 	public void onNpcSpawn(OnNpcSpawn event)
 	{
 		final Npc npc = event.getNpc();
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/13300-13399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/13300-13399.xml
index 2dd6f8a05e..3786f134d5 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/13300-13399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/13300-13399.xml
@@ -58,7 +58,6 @@
 		</collision>
 	</npc>
 	<npc id="13302" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="1" />
 			<skill name="Skill02_ID" id="10551" level="1" />
@@ -71,7 +70,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1120.6" magical="581.85" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -79,6 +78,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -92,7 +92,6 @@
 		</collision>
 	</npc>
 	<npc id="13303" level="90" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="2" />
 			<skill name="Skill02_ID" id="10551" level="2" />
@@ -105,7 +104,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1236.65" magical="658.8" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -113,6 +112,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -126,7 +126,6 @@
 		</collision>
 	</npc>
 	<npc id="13304" level="95" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="3" />
 			<skill name="Skill02_ID" id="10551" level="3" />
@@ -139,7 +138,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1320.9" magical="366" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1320.9" magical="366" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1364.85" magical="745.2" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -147,6 +146,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -160,7 +160,6 @@
 		</collision>
 	</npc>
 	<npc id="13305" level="97" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="4" />
 			<skill name="Skill02_ID" id="10551" level="4" />
@@ -173,7 +172,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -181,6 +180,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -330,7 +330,6 @@
 		</collision>
 	</npc>
 	<npc id="13310" level="85" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2422,7 +2421,6 @@
 		</collision>
 	</npc>
 	<npc id="13377" level="87" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2457,7 +2455,6 @@
 		</collision>
 	</npc>
 	<npc id="13378" level="90" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2492,7 +2489,6 @@
 		</collision>
 	</npc>
 	<npc id="13379" level="93" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2527,7 +2523,6 @@
 		</collision>
 	</npc>
 	<npc id="13380" level="96" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2562,7 +2557,6 @@
 		</collision>
 	</npc>
 	<npc id="13381" level="99" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/13400-13499.xml
index c209c412ee..818f5f2a73 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/13400-13499.xml
@@ -1081,7 +1081,6 @@
 		</collision>
 	</npc>
 	<npc id="13452" level="101" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1112,7 +1111,6 @@
 		</collision>
 	</npc>
 	<npc id="13453" level="103" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1143,7 +1141,6 @@
 		</collision>
 	</npc>
 	<npc id="13454" level="105" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1173,8 +1170,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13455" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13455" level="101" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="5" />
 			<skill name="Skill02_ID" id="10551" level="5" />
@@ -1187,11 +1183,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1204,8 +1201,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13456" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13456" level="103" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="6" />
 			<skill name="Skill02_ID" id="10551" level="6" />
@@ -1218,11 +1214,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1235,11 +1232,10 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13457" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13457" level="105" type="Doppelganger" name="Incarnation">
 		<parameters>
-			<skill name="Skill01_ID" id="10550" level="4" />
-			<skill name="Skill02_ID" id="10551" level="4" />
+			<skill name="Skill01_ID" id="10550" level="7" />
+			<skill name="Skill02_ID" id="10551" level="7" />
 		</parameters>
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -1249,11 +1245,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml
index bb5d430ecf..46c3007390 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml
@@ -2069,7 +2069,6 @@
 			<value level="6">51</value>
 			<value level="7">53</value>
 		</mpConsume>
-		<nextAction>ATTACK</nextAction>
 		<castRange>400</castRange>
 		<effectRange>900</effectRange>
 		<hitTime>3000</hitTime>
@@ -2085,7 +2084,6 @@
 		</effectPoint>
 		<reuseDelay>300000</reuseDelay>
 		<isMagic>4</isMagic>
-		<staticReuse>true</staticReuse>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
@@ -2111,7 +2109,7 @@
 					<value level="7">13457</value>
 				</npcId>
 				<npcCount>3</npcCount>
-				<despawnDelay>30000</despawnDelay>
+				<despawnDelay>17000</despawnDelay>
 			</effect>
 		</effects>
 		<endEffects>
@@ -2364,7 +2362,6 @@
 			<value level="11">-709</value>
 		</effectPoint>
 		<isDebuff>true</isDebuff>
-		<staticReuse>true</staticReuse>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
@@ -2425,6 +2422,7 @@
 			<value fromLevel="4" toLevel="8" fromSubLevel="2001" toSubLevel="2030">{base + base / 100 * subIndex}</value>
 		</activateRate>
 		<operateType>A2</operateType>
+		<effectPoint>-709</effectPoint>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>
 			<value level="1">85</value>
@@ -3301,6 +3299,7 @@
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
 		<reuseDelay>1000</reuseDelay>
+		<nextAction>ATTACK</nextAction>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
@@ -3348,8 +3347,7 @@
 			<effect name="CriticalRatePositionBonus">
 				<amount>
 					<value level="1">30</value>
-					<value level="1">40</value>
-					<value level="2">40</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="2">40</value>
 				</amount>
 				<mode>PER</mode>
 				<position>SIDE</position>
@@ -3357,8 +3355,7 @@
 			<effect name="CriticalRatePositionBonus">
 				<amount>
 					<value level="1">60</value>
-					<value level="1">70</value>
-					<value level="2">70</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="2">70</value>
 				</amount>
 				<mode>PER</mode>
 				<position>BACK</position>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AreaSkillNpc.java
index 155cfb90b1..7cc32dc91c 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AreaSkillNpc.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AreaSkillNpc.java
@@ -61,6 +61,19 @@ public class AreaSkillNpc extends AbstractNpcAI
 		13452, // Solo Dance
 		13453, // Solo Dance
 		13454, // Solo Dance
+		13576, // Solo Dance
+		13577, // Solo Dance
+		13541, // Solo Dance
+		13542, // Solo Dance
+		13543, // Solo Dance
+		13544, // Solo Dance
+		13545, // Solo Dance
+		13546, // Solo Dance
+		13547, // Solo Dance
+		13548, // Solo Dance
+		13549, // Solo Dance
+		13580, // Solo Dance
+		13581, // Solo Dance
 	};
 	private static final int[] DECOY = // ai_decoy
 	{
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Incarnation.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Incarnation.java
index 86365678a9..353e4f7202 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Incarnation.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Incarnation.java
@@ -50,6 +50,8 @@ public class Incarnation extends AbstractNpcAI
 	@Id(13455)
 	@Id(13456)
 	@Id(13457)
+	@Id(13578)
+	@Id(13579)
 	public void onNpcSpawn(OnNpcSpawn event)
 	{
 		final Npc npc = event.getNpc();
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/13300-13399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/13300-13399.xml
index 2dd6f8a05e..3786f134d5 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/13300-13399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/13300-13399.xml
@@ -58,7 +58,6 @@
 		</collision>
 	</npc>
 	<npc id="13302" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="1" />
 			<skill name="Skill02_ID" id="10551" level="1" />
@@ -71,7 +70,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1120.6" magical="581.85" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -79,6 +78,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -92,7 +92,6 @@
 		</collision>
 	</npc>
 	<npc id="13303" level="90" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="2" />
 			<skill name="Skill02_ID" id="10551" level="2" />
@@ -105,7 +104,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1236.65" magical="658.8" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -113,6 +112,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -126,7 +126,6 @@
 		</collision>
 	</npc>
 	<npc id="13304" level="95" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="3" />
 			<skill name="Skill02_ID" id="10551" level="3" />
@@ -139,7 +138,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1320.9" magical="366" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1320.9" magical="366" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1364.85" magical="745.2" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -147,6 +146,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -160,7 +160,6 @@
 		</collision>
 	</npc>
 	<npc id="13305" level="97" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="4" />
 			<skill name="Skill02_ID" id="10551" level="4" />
@@ -173,7 +172,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -181,6 +180,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -330,7 +330,6 @@
 		</collision>
 	</npc>
 	<npc id="13310" level="85" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2422,7 +2421,6 @@
 		</collision>
 	</npc>
 	<npc id="13377" level="87" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2457,7 +2455,6 @@
 		</collision>
 	</npc>
 	<npc id="13378" level="90" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2492,7 +2489,6 @@
 		</collision>
 	</npc>
 	<npc id="13379" level="93" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2527,7 +2523,6 @@
 		</collision>
 	</npc>
 	<npc id="13380" level="96" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2562,7 +2557,6 @@
 		</collision>
 	</npc>
 	<npc id="13381" level="99" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/13400-13499.xml
index 73c49f6059..1e8666077d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/13400-13499.xml
@@ -1081,7 +1081,6 @@
 		</collision>
 	</npc>
 	<npc id="13452" level="101" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1112,7 +1111,6 @@
 		</collision>
 	</npc>
 	<npc id="13453" level="103" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1143,7 +1141,6 @@
 		</collision>
 	</npc>
 	<npc id="13454" level="105" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1173,8 +1170,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13455" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13455" level="101" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="5" />
 			<skill name="Skill02_ID" id="10551" level="5" />
@@ -1187,11 +1183,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1204,8 +1201,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13456" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13456" level="103" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="6" />
 			<skill name="Skill02_ID" id="10551" level="6" />
@@ -1218,11 +1214,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1235,11 +1232,10 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13457" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13457" level="105" type="Doppelganger" name="Incarnation">
 		<parameters>
-			<skill name="Skill01_ID" id="10550" level="4" />
-			<skill name="Skill02_ID" id="10551" level="4" />
+			<skill name="Skill01_ID" id="10550" level="7" />
+			<skill name="Skill02_ID" id="10551" level="7" />
 		</parameters>
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -1249,11 +1245,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml
index aafb64312b..7a0ff49925 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml
@@ -2052,7 +2052,6 @@
 			<value level="6">51</value>
 			<value level="7">53</value>
 		</mpConsume>
-		<nextAction>ATTACK</nextAction>
 		<castRange>400</castRange>
 		<effectRange>900</effectRange>
 		<hitTime>3000</hitTime>
@@ -2068,7 +2067,6 @@
 		</effectPoint>
 		<reuseDelay>300000</reuseDelay>
 		<isMagic>4</isMagic>
-		<staticReuse>true</staticReuse>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
@@ -2094,7 +2092,7 @@
 					<value level="7">13457</value>
 				</npcId>
 				<npcCount>3</npcCount>
-				<despawnDelay>30000</despawnDelay>
+				<despawnDelay>17000</despawnDelay>
 			</effect>
 		</effects>
 		<endEffects>
@@ -2347,7 +2345,6 @@
 			<value level="11">-709</value>
 		</effectPoint>
 		<isDebuff>true</isDebuff>
-		<staticReuse>true</staticReuse>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
@@ -2408,6 +2405,7 @@
 			<value fromLevel="4" toLevel="8" fromSubLevel="2001" toSubLevel="2030">{base + base / 100 * subIndex}</value>
 		</activateRate>
 		<operateType>A2</operateType>
+		<effectPoint>-709</effectPoint>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>
 			<value level="1">85</value>
@@ -3284,6 +3282,7 @@
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
 		<reuseDelay>1000</reuseDelay>
+		<nextAction>ATTACK</nextAction>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
@@ -3331,8 +3330,7 @@
 			<effect name="CriticalRatePositionBonus">
 				<amount>
 					<value level="1">30</value>
-					<value level="1">40</value>
-					<value level="2">40</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="2">40</value>
 				</amount>
 				<mode>PER</mode>
 				<position>SIDE</position>
@@ -3340,8 +3338,7 @@
 			<effect name="CriticalRatePositionBonus">
 				<amount>
 					<value level="1">60</value>
-					<value level="1">70</value>
-					<value level="2">70</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="2">70</value>
 				</amount>
 				<mode>PER</mode>
 				<position>BACK</position>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AreaSkillNpc.java
index 155cfb90b1..7cc32dc91c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AreaSkillNpc.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AreaSkillNpc.java
@@ -61,6 +61,19 @@ public class AreaSkillNpc extends AbstractNpcAI
 		13452, // Solo Dance
 		13453, // Solo Dance
 		13454, // Solo Dance
+		13576, // Solo Dance
+		13577, // Solo Dance
+		13541, // Solo Dance
+		13542, // Solo Dance
+		13543, // Solo Dance
+		13544, // Solo Dance
+		13545, // Solo Dance
+		13546, // Solo Dance
+		13547, // Solo Dance
+		13548, // Solo Dance
+		13549, // Solo Dance
+		13580, // Solo Dance
+		13581, // Solo Dance
 	};
 	private static final int[] DECOY = // ai_decoy
 	{
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Incarnation.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Incarnation.java
index 86365678a9..353e4f7202 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Incarnation.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Incarnation.java
@@ -50,6 +50,8 @@ public class Incarnation extends AbstractNpcAI
 	@Id(13455)
 	@Id(13456)
 	@Id(13457)
+	@Id(13578)
+	@Id(13579)
 	public void onNpcSpawn(OnNpcSpawn event)
 	{
 		final Npc npc = event.getNpc();
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/13300-13399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/13300-13399.xml
index 39842f8111..eeb5b2af33 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/13300-13399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/13300-13399.xml
@@ -58,7 +58,6 @@
 		</collision>
 	</npc>
 	<npc id="13302" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="1" />
 			<skill name="Skill02_ID" id="10551" level="1" />
@@ -71,7 +70,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1120.6" magical="581.85" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -79,6 +78,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -92,7 +92,6 @@
 		</collision>
 	</npc>
 	<npc id="13303" level="90" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="2" />
 			<skill name="Skill02_ID" id="10551" level="2" />
@@ -105,7 +104,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1236.65" magical="658.8" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -113,6 +112,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -126,7 +126,6 @@
 		</collision>
 	</npc>
 	<npc id="13304" level="95" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="3" />
 			<skill name="Skill02_ID" id="10551" level="3" />
@@ -139,7 +138,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1320.9" magical="366" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1320.9" magical="366" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1364.85" magical="745.2" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -147,6 +146,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -160,7 +160,6 @@
 		</collision>
 	</npc>
 	<npc id="13305" level="97" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="4" />
 			<skill name="Skill02_ID" id="10551" level="4" />
@@ -173,7 +172,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -181,6 +180,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -330,7 +330,6 @@
 		</collision>
 	</npc>
 	<npc id="13310" level="85" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2416,7 +2415,6 @@
 		</collision>
 	</npc>
 	<npc id="13377" level="87" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2451,7 +2449,6 @@
 		</collision>
 	</npc>
 	<npc id="13378" level="90" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2486,7 +2483,6 @@
 		</collision>
 	</npc>
 	<npc id="13379" level="93" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2521,7 +2517,6 @@
 		</collision>
 	</npc>
 	<npc id="13380" level="96" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2556,7 +2551,6 @@
 		</collision>
 	</npc>
 	<npc id="13381" level="99" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/13400-13499.xml
index 2aefd17858..a762818d36 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/13400-13499.xml
@@ -1081,7 +1081,6 @@
 		</collision>
 	</npc>
 	<npc id="13452" level="101" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1112,7 +1111,6 @@
 		</collision>
 	</npc>
 	<npc id="13453" level="103" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1143,7 +1141,6 @@
 		</collision>
 	</npc>
 	<npc id="13454" level="105" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1173,8 +1170,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13455" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13455" level="101" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="5" />
 			<skill name="Skill02_ID" id="10551" level="5" />
@@ -1187,11 +1183,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1204,8 +1201,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13456" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13456" level="103" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="6" />
 			<skill name="Skill02_ID" id="10551" level="6" />
@@ -1218,11 +1214,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1235,11 +1232,10 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13457" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13457" level="105" type="Doppelganger" name="Incarnation">
 		<parameters>
-			<skill name="Skill01_ID" id="10550" level="4" />
-			<skill name="Skill02_ID" id="10551" level="4" />
+			<skill name="Skill01_ID" id="10550" level="7" />
+			<skill name="Skill02_ID" id="10551" level="7" />
 		</parameters>
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -1249,11 +1245,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml
index 555924dc29..6b128d4b63 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml
@@ -2131,7 +2131,6 @@
 			<value level="6">51</value>
 			<value level="7">53</value>
 		</mpConsume>
-		<nextAction>ATTACK</nextAction>
 		<castRange>400</castRange>
 		<effectRange>900</effectRange>
 		<hitTime>500</hitTime>
@@ -2172,7 +2171,7 @@
 					<value level="7">13457</value>
 				</npcId>
 				<npcCount>3</npcCount>
-				<despawnDelay>30000</despawnDelay>
+				<despawnDelay>17000</despawnDelay>
 			</effect>
 		</effects>
 		<endEffects>
@@ -3326,6 +3325,7 @@
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
 		<reuseDelay>1000</reuseDelay>
+		<nextAction>ATTACK</nextAction>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
@@ -3373,8 +3373,7 @@
 			<effect name="CriticalRatePositionBonus">
 				<amount>
 					<value level="1">30</value>
-					<value level="1">40</value>
-					<value level="2">40</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="2">40</value>
 				</amount>
 				<mode>PER</mode>
 				<position>SIDE</position>
@@ -3382,8 +3381,7 @@
 			<effect name="CriticalRatePositionBonus">
 				<amount>
 					<value level="1">60</value>
-					<value level="1">70</value>
-					<value level="2">70</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="2">70</value>
 				</amount>
 				<mode>PER</mode>
 				<position>BACK</position>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19300-19399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19300-19399.xml
index 0c0155ae19..5f2ffabae3 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19300-19399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19300-19399.xml
@@ -18,29 +18,23 @@
 		<icon>icon.skill19301</icon>
 		<operateType>A1</operateType>
 		<coolTime>500</coolTime>
-		<mpConsume>107</mpConsume>
-		<castRange>900</castRange>
-		<abnormalLvl>
-			<value level="1">1</value>
-			<value level="2">2</value>
-			<value level="3">3</value>
-			<value level="4">4</value>
-			<value level="5">5</value>
-			<value level="6">6</value>
-			<value level="7">7</value>
-			<value level="8">8</value>
-			<value level="9">9</value>
-		</abnormalLvl>
-		<reuseDelay>15000</reuseDelay>
-		<abnormalTime>15</abnormalTime>
-		<abnormalType>POISON</abnormalType>
-		<abnormalVisualEffect>DOT_POISON</abnormalVisualEffect>
-		<activateRate>130</activateRate>
-		<affectLimit>5-12</affectLimit>
-		<affectRange>300</affectRange>
-		<operateType>A2</operateType>
-		<coolTime>500</coolTime>
 		<magicCriticalRate>5</magicCriticalRate>
+		<mpConsume>
+			<value level="1">76</value>
+			<value level="2">79</value>
+			<value level="3">83</value>
+			<value level="4">87</value>
+			<value level="5">91</value>
+			<value level="6">95</value>
+			<value level="7">99</value>
+			<value level="8">103</value>
+			<value level="9">107</value>
+		</mpConsume>
+		<castRange>900</castRange>
+		<effectRange>1100</effectRange>
+		<hitTime>2000</hitTime>
+		<reuseDelay>15000</reuseDelay>
+		<effectPoint>-711</effectPoint>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">87</value>
@@ -52,19 +46,9 @@
 			<value level="8">103</value>
 			<value level="9">105</value>
 		</magicLvl>
-		<lvlBonusRate>20</lvlBonusRate>
-		<mpConsume>1</mpConsume>
-		<effectPoint>-711</effectPoint>
-		<effectRange>900</effectRange>
 		<isDebuff>true</isDebuff>
-		<basicProperty>NONE</basicProperty>
-		<hitTime>2000</hitTime>
-		<hitCancelTime>0</hitCancelTime>
-		<trait>ZONE</trait>
 		<targetType>GROUND</targetType>
-		<affectScope>POINT_BLANK</affectScope>
-		<affectObject>NOT_FRIEND</affectObject>
-		<channelingStart>1</channelingStart>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="SummonNpc">
 				<npcId>
@@ -79,8 +63,6 @@
 					<value level="9">13549</value>
 				</npcId>
 				<npcCount>1</npcCount>
-				<despawnDelay>15000</despawnDelay>
-				<singleInstance>true</singleInstance>
 			</effect>
 		</effects>
 	</skill>
@@ -122,7 +104,7 @@
 		<isDebuff>true</isDebuff>
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
-		<trait>ZONE</trait>
+		<trait>POISON</trait>
 		<targetType>SELF</targetType>
 		<affectScope>POINT_BLANK</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AreaSkillNpc.java
index 155cfb90b1..7cc32dc91c 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AreaSkillNpc.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AreaSkillNpc.java
@@ -61,6 +61,19 @@ public class AreaSkillNpc extends AbstractNpcAI
 		13452, // Solo Dance
 		13453, // Solo Dance
 		13454, // Solo Dance
+		13576, // Solo Dance
+		13577, // Solo Dance
+		13541, // Solo Dance
+		13542, // Solo Dance
+		13543, // Solo Dance
+		13544, // Solo Dance
+		13545, // Solo Dance
+		13546, // Solo Dance
+		13547, // Solo Dance
+		13548, // Solo Dance
+		13549, // Solo Dance
+		13580, // Solo Dance
+		13581, // Solo Dance
 	};
 	private static final int[] DECOY = // ai_decoy
 	{
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Incarnation.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Incarnation.java
index 86365678a9..353e4f7202 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Incarnation.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Incarnation.java
@@ -50,6 +50,8 @@ public class Incarnation extends AbstractNpcAI
 	@Id(13455)
 	@Id(13456)
 	@Id(13457)
+	@Id(13578)
+	@Id(13579)
 	public void onNpcSpawn(OnNpcSpawn event)
 	{
 		final Npc npc = event.getNpc();
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/13300-13399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/13300-13399.xml
index 749cfde15b..270601d138 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/13300-13399.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/13300-13399.xml
@@ -58,7 +58,6 @@
 		</collision>
 	</npc>
 	<npc id="13302" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="1" />
 			<skill name="Skill02_ID" id="10551" level="1" />
@@ -71,7 +70,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1120.6" magical="581.85" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -79,6 +78,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -92,7 +92,6 @@
 		</collision>
 	</npc>
 	<npc id="13303" level="90" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="2" />
 			<skill name="Skill02_ID" id="10551" level="2" />
@@ -105,7 +104,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1236.65" magical="658.8" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -113,6 +112,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -126,7 +126,6 @@
 		</collision>
 	</npc>
 	<npc id="13304" level="95" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="3" />
 			<skill name="Skill02_ID" id="10551" level="3" />
@@ -139,7 +138,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1320.9" magical="366" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1320.9" magical="366" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1364.85" magical="745.2" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -147,6 +146,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -160,7 +160,6 @@
 		</collision>
 	</npc>
 	<npc id="13305" level="97" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="4" />
 			<skill name="Skill02_ID" id="10551" level="4" />
@@ -173,7 +172,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -181,6 +180,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -330,7 +330,6 @@
 		</collision>
 	</npc>
 	<npc id="13310" level="85" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2416,7 +2415,6 @@
 		</collision>
 	</npc>
 	<npc id="13377" level="87" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2451,7 +2449,6 @@
 		</collision>
 	</npc>
 	<npc id="13378" level="90" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2486,7 +2483,6 @@
 		</collision>
 	</npc>
 	<npc id="13379" level="93" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2521,7 +2517,6 @@
 		</collision>
 	</npc>
 	<npc id="13380" level="96" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2556,7 +2551,6 @@
 		</collision>
 	</npc>
 	<npc id="13381" level="99" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/13400-13499.xml
index 4820821b58..38274fc00c 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/13400-13499.xml
@@ -1081,7 +1081,6 @@
 		</collision>
 	</npc>
 	<npc id="13452" level="101" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1112,7 +1111,6 @@
 		</collision>
 	</npc>
 	<npc id="13453" level="103" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1143,7 +1141,6 @@
 		</collision>
 	</npc>
 	<npc id="13454" level="105" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1173,8 +1170,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13455" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13455" level="101" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="5" />
 			<skill name="Skill02_ID" id="10551" level="5" />
@@ -1187,11 +1183,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1204,8 +1201,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13456" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13456" level="103" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="6" />
 			<skill name="Skill02_ID" id="10551" level="6" />
@@ -1218,11 +1214,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1235,11 +1232,10 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13457" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13457" level="105" type="Doppelganger" name="Incarnation">
 		<parameters>
-			<skill name="Skill01_ID" id="10550" level="4" />
-			<skill name="Skill02_ID" id="10551" level="4" />
+			<skill name="Skill01_ID" id="10550" level="7" />
+			<skill name="Skill02_ID" id="10551" level="7" />
 		</parameters>
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -1249,11 +1245,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml
index 336a1a5c4f..8138afe7c1 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml
@@ -2131,7 +2131,6 @@
 			<value level="6">51</value>
 			<value level="7">53</value>
 		</mpConsume>
-		<nextAction>ATTACK</nextAction>
 		<castRange>400</castRange>
 		<effectRange>900</effectRange>
 		<hitTime>500</hitTime>
@@ -2172,7 +2171,7 @@
 					<value level="7">13457</value>
 				</npcId>
 				<npcCount>3</npcCount>
-				<despawnDelay>30000</despawnDelay>
+				<despawnDelay>17000</despawnDelay>
 			</effect>
 		</effects>
 		<endEffects>
@@ -3326,6 +3325,7 @@
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
 		<reuseDelay>1000</reuseDelay>
+		<nextAction>ATTACK</nextAction>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
@@ -3373,8 +3373,7 @@
 			<effect name="CriticalRatePositionBonus">
 				<amount>
 					<value level="1">30</value>
-					<value level="1">40</value>
-					<value level="2">40</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="2">40</value>
 				</amount>
 				<mode>PER</mode>
 				<position>SIDE</position>
@@ -3382,8 +3381,7 @@
 			<effect name="CriticalRatePositionBonus">
 				<amount>
 					<value level="1">60</value>
-					<value level="1">70</value>
-					<value level="2">70</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="2">70</value>
 				</amount>
 				<mode>PER</mode>
 				<position>BACK</position>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19300-19399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19300-19399.xml
index 650115923c..4af9ce6f0c 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19300-19399.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19300-19399.xml
@@ -18,29 +18,23 @@
 		<icon>icon.skill19301</icon>
 		<operateType>A1</operateType>
 		<coolTime>500</coolTime>
-		<mpConsume>107</mpConsume>
-		<castRange>900</castRange>
-		<abnormalLvl>
-			<value level="1">1</value>
-			<value level="2">2</value>
-			<value level="3">3</value>
-			<value level="4">4</value>
-			<value level="5">5</value>
-			<value level="6">6</value>
-			<value level="7">7</value>
-			<value level="8">8</value>
-			<value level="9">9</value>
-		</abnormalLvl>
-		<reuseDelay>15000</reuseDelay>
-		<abnormalTime>15</abnormalTime>
-		<abnormalType>POISON</abnormalType>
-		<abnormalVisualEffect>DOT_POISON</abnormalVisualEffect>
-		<activateRate>130</activateRate>
-		<affectLimit>5-12</affectLimit>
-		<affectRange>300</affectRange>
-		<operateType>A2</operateType>
-		<coolTime>500</coolTime>
 		<magicCriticalRate>5</magicCriticalRate>
+		<mpConsume>
+			<value level="1">76</value>
+			<value level="2">79</value>
+			<value level="3">83</value>
+			<value level="4">87</value>
+			<value level="5">91</value>
+			<value level="6">95</value>
+			<value level="7">99</value>
+			<value level="8">103</value>
+			<value level="9">107</value>
+		</mpConsume>
+		<castRange>900</castRange>
+		<effectRange>1100</effectRange>
+		<hitTime>2000</hitTime>
+		<reuseDelay>15000</reuseDelay>
+		<effectPoint>-711</effectPoint>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">87</value>
@@ -52,19 +46,9 @@
 			<value level="8">103</value>
 			<value level="9">105</value>
 		</magicLvl>
-		<lvlBonusRate>20</lvlBonusRate>
-		<mpConsume>1</mpConsume>
-		<effectPoint>-711</effectPoint>
-		<effectRange>900</effectRange>
 		<isDebuff>true</isDebuff>
-		<basicProperty>NONE</basicProperty>
-		<hitTime>2000</hitTime>
-		<hitCancelTime>0</hitCancelTime>
-		<trait>ZONE</trait>
 		<targetType>GROUND</targetType>
-		<affectScope>POINT_BLANK</affectScope>
-		<affectObject>NOT_FRIEND</affectObject>
-		<channelingStart>1</channelingStart>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="SummonNpc">
 				<npcId>
@@ -79,8 +63,6 @@
 					<value level="9">13549</value>
 				</npcId>
 				<npcCount>1</npcCount>
-				<despawnDelay>15000</despawnDelay>
-				<singleInstance>true</singleInstance>
 			</effect>
 		</effects>
 	</skill>
@@ -122,7 +104,7 @@
 		<isDebuff>true</isDebuff>
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
-		<trait>ZONE</trait>
+		<trait>POISON</trait>
 		<targetType>SELF</targetType>
 		<affectScope>POINT_BLANK</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AreaSkillNpc.java
index 155cfb90b1..7cc32dc91c 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AreaSkillNpc.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AreaSkillNpc.java
@@ -61,6 +61,19 @@ public class AreaSkillNpc extends AbstractNpcAI
 		13452, // Solo Dance
 		13453, // Solo Dance
 		13454, // Solo Dance
+		13576, // Solo Dance
+		13577, // Solo Dance
+		13541, // Solo Dance
+		13542, // Solo Dance
+		13543, // Solo Dance
+		13544, // Solo Dance
+		13545, // Solo Dance
+		13546, // Solo Dance
+		13547, // Solo Dance
+		13548, // Solo Dance
+		13549, // Solo Dance
+		13580, // Solo Dance
+		13581, // Solo Dance
 	};
 	private static final int[] DECOY = // ai_decoy
 	{
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Incarnation.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Incarnation.java
index 86365678a9..353e4f7202 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Incarnation.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Incarnation.java
@@ -50,6 +50,8 @@ public class Incarnation extends AbstractNpcAI
 	@Id(13455)
 	@Id(13456)
 	@Id(13457)
+	@Id(13578)
+	@Id(13579)
 	public void onNpcSpawn(OnNpcSpawn event)
 	{
 		final Npc npc = event.getNpc();
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/13300-13399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/13300-13399.xml
index 749cfde15b..270601d138 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/13300-13399.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/13300-13399.xml
@@ -58,7 +58,6 @@
 		</collision>
 	</npc>
 	<npc id="13302" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="1" />
 			<skill name="Skill02_ID" id="10551" level="1" />
@@ -71,7 +70,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1120.6" magical="581.85" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -79,6 +78,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -92,7 +92,6 @@
 		</collision>
 	</npc>
 	<npc id="13303" level="90" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="2" />
 			<skill name="Skill02_ID" id="10551" level="2" />
@@ -105,7 +104,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1236.65" magical="658.8" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -113,6 +112,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -126,7 +126,6 @@
 		</collision>
 	</npc>
 	<npc id="13304" level="95" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="3" />
 			<skill name="Skill02_ID" id="10551" level="3" />
@@ -139,7 +138,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1320.9" magical="366" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1320.9" magical="366" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1364.85" magical="745.2" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -147,6 +146,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -160,7 +160,6 @@
 		</collision>
 	</npc>
 	<npc id="13305" level="97" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="4" />
 			<skill name="Skill02_ID" id="10551" level="4" />
@@ -173,7 +172,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -181,6 +180,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -330,7 +330,6 @@
 		</collision>
 	</npc>
 	<npc id="13310" level="85" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2416,7 +2415,6 @@
 		</collision>
 	</npc>
 	<npc id="13377" level="87" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2451,7 +2449,6 @@
 		</collision>
 	</npc>
 	<npc id="13378" level="90" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2486,7 +2483,6 @@
 		</collision>
 	</npc>
 	<npc id="13379" level="93" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2521,7 +2517,6 @@
 		</collision>
 	</npc>
 	<npc id="13380" level="96" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2556,7 +2551,6 @@
 		</collision>
 	</npc>
 	<npc id="13381" level="99" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/13400-13499.xml
index 4820821b58..38274fc00c 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/13400-13499.xml
@@ -1081,7 +1081,6 @@
 		</collision>
 	</npc>
 	<npc id="13452" level="101" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1112,7 +1111,6 @@
 		</collision>
 	</npc>
 	<npc id="13453" level="103" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1143,7 +1141,6 @@
 		</collision>
 	</npc>
 	<npc id="13454" level="105" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1173,8 +1170,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13455" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13455" level="101" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="5" />
 			<skill name="Skill02_ID" id="10551" level="5" />
@@ -1187,11 +1183,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1204,8 +1201,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13456" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13456" level="103" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="6" />
 			<skill name="Skill02_ID" id="10551" level="6" />
@@ -1218,11 +1214,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1235,11 +1232,10 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13457" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13457" level="105" type="Doppelganger" name="Incarnation">
 		<parameters>
-			<skill name="Skill01_ID" id="10550" level="4" />
-			<skill name="Skill02_ID" id="10551" level="4" />
+			<skill name="Skill01_ID" id="10550" level="7" />
+			<skill name="Skill02_ID" id="10551" level="7" />
 		</parameters>
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -1249,11 +1245,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml
index 662c71b25d..a27529fb42 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml
@@ -2131,7 +2131,6 @@
 			<value level="6">51</value>
 			<value level="7">53</value>
 		</mpConsume>
-		<nextAction>ATTACK</nextAction>
 		<castRange>400</castRange>
 		<effectRange>900</effectRange>
 		<hitTime>500</hitTime>
@@ -2172,7 +2171,7 @@
 					<value level="7">13457</value>
 				</npcId>
 				<npcCount>3</npcCount>
-				<despawnDelay>30000</despawnDelay>
+				<despawnDelay>17000</despawnDelay>
 			</effect>
 		</effects>
 		<endEffects>
@@ -3326,6 +3325,7 @@
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
 		<reuseDelay>1000</reuseDelay>
+		<nextAction>ATTACK</nextAction>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
@@ -3373,8 +3373,7 @@
 			<effect name="CriticalRatePositionBonus">
 				<amount>
 					<value level="1">30</value>
-					<value level="1">40</value>
-					<value level="2">40</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="2">40</value>
 				</amount>
 				<mode>PER</mode>
 				<position>SIDE</position>
@@ -3382,8 +3381,7 @@
 			<effect name="CriticalRatePositionBonus">
 				<amount>
 					<value level="1">60</value>
-					<value level="1">70</value>
-					<value level="2">70</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="2">70</value>
 				</amount>
 				<mode>PER</mode>
 				<position>BACK</position>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19300-19399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19300-19399.xml
index 63e676fb86..eec0ad72fd 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19300-19399.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19300-19399.xml
@@ -18,29 +18,23 @@
 		<icon>icon.skill19301</icon>
 		<operateType>A1</operateType>
 		<coolTime>500</coolTime>
-		<mpConsume>107</mpConsume>
-		<castRange>900</castRange>
-		<abnormalLvl>
-			<value level="1">1</value>
-			<value level="2">2</value>
-			<value level="3">3</value>
-			<value level="4">4</value>
-			<value level="5">5</value>
-			<value level="6">6</value>
-			<value level="7">7</value>
-			<value level="8">8</value>
-			<value level="9">9</value>
-		</abnormalLvl>
-		<reuseDelay>15000</reuseDelay>
-		<abnormalTime>15</abnormalTime>
-		<abnormalType>POISON</abnormalType>
-		<abnormalVisualEffect>DOT_POISON</abnormalVisualEffect>
-		<activateRate>130</activateRate>
-		<affectLimit>5-12</affectLimit>
-		<affectRange>300</affectRange>
-		<operateType>A2</operateType>
-		<coolTime>500</coolTime>
 		<magicCriticalRate>5</magicCriticalRate>
+		<mpConsume>
+			<value level="1">76</value>
+			<value level="2">79</value>
+			<value level="3">83</value>
+			<value level="4">87</value>
+			<value level="5">91</value>
+			<value level="6">95</value>
+			<value level="7">99</value>
+			<value level="8">103</value>
+			<value level="9">107</value>
+		</mpConsume>
+		<castRange>900</castRange>
+		<effectRange>1100</effectRange>
+		<hitTime>2000</hitTime>
+		<reuseDelay>15000</reuseDelay>
+		<effectPoint>-711</effectPoint>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">87</value>
@@ -52,19 +46,9 @@
 			<value level="8">103</value>
 			<value level="9">105</value>
 		</magicLvl>
-		<lvlBonusRate>20</lvlBonusRate>
-		<mpConsume>1</mpConsume>
-		<effectPoint>-711</effectPoint>
-		<effectRange>900</effectRange>
 		<isDebuff>true</isDebuff>
-		<basicProperty>NONE</basicProperty>
-		<hitTime>2000</hitTime>
-		<hitCancelTime>0</hitCancelTime>
-		<trait>ZONE</trait>
 		<targetType>GROUND</targetType>
-		<affectScope>POINT_BLANK</affectScope>
-		<affectObject>NOT_FRIEND</affectObject>
-		<channelingStart>1</channelingStart>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="SummonNpc">
 				<npcId>
@@ -79,8 +63,6 @@
 					<value level="9">13549</value>
 				</npcId>
 				<npcCount>1</npcCount>
-				<despawnDelay>15000</despawnDelay>
-				<singleInstance>true</singleInstance>
 			</effect>
 		</effects>
 	</skill>
@@ -122,7 +104,7 @@
 		<isDebuff>true</isDebuff>
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
-		<trait>ZONE</trait>
+		<trait>POISON</trait>
 		<targetType>SELF</targetType>
 		<affectScope>POINT_BLANK</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/AreaSkillNpc.java
index 155cfb90b1..7cc32dc91c 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/AreaSkillNpc.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/AreaSkillNpc.java
@@ -61,6 +61,19 @@ public class AreaSkillNpc extends AbstractNpcAI
 		13452, // Solo Dance
 		13453, // Solo Dance
 		13454, // Solo Dance
+		13576, // Solo Dance
+		13577, // Solo Dance
+		13541, // Solo Dance
+		13542, // Solo Dance
+		13543, // Solo Dance
+		13544, // Solo Dance
+		13545, // Solo Dance
+		13546, // Solo Dance
+		13547, // Solo Dance
+		13548, // Solo Dance
+		13549, // Solo Dance
+		13580, // Solo Dance
+		13581, // Solo Dance
 	};
 	private static final int[] DECOY = // ai_decoy
 	{
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Incarnation.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Incarnation.java
index 86365678a9..353e4f7202 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Incarnation.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Incarnation.java
@@ -50,6 +50,8 @@ public class Incarnation extends AbstractNpcAI
 	@Id(13455)
 	@Id(13456)
 	@Id(13457)
+	@Id(13578)
+	@Id(13579)
 	public void onNpcSpawn(OnNpcSpawn event)
 	{
 		final Npc npc = event.getNpc();
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/13300-13399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/13300-13399.xml
index 50e67f9c1f..7284c162d6 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/13300-13399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/13300-13399.xml
@@ -58,7 +58,6 @@
 		</collision>
 	</npc>
 	<npc id="13302" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="1" />
 			<skill name="Skill02_ID" id="10551" level="1" />
@@ -71,7 +70,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1120.6" magical="581.85" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -79,6 +78,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -92,7 +92,6 @@
 		</collision>
 	</npc>
 	<npc id="13303" level="90" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="2" />
 			<skill name="Skill02_ID" id="10551" level="2" />
@@ -105,7 +104,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1236.65" magical="658.8" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -113,6 +112,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -126,7 +126,6 @@
 		</collision>
 	</npc>
 	<npc id="13304" level="95" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="3" />
 			<skill name="Skill02_ID" id="10551" level="3" />
@@ -139,7 +138,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1320.9" magical="366" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1320.9" magical="366" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1364.85" magical="745.2" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -147,6 +146,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -160,7 +160,6 @@
 		</collision>
 	</npc>
 	<npc id="13305" level="97" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="4" />
 			<skill name="Skill02_ID" id="10551" level="4" />
@@ -173,7 +172,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -181,6 +180,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -330,7 +330,6 @@
 		</collision>
 	</npc>
 	<npc id="13310" level="85" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2416,7 +2415,6 @@
 		</collision>
 	</npc>
 	<npc id="13377" level="87" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2451,7 +2449,6 @@
 		</collision>
 	</npc>
 	<npc id="13378" level="90" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2486,7 +2483,6 @@
 		</collision>
 	</npc>
 	<npc id="13379" level="93" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2521,7 +2517,6 @@
 		</collision>
 	</npc>
 	<npc id="13380" level="96" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2556,7 +2551,6 @@
 		</collision>
 	</npc>
 	<npc id="13381" level="99" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/13400-13499.xml
index 43fbaeadbb..87cf662f9f 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/13400-13499.xml
@@ -1081,7 +1081,6 @@
 		</collision>
 	</npc>
 	<npc id="13452" level="101" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1112,7 +1111,6 @@
 		</collision>
 	</npc>
 	<npc id="13453" level="103" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1143,7 +1141,6 @@
 		</collision>
 	</npc>
 	<npc id="13454" level="105" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1173,8 +1170,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13455" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13455" level="101" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="5" />
 			<skill name="Skill02_ID" id="10551" level="5" />
@@ -1187,11 +1183,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1204,8 +1201,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13456" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13456" level="103" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="6" />
 			<skill name="Skill02_ID" id="10551" level="6" />
@@ -1218,11 +1214,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1235,11 +1232,10 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13457" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13457" level="105" type="Doppelganger" name="Incarnation">
 		<parameters>
-			<skill name="Skill01_ID" id="10550" level="4" />
-			<skill name="Skill02_ID" id="10551" level="4" />
+			<skill name="Skill01_ID" id="10550" level="7" />
+			<skill name="Skill02_ID" id="10551" level="7" />
 		</parameters>
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -1249,11 +1245,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/13500-13599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/13500-13599.xml
index ef91bb59d2..89a8446f13 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/13500-13599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/13500-13599.xml
@@ -1209,87 +1209,129 @@
 			<height normal="9.5" />
 		</collision>
 	</npc>
-	<npc id="13576" level="85" type="Npc" name="Poison Swarm">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
-			<speed>
-				<walk ground="1" />
-				<run ground="20" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="0.001" />
-			<height normal="0.001" />
-		</collision>
-	</npc>
-	<npc id="13577" level="85" type="Npc" name="Poison Swarm">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
-			<speed>
-				<walk ground="1" />
-				<run ground="20" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="0.001" />
-			<height normal="0.001" />
-		</collision>
-	</npc>
-	<npc id="13578" level="85" type="Npc" name="Clone Attack">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
-			<speed>
-				<walk ground="50" />
-				<run ground="131" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="8.5" />
-			<height normal="25" />
-		</collision>
-	</npc>
-	<npc id="13579" level="85" type="Npc" name="Clone Attack">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
-			<speed>
-				<walk ground="50" />
-				<run ground="131" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="8.5" />
-			<height normal="25" />
-		</collision>
-	</npc>
-	<npc id="13580" level="107" type="EffectPoint" name="Istina Acid Swarm">
+	<npc id="13576" level="107" type="EffectPoint" name="Solo Dance">
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
-			<skill name="union_skill" id="19302" level="8" />
+			<skill name="union_skill" id="10523" level="10" />
+		</parameters>
+		<race>CONSTRUCT</race>
+		<sex>MALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="20" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" targetable="false" showName="false" />
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" />
+		<collision>
+			<radius normal="0.001" />
+			<height normal="0.001" />
+		</collision>
+	</npc>
+	<npc id="13577" level="109" type="EffectPoint" name="Solo Dance">
+		<parameters>
+			<param name="skill_delay" value="2" />
+			<param name="despawn_time" value="15" />
+			<skill name="union_skill" id="10523" level="11" />
+		</parameters>
+		<race>CONSTRUCT</race>
+		<sex>MALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="20" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" targetable="false" showName="false" />
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" />
+		<collision>
+			<radius normal="0.001" />
+			<height normal="0.001" />
+		</collision>
+	</npc>
+	<npc id="13578" level="107" type="Doppelganger" name="Incarnation">
+		<parameters>
+			<skill name="Skill01_ID" id="10550" level="8" />
+			<skill name="Skill02_ID" id="10551" level="8" />
+		</parameters>
+		<race>ETC</race>
+		<sex>ETC</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="131" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
+		<skillList>
+			<skill id="4416" level="19" /> <!-- Others -->
+			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
+			<skill id="4415" level="1" /> <!-- Bare Hands -->
+			<skill id="10550" level="8" /> <!-- Illusion Strike -->
+			<skill id="10551" level="8" /> <!-- Illusion Trick -->
+		</skillList>
+		<collision>
+			<radius normal="8.5" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="13579" level="109" type="Doppelganger" name="Incarnation">
+		<parameters>
+			<skill name="Skill01_ID" id="10550" level="9" />
+			<skill name="Skill02_ID" id="10551" level="9" />
+		</parameters>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="131" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
+		<skillList>
+			<skill id="4416" level="19" /> <!-- Others -->
+			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
+			<skill id="4415" level="1" /> <!-- Bare Hands -->
+			<skill id="10550" level="9" /> <!-- Illusion Strike -->
+			<skill id="10551" level="9" /> <!-- Illusion Trick -->
+		</skillList>
+		<collision>
+			<radius normal="8.5" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="13580" level="107" type="EffectPoint" name="Solo Dance">
+		<parameters>
+			<param name="skill_delay" value="2" />
+			<param name="despawn_time" value="15" />
+			<skill name="union_skill" id="19302" level="10" />
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -1311,18 +1353,18 @@
 			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="19302" level="8" /> <!-- Thrown Acid Sworm -->
+			<skill id="19302" level="10" /> <!-- Thrown Acid Sworm -->
 		</skillList>
 		<collision>
 			<radius normal="0.001" />
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13581" level="109" type="EffectPoint" name="Istina Acid Swarm">
+	<npc id="13581" level="109" type="EffectPoint" name="Solo Dance">
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
-			<skill name="union_skill" id="19302" level="9" />
+			<skill name="union_skill" id="19302" level="11" />
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -1344,7 +1386,7 @@
 			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="19302" level="9" /> <!-- Thrown Acid Sworm -->
+			<skill id="19302" level="11" /> <!-- Thrown Acid Sworm -->
 		</skillList>
 		<collision>
 			<radius normal="0.001" />
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml
index f6b5122ecf..8cbcc2aa01 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml
@@ -1626,8 +1626,8 @@
 					<value level="7">13452</value>
 					<value level="8">13453</value>
 					<value level="9">13454</value>
-					<value level="10">13454</value>
-					<value level="11">13454</value>
+					<value level="10">13576</value>
+					<value level="11">13577</value>
 				</npcId>
 				<npcCount>1</npcCount>
 			</effect>
@@ -2280,7 +2280,6 @@
 			<value level="8">55</value>
 			<value level="9">57</value>
 		</mpConsume>
-		<nextAction>ATTACK</nextAction>
 		<castRange>400</castRange>
 		<effectRange>900</effectRange>
 		<hitTime>500</hitTime>
@@ -2321,11 +2320,11 @@
 					<value level="5">13455</value>
 					<value level="6">13456</value>
 					<value level="7">13457</value>
-					<value level="8">13457</value>
-					<value level="9">13457</value>
+					<value level="8">13578</value>
+					<value level="9">13579</value>
 				</npcId>
 				<npcCount>3</npcCount>
-				<despawnDelay>30000</despawnDelay>
+				<despawnDelay>17000</despawnDelay>
 			</effect>
 		</effects>
 		<endEffects>
@@ -3517,6 +3516,7 @@
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
 		<reuseDelay>1000</reuseDelay>
+		<nextAction>ATTACK</nextAction>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19300-19399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19300-19399.xml
index 500b996748..a4e680141c 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19300-19399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19300-19399.xml
@@ -18,31 +18,25 @@
 		<icon>icon.skill19301</icon>
 		<operateType>A1</operateType>
 		<coolTime>500</coolTime>
-		<mpConsume>107</mpConsume>
-		<castRange>900</castRange>
-		<abnormalLvl>
-			<value level="1">1</value>
-			<value level="2">2</value>
-			<value level="3">3</value>
-			<value level="4">4</value>
-			<value level="5">5</value>
-			<value level="6">6</value>
-			<value level="7">7</value>
-			<value level="8">8</value>
-			<value level="9">9</value>
-			<value level="10">10</value>
-			<value level="11">11</value>
-		</abnormalLvl>
-		<reuseDelay>15000</reuseDelay>
-		<abnormalTime>15</abnormalTime>
-		<abnormalType>POISON</abnormalType>
-		<abnormalVisualEffect>DOT_POISON</abnormalVisualEffect>
-		<activateRate>130</activateRate>
-		<affectLimit>5-12</affectLimit>
-		<affectRange>300</affectRange>
-		<operateType>A2</operateType>
-		<coolTime>500</coolTime>
 		<magicCriticalRate>5</magicCriticalRate>
+		<mpConsume>
+			<value level="1">76</value>
+			<value level="2">79</value>
+			<value level="3">83</value>
+			<value level="4">87</value>
+			<value level="5">91</value>
+			<value level="6">95</value>
+			<value level="7">99</value>
+			<value level="8">103</value>
+			<value level="9">107</value>
+			<value level="10">111</value>
+			<value level="11">115</value>
+		</mpConsume>
+		<castRange>900</castRange>
+		<effectRange>1100</effectRange>
+		<hitTime>2000</hitTime>
+		<reuseDelay>15000</reuseDelay>
+		<effectPoint>-711</effectPoint>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">87</value>
@@ -56,19 +50,9 @@
 			<value level="10">107</value>
 			<value level="11">109</value>
 		</magicLvl>
-		<lvlBonusRate>20</lvlBonusRate>
-		<mpConsume>1</mpConsume>
-		<effectPoint>-711</effectPoint>
-		<effectRange>900</effectRange>
 		<isDebuff>true</isDebuff>
-		<basicProperty>NONE</basicProperty>
-		<hitTime>2000</hitTime>
-		<hitCancelTime>0</hitCancelTime>
-		<trait>ZONE</trait>
 		<targetType>GROUND</targetType>
-		<affectScope>POINT_BLANK</affectScope>
-		<affectObject>NOT_FRIEND</affectObject>
-		<channelingStart>1</channelingStart>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="SummonNpc">
 				<npcId>
@@ -85,8 +69,6 @@
 					<value level="11">13581</value>
 				</npcId>
 				<npcCount>1</npcCount>
-				<despawnDelay>15000</despawnDelay>
-				<singleInstance>true</singleInstance>
 			</effect>
 		</effects>
 	</skill>
@@ -132,7 +114,7 @@
 		<isDebuff>true</isDebuff>
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
-		<trait>ZONE</trait>
+		<trait>POISON</trait>
 		<targetType>SELF</targetType>
 		<affectScope>POINT_BLANK</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/AreaSkillNpc.java
index 155cfb90b1..7cc32dc91c 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/AreaSkillNpc.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/AreaSkillNpc.java
@@ -61,6 +61,19 @@ public class AreaSkillNpc extends AbstractNpcAI
 		13452, // Solo Dance
 		13453, // Solo Dance
 		13454, // Solo Dance
+		13576, // Solo Dance
+		13577, // Solo Dance
+		13541, // Solo Dance
+		13542, // Solo Dance
+		13543, // Solo Dance
+		13544, // Solo Dance
+		13545, // Solo Dance
+		13546, // Solo Dance
+		13547, // Solo Dance
+		13548, // Solo Dance
+		13549, // Solo Dance
+		13580, // Solo Dance
+		13581, // Solo Dance
 	};
 	private static final int[] DECOY = // ai_decoy
 	{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Incarnation.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Incarnation.java
index 86365678a9..353e4f7202 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Incarnation.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Incarnation.java
@@ -50,6 +50,8 @@ public class Incarnation extends AbstractNpcAI
 	@Id(13455)
 	@Id(13456)
 	@Id(13457)
+	@Id(13578)
+	@Id(13579)
 	public void onNpcSpawn(OnNpcSpawn event)
 	{
 		final Npc npc = event.getNpc();
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/13300-13399.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/13300-13399.xml
index 50e67f9c1f..7284c162d6 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/13300-13399.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/13300-13399.xml
@@ -58,7 +58,6 @@
 		</collision>
 	</npc>
 	<npc id="13302" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="1" />
 			<skill name="Skill02_ID" id="10551" level="1" />
@@ -71,7 +70,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1120.6" magical="581.85" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -79,6 +78,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -92,7 +92,6 @@
 		</collision>
 	</npc>
 	<npc id="13303" level="90" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="2" />
 			<skill name="Skill02_ID" id="10551" level="2" />
@@ -105,7 +104,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1236.65" magical="658.8" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -113,6 +112,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -126,7 +126,6 @@
 		</collision>
 	</npc>
 	<npc id="13304" level="95" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="3" />
 			<skill name="Skill02_ID" id="10551" level="3" />
@@ -139,7 +138,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1320.9" magical="366" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1320.9" magical="366" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1364.85" magical="745.2" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -147,6 +146,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -160,7 +160,6 @@
 		</collision>
 	</npc>
 	<npc id="13305" level="97" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="4" />
 			<skill name="Skill02_ID" id="10551" level="4" />
@@ -173,7 +172,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -181,6 +180,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -330,7 +330,6 @@
 		</collision>
 	</npc>
 	<npc id="13310" level="85" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2416,7 +2415,6 @@
 		</collision>
 	</npc>
 	<npc id="13377" level="87" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2451,7 +2449,6 @@
 		</collision>
 	</npc>
 	<npc id="13378" level="90" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2486,7 +2483,6 @@
 		</collision>
 	</npc>
 	<npc id="13379" level="93" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2521,7 +2517,6 @@
 		</collision>
 	</npc>
 	<npc id="13380" level="96" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2556,7 +2551,6 @@
 		</collision>
 	</npc>
 	<npc id="13381" level="99" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/13400-13499.xml
index 43fbaeadbb..87cf662f9f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/13400-13499.xml
@@ -1081,7 +1081,6 @@
 		</collision>
 	</npc>
 	<npc id="13452" level="101" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1112,7 +1111,6 @@
 		</collision>
 	</npc>
 	<npc id="13453" level="103" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1143,7 +1141,6 @@
 		</collision>
 	</npc>
 	<npc id="13454" level="105" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1173,8 +1170,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13455" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13455" level="101" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="5" />
 			<skill name="Skill02_ID" id="10551" level="5" />
@@ -1187,11 +1183,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1204,8 +1201,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13456" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13456" level="103" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="6" />
 			<skill name="Skill02_ID" id="10551" level="6" />
@@ -1218,11 +1214,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1235,11 +1232,10 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13457" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13457" level="105" type="Doppelganger" name="Incarnation">
 		<parameters>
-			<skill name="Skill01_ID" id="10550" level="4" />
-			<skill name="Skill02_ID" id="10551" level="4" />
+			<skill name="Skill01_ID" id="10550" level="7" />
+			<skill name="Skill02_ID" id="10551" level="7" />
 		</parameters>
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -1249,11 +1245,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/13500-13599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/13500-13599.xml
index 471d3a88e0..eb197c0606 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/13500-13599.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/13500-13599.xml
@@ -1209,87 +1209,129 @@
 			<height normal="9.5" />
 		</collision>
 	</npc>
-	<npc id="13576" level="85" type="Npc" name="Poison Swarm">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
-			<speed>
-				<walk ground="1" />
-				<run ground="20" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="0.001" />
-			<height normal="0.001" />
-		</collision>
-	</npc>
-	<npc id="13577" level="85" type="Npc" name="Poison Swarm">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
-			<speed>
-				<walk ground="1" />
-				<run ground="20" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="0.001" />
-			<height normal="0.001" />
-		</collision>
-	</npc>
-	<npc id="13578" level="85" type="Npc" name="Clone Attack">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
-			<speed>
-				<walk ground="50" />
-				<run ground="131" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="8.5" />
-			<height normal="25" />
-		</collision>
-	</npc>
-	<npc id="13579" level="85" type="Npc" name="Clone Attack">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
-			<speed>
-				<walk ground="50" />
-				<run ground="131" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="8.5" />
-			<height normal="25" />
-		</collision>
-	</npc>
-	<npc id="13580" level="107" type="EffectPoint" name="Istina Acid Swarm">
+	<npc id="13576" level="107" type="EffectPoint" name="Solo Dance">
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
-			<skill name="union_skill" id="19302" level="8" />
+			<skill name="union_skill" id="10523" level="10" />
+		</parameters>
+		<race>CONSTRUCT</race>
+		<sex>MALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="20" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" targetable="false" showName="false" />
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" />
+		<collision>
+			<radius normal="0.001" />
+			<height normal="0.001" />
+		</collision>
+	</npc>
+	<npc id="13577" level="109" type="EffectPoint" name="Solo Dance">
+		<parameters>
+			<param name="skill_delay" value="2" />
+			<param name="despawn_time" value="15" />
+			<skill name="union_skill" id="10523" level="11" />
+		</parameters>
+		<race>CONSTRUCT</race>
+		<sex>MALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="20" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" targetable="false" showName="false" />
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" />
+		<collision>
+			<radius normal="0.001" />
+			<height normal="0.001" />
+		</collision>
+	</npc>
+	<npc id="13578" level="107" type="Doppelganger" name="Incarnation">
+		<parameters>
+			<skill name="Skill01_ID" id="10550" level="8" />
+			<skill name="Skill02_ID" id="10551" level="8" />
+		</parameters>
+		<race>ETC</race>
+		<sex>ETC</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="131" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
+		<skillList>
+			<skill id="4416" level="19" /> <!-- Others -->
+			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
+			<skill id="4415" level="1" /> <!-- Bare Hands -->
+			<skill id="10550" level="8" /> <!-- Illusion Strike -->
+			<skill id="10551" level="8" /> <!-- Illusion Trick -->
+		</skillList>
+		<collision>
+			<radius normal="8.5" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="13579" level="109" type="Doppelganger" name="Incarnation">
+		<parameters>
+			<skill name="Skill01_ID" id="10550" level="9" />
+			<skill name="Skill02_ID" id="10551" level="9" />
+		</parameters>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="131" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
+		<skillList>
+			<skill id="4416" level="19" /> <!-- Others -->
+			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
+			<skill id="4415" level="1" /> <!-- Bare Hands -->
+			<skill id="10550" level="9" /> <!-- Illusion Strike -->
+			<skill id="10551" level="9" /> <!-- Illusion Trick -->
+		</skillList>
+		<collision>
+			<radius normal="8.5" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="13580" level="107" type="EffectPoint" name="Solo Dance">
+		<parameters>
+			<param name="skill_delay" value="2" />
+			<param name="despawn_time" value="15" />
+			<skill name="union_skill" id="19302" level="10" />
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -1311,18 +1353,18 @@
 			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="19302" level="8" /> <!-- Thrown Acid Sworm -->
+			<skill id="19302" level="10" /> <!-- Thrown Acid Sworm -->
 		</skillList>
 		<collision>
 			<radius normal="0.001" />
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13581" level="109" type="EffectPoint" name="Istina Acid Swarm">
+	<npc id="13581" level="109" type="EffectPoint" name="Solo Dance">
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
-			<skill name="union_skill" id="19302" level="9" />
+			<skill name="union_skill" id="19302" level="11" />
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -1344,7 +1386,7 @@
 			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="19302" level="9" /> <!-- Thrown Acid Sworm -->
+			<skill id="19302" level="11" /> <!-- Thrown Acid Sworm -->
 		</skillList>
 		<collision>
 			<radius normal="0.001" />
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml
index d1f2dfa449..94be0b1c70 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml
@@ -1626,8 +1626,8 @@
 					<value level="7">13452</value>
 					<value level="8">13453</value>
 					<value level="9">13454</value>
-					<value level="10">13454</value>
-					<value level="11">13454</value>
+					<value level="10">13576</value>
+					<value level="11">13577</value>
 				</npcId>
 				<npcCount>1</npcCount>
 			</effect>
@@ -2280,7 +2280,6 @@
 			<value level="8">55</value>
 			<value level="9">57</value>
 		</mpConsume>
-		<nextAction>ATTACK</nextAction>
 		<castRange>400</castRange>
 		<effectRange>900</effectRange>
 		<hitTime>500</hitTime>
@@ -2321,11 +2320,11 @@
 					<value level="5">13455</value>
 					<value level="6">13456</value>
 					<value level="7">13457</value>
-					<value level="8">13457</value>
-					<value level="9">13457</value>
+					<value level="8">13578</value>
+					<value level="9">13579</value>
 				</npcId>
 				<npcCount>3</npcCount>
-				<despawnDelay>30000</despawnDelay>
+				<despawnDelay>17000</despawnDelay>
 			</effect>
 		</effects>
 		<endEffects>
@@ -3517,6 +3516,7 @@
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
 		<reuseDelay>1000</reuseDelay>
+		<nextAction>ATTACK</nextAction>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19300-19399.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19300-19399.xml
index 12699b9b77..12ca51b636 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19300-19399.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19300-19399.xml
@@ -18,31 +18,25 @@
 		<icon>icon.skill19301</icon>
 		<operateType>A1</operateType>
 		<coolTime>500</coolTime>
-		<mpConsume>107</mpConsume>
-		<castRange>900</castRange>
-		<abnormalLvl>
-			<value level="1">1</value>
-			<value level="2">2</value>
-			<value level="3">3</value>
-			<value level="4">4</value>
-			<value level="5">5</value>
-			<value level="6">6</value>
-			<value level="7">7</value>
-			<value level="8">8</value>
-			<value level="9">9</value>
-			<value level="10">10</value>
-			<value level="11">11</value>
-		</abnormalLvl>
-		<reuseDelay>15000</reuseDelay>
-		<abnormalTime>15</abnormalTime>
-		<abnormalType>POISON</abnormalType>
-		<abnormalVisualEffect>DOT_POISON</abnormalVisualEffect>
-		<activateRate>130</activateRate>
-		<affectLimit>5-12</affectLimit>
-		<affectRange>300</affectRange>
-		<operateType>A2</operateType>
-		<coolTime>500</coolTime>
 		<magicCriticalRate>5</magicCriticalRate>
+		<mpConsume>
+			<value level="1">76</value>
+			<value level="2">79</value>
+			<value level="3">83</value>
+			<value level="4">87</value>
+			<value level="5">91</value>
+			<value level="6">95</value>
+			<value level="7">99</value>
+			<value level="8">103</value>
+			<value level="9">107</value>
+			<value level="10">111</value>
+			<value level="11">115</value>
+		</mpConsume>
+		<castRange>900</castRange>
+		<effectRange>1100</effectRange>
+		<hitTime>2000</hitTime>
+		<reuseDelay>15000</reuseDelay>
+		<effectPoint>-711</effectPoint>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">87</value>
@@ -56,19 +50,9 @@
 			<value level="10">107</value>
 			<value level="11">109</value>
 		</magicLvl>
-		<lvlBonusRate>20</lvlBonusRate>
-		<mpConsume>1</mpConsume>
-		<effectPoint>-711</effectPoint>
-		<effectRange>900</effectRange>
 		<isDebuff>true</isDebuff>
-		<basicProperty>NONE</basicProperty>
-		<hitTime>2000</hitTime>
-		<hitCancelTime>0</hitCancelTime>
-		<trait>ZONE</trait>
 		<targetType>GROUND</targetType>
-		<affectScope>POINT_BLANK</affectScope>
-		<affectObject>NOT_FRIEND</affectObject>
-		<channelingStart>1</channelingStart>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="SummonNpc">
 				<npcId>
@@ -85,8 +69,6 @@
 					<value level="11">13581</value>
 				</npcId>
 				<npcCount>1</npcCount>
-				<despawnDelay>15000</despawnDelay>
-				<singleInstance>true</singleInstance>
 			</effect>
 		</effects>
 	</skill>
@@ -132,7 +114,7 @@
 		<isDebuff>true</isDebuff>
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
-		<trait>ZONE</trait>
+		<trait>POISON</trait>
 		<targetType>SELF</targetType>
 		<affectScope>POINT_BLANK</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Incarnation.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Incarnation.java
index 86365678a9..353e4f7202 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Incarnation.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Incarnation.java
@@ -50,6 +50,8 @@ public class Incarnation extends AbstractNpcAI
 	@Id(13455)
 	@Id(13456)
 	@Id(13457)
+	@Id(13578)
+	@Id(13579)
 	public void onNpcSpawn(OnNpcSpawn event)
 	{
 		final Npc npc = event.getNpc();
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/13300-13399.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/13300-13399.xml
index 8e8506432c..281c3d17f3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/13300-13399.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/13300-13399.xml
@@ -58,7 +58,6 @@
 		</collision>
 	</npc>
 	<npc id="13302" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="1" />
 			<skill name="Skill02_ID" id="10551" level="1" />
@@ -71,7 +70,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="890.6666667" magical="247" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1120.6" magical="581.85" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -79,6 +78,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -92,7 +92,6 @@
 		</collision>
 	</npc>
 	<npc id="13303" level="90" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="2" />
 			<skill name="Skill02_ID" id="10551" level="2" />
@@ -105,7 +104,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1076.566667" magical="301" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1236.65" magical="658.8" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -113,6 +112,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -126,7 +126,6 @@
 		</collision>
 	</npc>
 	<npc id="13304" level="95" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="3" />
 			<skill name="Skill02_ID" id="10551" level="3" />
@@ -139,7 +138,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1320.9" magical="366" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1320.9" magical="366" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1364.85" magical="745.2" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -147,6 +146,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -160,7 +160,6 @@
 		</collision>
 	</npc>
 	<npc id="13305" level="97" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="4" />
 			<skill name="Skill02_ID" id="10551" level="4" />
@@ -173,7 +172,7 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -181,6 +180,7 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" undying="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -330,7 +330,6 @@
 		</collision>
 	</npc>
 	<npc id="13310" level="85" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2416,7 +2415,6 @@
 		</collision>
 	</npc>
 	<npc id="13377" level="87" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2451,7 +2449,6 @@
 		</collision>
 	</npc>
 	<npc id="13378" level="90" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2486,7 +2483,6 @@
 		</collision>
 	</npc>
 	<npc id="13379" level="93" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2521,7 +2517,6 @@
 		</collision>
 	</npc>
 	<npc id="13380" level="96" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -2556,7 +2551,6 @@
 		</collision>
 	</npc>
 	<npc id="13381" level="99" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/13400-13499.xml
index c860757913..b759fa8da8 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/13400-13499.xml
@@ -1123,7 +1123,6 @@
 		</collision>
 	</npc>
 	<npc id="13452" level="101" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1154,7 +1153,6 @@
 		</collision>
 	</npc>
 	<npc id="13453" level="103" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1185,7 +1183,6 @@
 		</collision>
 	</npc>
 	<npc id="13454" level="105" type="EffectPoint" name="Solo Dance">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1215,8 +1212,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13455" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13455" level="101" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="5" />
 			<skill name="Skill02_ID" id="10551" level="5" />
@@ -1229,11 +1225,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1246,8 +1243,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13456" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13456" level="103" type="Doppelganger" name="Incarnation">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="6" />
 			<skill name="Skill02_ID" id="10551" level="6" />
@@ -1260,11 +1256,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
@@ -1277,11 +1274,10 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13457" level="85" type="Doppelganger" name="Incarnation">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="13457" level="105" type="Doppelganger" name="Incarnation">
 		<parameters>
-			<skill name="Skill01_ID" id="10550" level="4" />
-			<skill name="Skill02_ID" id="10551" level="4" />
+			<skill name="Skill01_ID" id="10550" level="7" />
+			<skill name="Skill02_ID" id="10551" level="7" />
 		</parameters>
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -1291,11 +1287,12 @@
 				<walk ground="50" />
 				<run ground="131" />
 			</speed>
-			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="623" range="40" type="FIST" distance="0" width="0" random="0" accuracy="4.75" />
+			<attack physical="1487.133333" magical="396" critical="16" attackSpeed="700" range="40" type="FIST" distance="5" width="5" random="0" accuracy="4.75" />
 			<defence physical="1419.5" magical="783" />
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" hasSummoner="true" talkable="false" />
+		<shots soul="1000" shotChance="100"/>
 		<skillList>
 			<skill id="4416" level="19" /> <!-- Others -->
 			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10500-10599.xml
index 555924dc29..6b128d4b63 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10500-10599.xml
@@ -2131,7 +2131,6 @@
 			<value level="6">51</value>
 			<value level="7">53</value>
 		</mpConsume>
-		<nextAction>ATTACK</nextAction>
 		<castRange>400</castRange>
 		<effectRange>900</effectRange>
 		<hitTime>500</hitTime>
@@ -2172,7 +2171,7 @@
 					<value level="7">13457</value>
 				</npcId>
 				<npcCount>3</npcCount>
-				<despawnDelay>30000</despawnDelay>
+				<despawnDelay>17000</despawnDelay>
 			</effect>
 		</effects>
 		<endEffects>
@@ -3326,6 +3325,7 @@
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
 		<reuseDelay>1000</reuseDelay>
+		<nextAction>ATTACK</nextAction>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
@@ -3373,8 +3373,7 @@
 			<effect name="CriticalRatePositionBonus">
 				<amount>
 					<value level="1">30</value>
-					<value level="1">40</value>
-					<value level="2">40</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="2">40</value>
 				</amount>
 				<mode>PER</mode>
 				<position>SIDE</position>
@@ -3382,8 +3381,7 @@
 			<effect name="CriticalRatePositionBonus">
 				<amount>
 					<value level="1">60</value>
-					<value level="1">70</value>
-					<value level="2">70</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="2">70</value>
 				</amount>
 				<mode>PER</mode>
 				<position>BACK</position>
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19300-19399.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19300-19399.xml
index 0c0155ae19..5f2ffabae3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19300-19399.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19300-19399.xml
@@ -18,29 +18,23 @@
 		<icon>icon.skill19301</icon>
 		<operateType>A1</operateType>
 		<coolTime>500</coolTime>
-		<mpConsume>107</mpConsume>
-		<castRange>900</castRange>
-		<abnormalLvl>
-			<value level="1">1</value>
-			<value level="2">2</value>
-			<value level="3">3</value>
-			<value level="4">4</value>
-			<value level="5">5</value>
-			<value level="6">6</value>
-			<value level="7">7</value>
-			<value level="8">8</value>
-			<value level="9">9</value>
-		</abnormalLvl>
-		<reuseDelay>15000</reuseDelay>
-		<abnormalTime>15</abnormalTime>
-		<abnormalType>POISON</abnormalType>
-		<abnormalVisualEffect>DOT_POISON</abnormalVisualEffect>
-		<activateRate>130</activateRate>
-		<affectLimit>5-12</affectLimit>
-		<affectRange>300</affectRange>
-		<operateType>A2</operateType>
-		<coolTime>500</coolTime>
 		<magicCriticalRate>5</magicCriticalRate>
+		<mpConsume>
+			<value level="1">76</value>
+			<value level="2">79</value>
+			<value level="3">83</value>
+			<value level="4">87</value>
+			<value level="5">91</value>
+			<value level="6">95</value>
+			<value level="7">99</value>
+			<value level="8">103</value>
+			<value level="9">107</value>
+		</mpConsume>
+		<castRange>900</castRange>
+		<effectRange>1100</effectRange>
+		<hitTime>2000</hitTime>
+		<reuseDelay>15000</reuseDelay>
+		<effectPoint>-711</effectPoint>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">87</value>
@@ -52,19 +46,9 @@
 			<value level="8">103</value>
 			<value level="9">105</value>
 		</magicLvl>
-		<lvlBonusRate>20</lvlBonusRate>
-		<mpConsume>1</mpConsume>
-		<effectPoint>-711</effectPoint>
-		<effectRange>900</effectRange>
 		<isDebuff>true</isDebuff>
-		<basicProperty>NONE</basicProperty>
-		<hitTime>2000</hitTime>
-		<hitCancelTime>0</hitCancelTime>
-		<trait>ZONE</trait>
 		<targetType>GROUND</targetType>
-		<affectScope>POINT_BLANK</affectScope>
-		<affectObject>NOT_FRIEND</affectObject>
-		<channelingStart>1</channelingStart>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="SummonNpc">
 				<npcId>
@@ -79,8 +63,6 @@
 					<value level="9">13549</value>
 				</npcId>
 				<npcCount>1</npcCount>
-				<despawnDelay>15000</despawnDelay>
-				<singleInstance>true</singleInstance>
 			</effect>
 		</effects>
 	</skill>
@@ -122,7 +104,7 @@
 		<isDebuff>true</isDebuff>
 		<basicProperty>NONE</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
-		<trait>ZONE</trait>
+		<trait>POISON</trait>
 		<targetType>SELF</targetType>
 		<affectScope>POINT_BLANK</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>