diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6:
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6:
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6:
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd
index 2eac743a53..b408468368 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd
@@ -2389,6 +2389,7 @@
 															</xs:complexType>
 														</xs:element>
 														<xs:element minOccurs="0" name="mode" type="xs:string" />
+														<xs:element minOccurs="0" name="magicType" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="position" type="xs:string" />
 													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
@@ -2525,6 +2526,7 @@
 																</xs:sequence>
 															</xs:complexType>
 														</xs:element>
+														<xs:element minOccurs="0" name="chance" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="skillLevel">
 															<xs:complexType mixed="true">
@@ -2543,6 +2545,7 @@
 														</xs:element>
 													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
+													<xs:attribute name="abnormalTime" type="xs:unsignedByte" use="optional" />
 													<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
 													<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
 												</xs:complexType>
@@ -2561,7 +2564,21 @@
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
 														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
-														<xs:element minOccurs="0" name="skillLevel" type="xs:unsignedByte" />
+														<xs:element minOccurs="0" name="skillLevel">
+															<xs:complexType mixed="true">
+																<xs:sequence minOccurs="0">
+																	<xs:element maxOccurs="unbounded" name="value">
+																		<xs:complexType>
+																			<xs:simpleContent>
+																				<xs:extension base="xs:unsignedByte">
+																					<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+																				</xs:extension>
+																			</xs:simpleContent>
+																		</xs:complexType>
+																	</xs:element>
+																</xs:sequence>
+															</xs:complexType>
+														</xs:element>
 														<xs:element minOccurs="0" name="fullLethal" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="halfLethal" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="amount">
@@ -2646,7 +2663,21 @@
 															<xs:element name="staticChance" type="xs:boolean" />
 															<xs:element name="magicTypes" type="xs:string" />
 															<xs:element name="skillId" type="xs:unsignedShort" />
-															<xs:element name="skillLevel" type="xs:unsignedByte" />
+															<xs:element name="skillLevel">
+																<xs:complexType mixed="true">
+																	<xs:sequence minOccurs="0">
+																		<xs:element maxOccurs="unbounded" name="value">
+																			<xs:complexType>
+																				<xs:simpleContent>
+																					<xs:extension base="xs:unsignedByte">
+																						<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+																					</xs:extension>
+																				</xs:simpleContent>
+																			</xs:complexType>
+																		</xs:element>
+																	</xs:sequence>
+																</xs:complexType>
+															</xs:element>
 															<xs:element name="fullLethal" type="xs:unsignedByte" />
 															<xs:element name="halfLethal" type="xs:unsignedByte" />
 															<xs:element name="amount">
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6:
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
index 47691af02e..57df52828f 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
@@ -471,13 +471,6 @@
 				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11509" toLevel="11" name="Radiant Crash">
 		<!-- Attacks the target with $s1 Power added to P. Atk., decreasing its P. Def/ M. Def by $s3 for $s2. Requires a sword, blunt, dual sword or dual blunt to be equipped. Over-hit. Critical. -->
@@ -594,13 +587,6 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11510" toLevel="11" name="Resolving Bash">
 		<!-- Attacks target with $s1 Power added to P. Atk. for $s2, P. Atk. and M. Atk.-$s3. Requires a sword, blunt, dual sword, or dual blunt to be equipped. Over-hit. Critical. -->
@@ -717,13 +703,6 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11511" toLevel="11" name="Phantom Slasher">
 		<!-- Attacks the target with $s1 Power added to P. Atk. to reduce its P. Atk./ M. Atk./ P. Def./ M. Def. by $s3 for $s2. The target can remove these debuffs if it has Spectral Slash Stage 3 or higher. Requires a sword, blunt, dual sword or dual blunt to be equipped. Over-hit. Critical. -->
@@ -788,6 +767,11 @@
 		<affectScope>SINGLE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<conditions>
+			<condition name="OpCheckAbnormal">
+				<type>ULTIMATE_DEBUFF</type>
+				<level>1</level>
+				<hasAbnormal>true</hasAbnormal>
+			</condition>
 			<condition name="EquipWeapon">
 				<weaponType>
 					<item>DUAL</item>
@@ -836,30 +820,7 @@
 				<amount>-20</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="CallSkill">
-				<skillId>19435</skillId> <!-- Spectral Slash -->
-				<skillLevel>
-					<value level="1">1</value> <!-- Guessed -->
-					<value level="2">1</value> <!-- Guessed -->
-					<value level="3">2</value> <!-- Guessed -->
-					<value level="4">2</value> <!-- Guessed -->
-					<value level="5">3</value> <!-- Guessed -->
-					<value level="6">3</value> <!-- Guessed -->
-					<value level="7">3</value> <!-- Guessed -->
-					<value level="8">4</value> <!-- Guessed -->
-					<value level="9">4</value> <!-- Guessed -->
-					<value level="10">4</value> <!-- Guessed -->
-					<value level="11">5</value> <!-- Guessed -->
-				</skillLevel>
-			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11513" toLevel="11" name="Radiant Crash">
 		<!-- Attacks target and nearby enemies with $s1 Power added to P. Atk. for $s2, target's P. Def. and M. Def. -$s3. Requires a sword, blunt, dual sword, or dual blunt to be equipped. Over-hit. Critical. -->
@@ -971,13 +932,6 @@
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11514" toLevel="11" name="Resolving Bash">
 		<!-- Attacks target and nearby enemies with $s1 Power added to P. Atk. for $s2, P. Atk. and M. Atk. -$s3. Requires a sword, blunt, dual sword, or dual blunt to be equipped. Over-hit. Critical. -->
@@ -1085,13 +1039,6 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11515" toLevel="5" name="Confusion Bomber">
 		<!-- Curses target with darkness. For $s1, decreases Speed and Atk. Spd. by $s2. After $s3, detonates target to inflict damage nearby. Requires a sword, dual sword or dual blunt to be equipped. -->
@@ -2259,6 +2206,10 @@
 		<affectScope>PARTY</affectScope>
 		<affectObject>FRIEND</affectObject>
 		<effects>
+			<effect name="MaxHp">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="DispelBySlotProbability">
 				<dispel>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</dispel>
 				<rate>100</rate>
@@ -2278,10 +2229,6 @@
 				<amount>-40</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxHp">
-				<amount>30</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="VampiricAttack">
 				<amount>8</amount>
 				<chance>30</chance>
@@ -3336,6 +3283,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<endEffects>
+			<effect name="Confuse" abnormalTime="3">
+				<chance>100</chance>
+			</effect>
+		</endEffects>
 	</skill>
 	<skill id="11547" toLevel="10" name="Superior HP Recovery">
 		<!-- HP Recovery Bonus +$s1. STR +$s2. -->
@@ -4277,47 +4229,25 @@
 		<!-- Increases M. Atk. by $s1 and Skill Power by $s2 and decreases the cooldown of all skills by $s3. -->
 		<icon>icon.skill11581</icon>
 		<operateType>P</operateType>
-		<magicLvl>85</magicLvl>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
 		<effects>
-			<effect name="MaxCp">
+			<effect name="MAtk">
 				<amount>
-					<value level="1">1.05</value>
-					<value level="2">1.06</value>
-					<value level="3">1.07</value>
-					<value level="4">1.10</value>
+					<value level="1">20</value>
+					<value level="2">25</value>
+					<value level="3">30</value>
+					<value level="4">35</value>
 				</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MaxMp">
-				<amount>
-					<value level="1">1.05</value>
-					<value level="2">1.06</value>
-					<value level="3">1.07</value>
-					<value level="4">1.10</value>
-				</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MpRegen">
-				<amount>
-					<value level="1">5</value>
-					<value level="2">6</value>
-					<value level="3">7</value>
-					<value level="4">10</value>
-				</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="PhysicalSkillPower">
-				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MaxHp">
-				<amount>
-					<value level="1">1.05</value>
-					<value level="2">1.06</value>
-					<value level="3">1.07</value>
-					<value level="4">1.10</value>
-				</amount>
-				<mode>DIFF</mode>
+			<effect name="MagicalSkillPower">
+				<amount>5</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="Reuse">
 				<amount>
@@ -4339,15 +4269,6 @@
 				<mode>PER</mode>
 				<magicType>1</magicType>
 			</effect>
-			<effect name="SkillCriticalProbability">
-				<amount>
-					<value level="1">10</value>
-					<value level="2">20</value>
-					<value level="3">50</value>
-					<value level="4">100</value>
-				</amount>
-				<mode>PER</mode>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="11582" toLevel="4" name="Mass Song of Silence">
@@ -4391,35 +4312,63 @@
 	<skill id="11583" toLevel="4" name="Grand Melody of Spirit">
 		<!-- Increases Atk. Spd./ Casting Spd. by $s1 and Attack Attribute by $s2. Activates the Single Note effect on you if Sforzando Sting, Radiant Crash or Resolving Bash is cast. -->
 		<icon>icon.skill11583</icon>
+		<operateType>P</operateType>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
 			<value level="3">95</value>
 			<value level="4">99</value>
 		</magicLvl>
-		<operateType>P</operateType>
 		<effects>
-			<effect name="MagicalDefence">
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19442</skillId> <!-- Single Note -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+				<attackSkillId>19431</attackSkillId> <!--  Sforzando Sting -->
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19442</skillId> <!-- Single Note -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+				<attackSkillId>11509</attackSkillId> <!-- Radiant Crash -->
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19442</skillId> <!-- Single Note -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+				<attackSkillId>11510</attackSkillId> <!-- Resolving Bash -->
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
 				<amount>
-					<value level="1">5</value>
-					<value level="2">7</value>
-					<value level="3">10</value>
+					<value level="1">10</value>
+					<value level="2">11</value>
+					<value level="3">13</value>
 					<value level="4">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalDefence">
+			<effect name="MagicalAttackSpeed">
 				<amount>
-					<value level="1">5</value>
-					<value level="2">7</value>
-					<value level="3">10</value>
+					<value level="1">10</value>
+					<value level="2">11</value>
+					<value level="3">13</value>
 					<value level="4">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
-				<amount>5</amount>
-				<mode>PER</mode>
+			<effect name="AttackAttributeAdd">
+				<amount>
+					<value level="1">50</value>
+					<value level="2">60</value>
+					<value level="3">80</value>
+					<value level="4">100</value>
+				</amount>
 			</effect>
 		</effects>
 	</skill>
@@ -4466,26 +4415,35 @@
 		<!-- Increases P. Atk./ M. Atk. by $s1 and P. Skill Power by $s2. Activates the Spectral Slash effect on the target if Trace of Twin Edges, Shadow Blade or Resolving Bash is cast. -->
 		<icon>icon.skill11585</icon>
 		<operateType>P</operateType>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
 		<effects>
-			<effect name="TriggerSkillBySkill">
-				<castSkillId>11508</castSkillId><!-- Trace of Twin Edges -->
-				<skillId>19435</skillId> <!-- Spectral Slash -->
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19435</skillId> <!-- Phantom Slasher -->
 				<skillLevel>1</skillLevel>
-				<chance>30</chance>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<attackSkillId>11508</attackSkillId> <!-- Trace of Twin Edges -->
+				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
-			<effect name="TriggerSkillBySkill">
-				<castSkillId>19426</castSkillId><!-- Shadow Blade -->
-				<skillId>19435</skillId> <!-- Spectral Slash -->
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19435</skillId> <!-- Phantom Slasher -->
 				<skillLevel>1</skillLevel>
-				<chance>30</chance>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<attackSkillId>19426</attackSkillId> <!-- Shadow Blade -->
+				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
-			<effect name="TriggerSkillBySkill">
-				<castSkillId>11510</castSkillId><!-- Resolving Bash -->
-				<skillId>19435</skillId> <!-- Spectral Slash -->
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19435</skillId> <!-- Phantom Slasher -->
 				<skillLevel>1</skillLevel>
-				<chance>30</chance>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<attackSkillId>11510</attackSkillId> <!-- Resolving Bash -->
+				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
 			<effect name="PAtk">
@@ -4579,6 +4537,9 @@
 			<value level="2">278</value>
 			<value level="3">306</value>
 			<value level="4">332</value>
+			<value level="5">358</value>
+			<value level="6">384</value>
+			<value level="7">410</value>
 		</mpConsume>
 		<castRange>900</castRange>
 		<hitTime>2000</hitTime>
@@ -4607,6 +4568,12 @@
 		<!-- PvP damage +$s1 and Max MP/ CP +$s2. -->
 		<icon>icon.skill11588</icon>
 		<operateType>P</operateType>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
 		<effects>
 			<effect name="MaxMp">
 				<amount>
@@ -4617,6 +4584,18 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDamageBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDamageBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="11589" toLevel="5" name="Horn Frenzy">
@@ -5003,7 +4982,7 @@
 			<effect name="MagicMpCost">
 				<amount>-10</amount>
 				<mode>PER</mode>
-				<magicType>22</magicType>
+				<magicType>2</magicType>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml
index c2ab172a88..0bbd3df1c6 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml
@@ -133,7 +133,7 @@
 		<abnormalType>SONG_WEAPON</abnormalType> <!-- find proper name -->
 		<itemConsumeCount>5</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ores -->
-		<operateType>A2</operateType>
+		<operateType>A3</operateType>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<mpConsume>270</mpConsume>
@@ -168,11 +168,13 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
+		</effects>
+		<selfEffects>
 			<effect name="CallSkill">
 				<skillId>19447</skillId> <!-- Glaring -->
 				<skillLevel>1</skillLevel>
 			</effect>
-		</effects>
+		</selfEffects>
 	</skill>
 	<skill id="19205" toLevel="1" name="Song of Archery">
 		<!-- Increases Bow/ Crossbow Resistance of all party members by 50% for 30 seconds. Consumes 5 Spirit Ore. -->
@@ -2276,8 +2278,7 @@
 			<value level="5">5</value>
 			<value level="6">6</value>
 			<value level="7">7</value>
-			<value level="7">8</value>
-			<value level="8">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="8">8</value>
 		</abnormalLvl>
 		<abnormalTime>5</abnormalTime>
 		<abnormalType>COUNTER_FLIP</abnormalType>
@@ -2350,8 +2351,7 @@
 			<value level="5">5</value>
 			<value level="6">6</value>
 			<value level="7">7</value>
-			<value level="7">8</value>
-			<value level="8">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="8">8</value>
 		</abnormalLvl>
 		<abnormalTime>5</abnormalTime>
 		<abnormalType>KNOCKDOWN</abnormalType>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19400-19499.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19400-19499.xml
index 47da8de67b..1fd4cfa141 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19400-19499.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19400-19499.xml
@@ -1153,10 +1153,6 @@
 			<effect name="CallSkill">
 				<skillId>19432</skillId> <!-- Swift Praise -->
 				<skillLevel>1</skillLevel>
-			</effect>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad lvl 1 -->
-				<skillLevel>1</skillLevel>
 				<skillLevelScaleTo>3</skillLevelScaleTo>
 			</effect>
 		</selfEffects>
@@ -1280,6 +1276,12 @@
 					<item>BLUNT</item>
 				</weaponType>
 			</condition>
+			<condition name="OpCheckAbnormal">
+				<type>TRIAD</type>
+				<level>3</level>
+				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="PhysicalAttackWeaponBonus">
@@ -1322,8 +1324,14 @@
 		</effects>
 		<selfEffects>
 			<effect name="Reuse">
-				<amount>10</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-10</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
 			</effect>
 			<effect name="CallSkill">
 				<skillId>19432</skillId> <!-- Swift Praise -->
@@ -1350,9 +1358,7 @@
 			<value level="10">10</value>
 			<value level="11">11</value>
 		</abnormalLvl>
-		<abnormalTime>20</abnormalTime>
 		<abnormalType>ULTIMATE_DEBUFF</abnormalType>
-		<activateRate>100</activateRate>
 		<castRange>100</castRange>
 		<coolTime>300</coolTime>
 		<effectRange>400</effectRange>
@@ -1383,8 +1389,7 @@
 			<value level="10">168</value>
 			<value level="11">172</value>
 		</mpConsume>
-		<operateType>A2</operateType>
-		<nextAction>ATTACK</nextAction>
+		<operateType>DA3</operateType>
 		<reuseDelay>7000</reuseDelay>
 		<effectPoint>
 			<value level="1">-687</value>
@@ -1404,6 +1409,7 @@
 		<isDebuff>true</isDebuff>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -1413,6 +1419,16 @@
 					<item>BLUNT</item>
 				</weaponType>
 			</condition>
+			<condition name="OpBlink">
+				<direction>BACK</direction>
+				<range>400</range>
+			</condition>
+			<condition name="OpCheckAbnormal">
+				<type>TRIAD</type>
+				<level>3</level>
+				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="PhysicalAttackWeaponBonus">
@@ -1436,28 +1452,8 @@
 					<value fromLevel="7" toLevel="11" fromSubLevel="3001" toSubLevel="3020">{0.99 - 0.006 * (subIndex - 1)}</value>
 				</pDefMod>
 			</effect>
-			<effect name="PhysicalAttackSpeed">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MagicalAttackSpeed">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PhysicalDefence">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MagicalDefence">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
 		</effects>
 		<selfEffects>
-			<effect name="Reuse">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="CallSkill">
 				<skillId>19432</skillId> <!-- Swift Praise -->
 				<skillLevel>1</skillLevel>
@@ -1466,6 +1462,46 @@
 				<dispel>TRIAD</dispel>
 			</effect>
 		</selfEffects>
+		<pveEffects>
+			<effect name="CallSkill">
+				<skillId>19522</skillId> <!-- Repeat Mark Somersault -->
+				<skillLevel>
+					<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>
+					<value level="12">12</value>
+					<value level="13">13</value>
+				</skillLevel>
+			</effect>
+		</pveEffects>
+		<pvpEffects>
+			<effect name="CallSkill">
+				<skillId>19522</skillId> <!-- Repeat Mark Somersault -->
+				<skillLevel>
+					<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>
+					<value level="12">12</value>
+					<value level="13">13</value>
+				</skillLevel>
+			</effect>
+		</pvpEffects>
 	</skill>
 	<skill id="19435" toLevel="5" name="Spectral Slash">
 		<!-- The Spectral Sword attacks the target with $s1 Power added to P. Atk. and decreases P. Def/ M. Def by $s3 for $s2. -->
@@ -1590,6 +1626,11 @@
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<conditions>
+			<condition name="OpCheckAbnormal">
+				<type>ULTIMATE_DEBUFF</type>
+				<level>2</level>
+				<hasAbnormal>true</hasAbnormal>
+			</condition>
 			<condition name="EquipWeapon">
 				<weaponType>
 					<item>DUAL</item>
@@ -1650,6 +1691,12 @@
 				<chance>100</chance>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>15404</skillId> <!-- Unable to Target -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19437" toLevel="1" name="Vanguard of Baylor">
 		<!-- Summons the Dominant Flag. If used near the Dominant Flag, it applies the effects of Melody, Harmony, Drum, Ditty and Rhapsody buff skills to clan members and enhances Seal Mesmerizing skills (Lv. 4 or higher). Also makes the caster immune to Pull. Consumes 5 Spirit Ore. -->
@@ -1772,6 +1819,8 @@
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<reuseDelay>1000</reuseDelay>
 		<effectPoint>-418</effectPoint>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="MagicalAttack">
 				<power>50</power>
@@ -1782,6 +1831,55 @@
 		<!-- P. Atk., P. Def, M. Atk. and M. Def +and P. Skill Power +$s2. Increases the chance to activate additional effect when the Rampageous Beat is cast. -->
 		<icon>icon.skill19441</icon>
 		<operateType>P</operateType>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
+		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+			<effect name="PAtk">
+				<amount>
+					<value level="1">14</value>
+					<value level="2">16</value>
+					<value level="3">18</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>
+					<value level="1">14</value>
+					<value level="2">16</value>
+					<value level="3">18</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>
+					<value level="1">14</value>
+					<value level="2">16</value>
+					<value level="3">18</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>
+					<value level="1">14</value>
+					<value level="2">16</value>
+					<value level="3">18</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalSkillPower">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19442" toLevel="3" name="Single Note">
 		<!-- For $s1, P. Atk. and Atk. Spd. +$s2. -->
@@ -1825,6 +1923,12 @@
 				<value level="3">10</value>
 				<mode>PER</mode>
 			</effect>
+			<effect name="MagicalAttackSpeed">
+				<value level="1">0</value>
+				<value level="2">0</value>
+				<value level="3">10</value>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19443" toLevel="7" name="Melody of Refection">
@@ -2008,14 +2112,6 @@
 			<effect name="BlockAbnormalSlot">
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
-			<effect name="HpRegen">
-				<amount>75</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MpRegen">
-				<amount>100</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="PhysicalEvasion">
 				<amount>5</amount>
 				<mode>DIFF</mode>
@@ -2024,6 +2120,14 @@
 				<amount>5</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="HpRegen">
+				<amount>75</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MpRegen">
+				<amount>100</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="MagicMpCost">
 				<amount>-22</amount>
 				<mode>PER</mode>
@@ -2045,18 +2149,15 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 		</abnormalLvl>
-		<abnormalType>SONG_WEAPON</abnormalType>
-		<abnormalTime>300</abnormalTime>
+		<abnormalType>PD_UP_DMAGIC</abnormalType> <!-- NOT RETAIL: FIXME -->
 		<isTriggeredSkill>true</isTriggeredSkill>
 		<effectPoint>707</effectPoint>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<isTriggeredSkill>true</isTriggeredSkill>
 		<affectRange>2000</affectRange>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PAtk">
 				<amount>15</amount>
@@ -2066,6 +2167,13 @@
 				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="TriggerSkillBySkill">
+				<castSkillId>19204</castSkillId>
+				<skillId>19447</skillId> <!-- Glaring -->
+				<skillLevel>2</skillLevel>
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19448" toLevel="11" name="Rampageous Beat">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd
index 795c09990f..c3cd5beb9c 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd
@@ -2371,6 +2371,7 @@
 															</xs:complexType>
 														</xs:element>
 														<xs:element minOccurs="0" name="mode" type="xs:string" />
+														<xs:element minOccurs="0" name="magicType" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="position" type="xs:string" />
 													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
@@ -2507,6 +2508,7 @@
 																</xs:sequence>
 															</xs:complexType>
 														</xs:element>
+														<xs:element minOccurs="0" name="chance" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="skillLevel">
 															<xs:complexType mixed="true">
@@ -2525,6 +2527,7 @@
 														</xs:element>
 													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
+													<xs:attribute name="abnormalTime" type="xs:unsignedByte" use="optional" />
 													<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
 													<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
 												</xs:complexType>
@@ -2543,7 +2546,21 @@
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
 														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
-														<xs:element minOccurs="0" name="skillLevel" type="xs:unsignedByte" />
+														<xs:element minOccurs="0" name="skillLevel">
+															<xs:complexType mixed="true">
+																<xs:sequence minOccurs="0">
+																	<xs:element maxOccurs="unbounded" name="value">
+																		<xs:complexType>
+																			<xs:simpleContent>
+																				<xs:extension base="xs:unsignedByte">
+																					<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+																				</xs:extension>
+																			</xs:simpleContent>
+																		</xs:complexType>
+																	</xs:element>
+																</xs:sequence>
+															</xs:complexType>
+														</xs:element>
 														<xs:element minOccurs="0" name="fullLethal" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="halfLethal" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="amount">
@@ -2628,7 +2645,21 @@
 															<xs:element name="staticChance" type="xs:boolean" />
 															<xs:element name="magicTypes" type="xs:string" />
 															<xs:element name="skillId" type="xs:unsignedShort" />
-															<xs:element name="skillLevel" type="xs:unsignedByte" />
+															<xs:element name="skillLevel">
+																<xs:complexType mixed="true">
+																	<xs:sequence minOccurs="0">
+																		<xs:element maxOccurs="unbounded" name="value">
+																			<xs:complexType>
+																				<xs:simpleContent>
+																					<xs:extension base="xs:unsignedByte">
+																						<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+																					</xs:extension>
+																				</xs:simpleContent>
+																			</xs:complexType>
+																		</xs:element>
+																	</xs:sequence>
+																</xs:complexType>
+															</xs:element>
 															<xs:element name="fullLethal" type="xs:unsignedByte" />
 															<xs:element name="halfLethal" type="xs:unsignedByte" />
 															<xs:element name="amount">
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6:
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
index 466185ad3c..7f21164a3c 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
@@ -471,13 +471,6 @@
 				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11509" toLevel="11" name="Radiant Crash">
 		<!-- Attacks the target with $s1 Power added to P. Atk., for $s2, P. Def/ M. Def -$s3. Requires a sword/ blunt/ dual sword/ dual blunt to be equipped. Over-hit. Critical. -->
@@ -594,13 +587,6 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11510" toLevel="11" name="Resolving Bash">
 		<!-- Attacks target with $s1 Power added to P. Atk., for $s2, P. Atk. and M. Atk. -$s3. Requires a sword/ blunt/ dual sword/ dual blunt weapon to be equipped. Over-hit. Critical. -->
@@ -717,13 +703,6 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11511" toLevel="11" name="Phantom Slasher">
 		<!-- Attacks the target with $s1 Power added to P. Atk. to reduce its P. Atk./ M. Atk./ P./ M. Def. by $s3 for $s2. The target can remove these debuffs if it has Spectral Slash Stage 3 or higher. Requires a sword/ blunt/ dual sword/ dual blunt weapon to be equipped. Over-hit. Critical. -->
@@ -788,6 +767,11 @@
 		<affectScope>SINGLE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<conditions>
+			<condition name="OpCheckAbnormal">
+				<type>ULTIMATE_DEBUFF</type>
+				<level>1</level>
+				<hasAbnormal>true</hasAbnormal>
+			</condition>
 			<condition name="EquipWeapon">
 				<weaponType>
 					<item>DUAL</item>
@@ -836,30 +820,7 @@
 				<amount>-20</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="CallSkill">
-				<skillId>19435</skillId> <!-- Spectral Slash -->
-				<skillLevel>
-					<value level="1">1</value> <!-- Guessed -->
-					<value level="2">1</value> <!-- Guessed -->
-					<value level="3">2</value> <!-- Guessed -->
-					<value level="4">2</value> <!-- Guessed -->
-					<value level="5">3</value> <!-- Guessed -->
-					<value level="6">3</value> <!-- Guessed -->
-					<value level="7">3</value> <!-- Guessed -->
-					<value level="8">4</value> <!-- Guessed -->
-					<value level="9">4</value> <!-- Guessed -->
-					<value level="10">4</value> <!-- Guessed -->
-					<value level="11">5</value> <!-- Guessed -->
-				</skillLevel>
-			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11513" toLevel="11" name="Radiant Crash">
 		<!-- Attacks target and nearby enemies with $s1 Power added to P. Atk., for $s2, target's P. Def. and M. Def. -$s3. Requires a sword/ blunt/ dual sword/ dual blunt weapon to be equipped. Over-hit. Critical. -->
@@ -971,13 +932,6 @@
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11514" toLevel="11" name="Resolving Bash">
 		<!-- Attacks target and nearby enemies with $s1 Power added to P. Atk., for $s2, P. Atk. and M. Atk. -$s3. Requires a sword/ blunt/ dual sword/ dual blunt weapon to be equipped. Over-hit. Critical. -->
@@ -1085,13 +1039,6 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11515" toLevel="5" name="Confusion Bomber">
 		<!-- Curses target with darkness. For $s1, decreases Speed and Atk. Spd. by $s2. After $s3, detonates target to inflict damage nearby. Requires a sword, dual sword or dual blunt to be equipped. -->
@@ -2259,6 +2206,10 @@
 		<affectScope>PARTY</affectScope>
 		<affectObject>FRIEND</affectObject>
 		<effects>
+			<effect name="MaxHp">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="DispelBySlotProbability">
 				<dispel>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</dispel>
 				<rate>100</rate>
@@ -2278,10 +2229,6 @@
 				<amount>-40</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxHp">
-				<amount>30</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="VampiricAttack">
 				<amount>8</amount>
 				<chance>30</chance>
@@ -3336,6 +3283,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<endEffects>
+			<effect name="Confuse" abnormalTime="3">
+				<chance>100</chance>
+			</effect>
+		</endEffects>
 	</skill>
 	<skill id="11547" toLevel="10" name="Superior HP Recovery">
 		<!-- HP Recovery Bonus +$s1. STR +$s2. -->
@@ -4277,47 +4229,25 @@
 		<!-- M. Atk. +$s1, Skill Power +$s2 and Skill Cooldown -$s3. -->
 		<icon>icon.skill11581</icon>
 		<operateType>P</operateType>
-		<magicLvl>85</magicLvl>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
 		<effects>
-			<effect name="MaxCp">
+			<effect name="MAtk">
 				<amount>
-					<value level="1">1.05</value>
-					<value level="2">1.06</value>
-					<value level="3">1.07</value>
-					<value level="4">1.10</value>
+					<value level="1">20</value>
+					<value level="2">25</value>
+					<value level="3">30</value>
+					<value level="4">35</value>
 				</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MaxMp">
-				<amount>
-					<value level="1">1.05</value>
-					<value level="2">1.06</value>
-					<value level="3">1.07</value>
-					<value level="4">1.10</value>
-				</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MpRegen">
-				<amount>
-					<value level="1">5</value>
-					<value level="2">6</value>
-					<value level="3">7</value>
-					<value level="4">10</value>
-				</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="PhysicalSkillPower">
-				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MaxHp">
-				<amount>
-					<value level="1">1.05</value>
-					<value level="2">1.06</value>
-					<value level="3">1.07</value>
-					<value level="4">1.10</value>
-				</amount>
-				<mode>DIFF</mode>
+			<effect name="MagicalSkillPower">
+				<amount>5</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="Reuse">
 				<amount>
@@ -4339,15 +4269,6 @@
 				<mode>PER</mode>
 				<magicType>1</magicType>
 			</effect>
-			<effect name="SkillCriticalProbability">
-				<amount>
-					<value level="1">10</value>
-					<value level="2">20</value>
-					<value level="3">50</value>
-					<value level="4">100</value>
-				</amount>
-				<mode>PER</mode>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="11582" toLevel="4" name="Mass Song of Silence">
@@ -4391,35 +4312,63 @@
 	<skill id="11583" toLevel="4" name="Grand Melody of Spirit">
 		<!-- Atk. Spd./ Casting Spd. +$s1 and Atk. Attribute +$s2. Activates the Single Note effect on you if Sforzando Sting, Radiant Crash or Resolving Bash is cast. -->
 		<icon>icon.skill11583</icon>
+		<operateType>P</operateType>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
 			<value level="3">95</value>
 			<value level="4">99</value>
 		</magicLvl>
-		<operateType>P</operateType>
 		<effects>
-			<effect name="MagicalDefence">
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19442</skillId> <!-- Single Note -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+				<attackSkillId>19431</attackSkillId> <!--  Sforzando Sting -->
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19442</skillId> <!-- Single Note -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+				<attackSkillId>11509</attackSkillId> <!-- Radiant Crash -->
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19442</skillId> <!-- Single Note -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+				<attackSkillId>11510</attackSkillId> <!-- Resolving Bash -->
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
 				<amount>
-					<value level="1">5</value>
-					<value level="2">7</value>
-					<value level="3">10</value>
+					<value level="1">10</value>
+					<value level="2">11</value>
+					<value level="3">13</value>
 					<value level="4">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalDefence">
+			<effect name="MagicalAttackSpeed">
 				<amount>
-					<value level="1">5</value>
-					<value level="2">7</value>
-					<value level="3">10</value>
+					<value level="1">10</value>
+					<value level="2">11</value>
+					<value level="3">13</value>
 					<value level="4">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
-				<amount>5</amount>
-				<mode>PER</mode>
+			<effect name="AttackAttributeAdd">
+				<amount>
+					<value level="1">50</value>
+					<value level="2">60</value>
+					<value level="3">80</value>
+					<value level="4">100</value>
+				</amount>
 			</effect>
 		</effects>
 	</skill>
@@ -4466,26 +4415,35 @@
 		<!-- P. Atk./ M. Atk. +$s1 and P. Skill Power +$s2. Activates the Spectral Slash effect on the target if Trace of Twin Edges, Shadow Blade or Resolving Bash is cast. -->
 		<icon>icon.skill11585</icon>
 		<operateType>P</operateType>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
 		<effects>
-			<effect name="TriggerSkillBySkill">
-				<castSkillId>11508</castSkillId><!-- Trace of Twin Edges -->
-				<skillId>19435</skillId> <!-- Spectral Slash -->
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19435</skillId> <!-- Phantom Slasher -->
 				<skillLevel>1</skillLevel>
-				<chance>30</chance>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<attackSkillId>11508</attackSkillId> <!-- Trace of Twin Edges -->
+				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
-			<effect name="TriggerSkillBySkill">
-				<castSkillId>19426</castSkillId><!-- Shadow Blade -->
-				<skillId>19435</skillId> <!-- Spectral Slash -->
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19435</skillId> <!-- Phantom Slasher -->
 				<skillLevel>1</skillLevel>
-				<chance>30</chance>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<attackSkillId>19426</attackSkillId> <!-- Shadow Blade -->
+				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
-			<effect name="TriggerSkillBySkill">
-				<castSkillId>11510</castSkillId><!-- Resolving Bash -->
-				<skillId>19435</skillId> <!-- Spectral Slash -->
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19435</skillId> <!-- Phantom Slasher -->
 				<skillLevel>1</skillLevel>
-				<chance>30</chance>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<attackSkillId>11510</attackSkillId> <!-- Resolving Bash -->
+				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
 			<effect name="PAtk">
@@ -4579,6 +4537,9 @@
 			<value level="2">278</value>
 			<value level="3">306</value>
 			<value level="4">332</value>
+			<value level="5">358</value>
+			<value level="6">384</value>
+			<value level="7">410</value>
 		</mpConsume>
 		<castRange>900</castRange>
 		<hitTime>2000</hitTime>
@@ -4607,6 +4568,12 @@
 		<!-- PvP damage +$s1 and Max MP/ CP +$s2. -->
 		<icon>icon.skill11588</icon>
 		<operateType>P</operateType>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
 		<effects>
 			<effect name="MaxMp">
 				<amount>
@@ -4617,6 +4584,18 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDamageBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDamageBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="11589" toLevel="5" name="Horn Frenzy">
@@ -5003,7 +4982,7 @@
 			<effect name="MagicMpCost">
 				<amount>-10</amount>
 				<mode>PER</mode>
-				<magicType>22</magicType>
+				<magicType>2</magicType>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml
index fa57cd1db8..66b53db48e 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml
@@ -133,7 +133,7 @@
 		<abnormalType>SONG_WEAPON</abnormalType> <!-- find proper name -->
 		<itemConsumeCount>5</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ores -->
-		<operateType>A2</operateType>
+		<operateType>A3</operateType>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<mpConsume>270</mpConsume>
@@ -168,11 +168,13 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
+		</effects>
+		<selfEffects>
 			<effect name="CallSkill">
 				<skillId>19447</skillId> <!-- Glaring -->
 				<skillLevel>1</skillLevel>
 			</effect>
-		</effects>
+		</selfEffects>
 	</skill>
 	<skill id="19205" toLevel="1" name="Song of Archery">
 		<!-- Increases Bow/ Crossbow Resistance of all party members by 50% for 30 sec. Consumes 5 Spirit Ore. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19400-19499.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19400-19499.xml
index 07854561c7..2eb6b2ab6c 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19400-19499.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19400-19499.xml
@@ -1153,10 +1153,6 @@
 			<effect name="CallSkill">
 				<skillId>19432</skillId> <!-- Swift Praise -->
 				<skillLevel>1</skillLevel>
-			</effect>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad lvl 1 -->
-				<skillLevel>1</skillLevel>
 				<skillLevelScaleTo>3</skillLevelScaleTo>
 			</effect>
 		</selfEffects>
@@ -1280,6 +1276,12 @@
 					<item>BLUNT</item>
 				</weaponType>
 			</condition>
+			<condition name="OpCheckAbnormal">
+				<type>TRIAD</type>
+				<level>3</level>
+				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="PhysicalAttackWeaponBonus">
@@ -1322,8 +1324,14 @@
 		</effects>
 		<selfEffects>
 			<effect name="Reuse">
-				<amount>10</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-10</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
 			</effect>
 			<effect name="CallSkill">
 				<skillId>19432</skillId> <!-- Swift Praise -->
@@ -1350,9 +1358,7 @@
 			<value level="10">10</value>
 			<value level="11">11</value>
 		</abnormalLvl>
-		<abnormalTime>20</abnormalTime>
 		<abnormalType>ULTIMATE_DEBUFF</abnormalType>
-		<activateRate>100</activateRate>
 		<castRange>100</castRange>
 		<coolTime>300</coolTime>
 		<effectRange>400</effectRange>
@@ -1383,8 +1389,7 @@
 			<value level="10">168</value>
 			<value level="11">172</value>
 		</mpConsume>
-		<operateType>A2</operateType>
-		<nextAction>ATTACK</nextAction>
+		<operateType>DA3</operateType>
 		<reuseDelay>7000</reuseDelay>
 		<effectPoint>
 			<value level="1">-687</value>
@@ -1404,6 +1409,7 @@
 		<isDebuff>true</isDebuff>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -1413,6 +1419,16 @@
 					<item>BLUNT</item>
 				</weaponType>
 			</condition>
+			<condition name="OpBlink">
+				<direction>BACK</direction>
+				<range>400</range>
+			</condition>
+			<condition name="OpCheckAbnormal">
+				<type>TRIAD</type>
+				<level>3</level>
+				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="PhysicalAttackWeaponBonus">
@@ -1436,28 +1452,8 @@
 					<value fromLevel="7" toLevel="11" fromSubLevel="3001" toSubLevel="3020">{0.99 - 0.006 * (subIndex - 1)}</value>
 				</pDefMod>
 			</effect>
-			<effect name="PhysicalAttackSpeed">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MagicalAttackSpeed">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PhysicalDefence">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MagicalDefence">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
 		</effects>
 		<selfEffects>
-			<effect name="Reuse">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="CallSkill">
 				<skillId>19432</skillId> <!-- Swift Praise -->
 				<skillLevel>1</skillLevel>
@@ -1466,6 +1462,46 @@
 				<dispel>TRIAD</dispel>
 			</effect>
 		</selfEffects>
+		<pveEffects>
+			<effect name="CallSkill">
+				<skillId>19522</skillId> <!-- Repeat Mark Somersault -->
+				<skillLevel>
+					<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>
+					<value level="12">12</value>
+					<value level="13">13</value>
+				</skillLevel>
+			</effect>
+		</pveEffects>
+		<pvpEffects>
+			<effect name="CallSkill">
+				<skillId>19522</skillId> <!-- Repeat Mark Somersault -->
+				<skillLevel>
+					<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>
+					<value level="12">12</value>
+					<value level="13">13</value>
+				</skillLevel>
+			</effect>
+		</pvpEffects>
 	</skill>
 	<skill id="19435" toLevel="5" name="Spectral Slash">
 		<!-- The Spectral Sword attacks the target with $s1 Power added to P. Atk. and decreases P. Def/ M. Def by $s3 for $s2. -->
@@ -1590,6 +1626,11 @@
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<conditions>
+			<condition name="OpCheckAbnormal">
+				<type>ULTIMATE_DEBUFF</type>
+				<level>2</level>
+				<hasAbnormal>true</hasAbnormal>
+			</condition>
 			<condition name="EquipWeapon">
 				<weaponType>
 					<item>DUAL</item>
@@ -1650,6 +1691,12 @@
 				<chance>100</chance>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>15404</skillId> <!-- Unable to Target -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19437" toLevel="1" name="Vanguard of Baylor">
 		<!-- Summons the Dominant Flag. If used near the Dominant Flag, it applies the effects of Melody, Harmony, Drum, Ditty and Rhapsody buff skills to clan members and enhances Seal Mesmerizing skills (Lv. 4 or higher). Also makes the caster immune to Pull. Consumes 5 Spirit Ore. -->
@@ -1772,6 +1819,8 @@
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<reuseDelay>1000</reuseDelay>
 		<effectPoint>-418</effectPoint>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="MagicalAttack">
 				<power>50</power>
@@ -1782,6 +1831,55 @@
 		<!-- P. Atk., P. Def, M. Atk. and M. Def +$s1 and P. Skill Power +$s2. Increases the chance to activate additional effect when the Rampageous Beat is cast. -->
 		<icon>icon.skill19441</icon>
 		<operateType>P</operateType>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
+		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+			<effect name="PAtk">
+				<amount>
+					<value level="1">14</value>
+					<value level="2">16</value>
+					<value level="3">18</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>
+					<value level="1">14</value>
+					<value level="2">16</value>
+					<value level="3">18</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>
+					<value level="1">14</value>
+					<value level="2">16</value>
+					<value level="3">18</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>
+					<value level="1">14</value>
+					<value level="2">16</value>
+					<value level="3">18</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalSkillPower">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19442" toLevel="3" name="Single Note">
 		<!-- For $s1, P. Atk. and Atk. Spd. +$s2. -->
@@ -1825,6 +1923,12 @@
 				<value level="3">10</value>
 				<mode>PER</mode>
 			</effect>
+			<effect name="MagicalAttackSpeed">
+				<value level="1">0</value>
+				<value level="2">0</value>
+				<value level="3">10</value>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19443" toLevel="7" name="Melody of Refection">
@@ -2008,14 +2112,6 @@
 			<effect name="BlockAbnormalSlot">
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
-			<effect name="HpRegen">
-				<amount>75</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MpRegen">
-				<amount>100</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="PhysicalEvasion">
 				<amount>5</amount>
 				<mode>DIFF</mode>
@@ -2024,6 +2120,14 @@
 				<amount>5</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="HpRegen">
+				<amount>75</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MpRegen">
+				<amount>100</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="MagicMpCost">
 				<amount>-22</amount>
 				<mode>PER</mode>
@@ -2045,18 +2149,15 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 		</abnormalLvl>
-		<abnormalType>SONG_WEAPON</abnormalType>
-		<abnormalTime>300</abnormalTime>
+		<abnormalType>PD_UP_DMAGIC</abnormalType> <!-- NOT RETAIL: FIXME -->
 		<isTriggeredSkill>true</isTriggeredSkill>
 		<effectPoint>707</effectPoint>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<isTriggeredSkill>true</isTriggeredSkill>
 		<affectRange>2000</affectRange>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PAtk">
 				<amount>15</amount>
@@ -2066,6 +2167,13 @@
 				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="TriggerSkillBySkill">
+				<castSkillId>19204</castSkillId>
+				<skillId>19447</skillId> <!-- Glaring -->
+				<skillLevel>2</skillLevel>
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19448" toLevel="11" name="Rampageous Beat">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd
index 795c09990f..c3cd5beb9c 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd
@@ -2371,6 +2371,7 @@
 															</xs:complexType>
 														</xs:element>
 														<xs:element minOccurs="0" name="mode" type="xs:string" />
+														<xs:element minOccurs="0" name="magicType" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="position" type="xs:string" />
 													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
@@ -2507,6 +2508,7 @@
 																</xs:sequence>
 															</xs:complexType>
 														</xs:element>
+														<xs:element minOccurs="0" name="chance" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="skillLevel">
 															<xs:complexType mixed="true">
@@ -2525,6 +2527,7 @@
 														</xs:element>
 													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
+													<xs:attribute name="abnormalTime" type="xs:unsignedByte" use="optional" />
 													<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
 													<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
 												</xs:complexType>
@@ -2543,7 +2546,21 @@
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
 														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
-														<xs:element minOccurs="0" name="skillLevel" type="xs:unsignedByte" />
+														<xs:element minOccurs="0" name="skillLevel">
+															<xs:complexType mixed="true">
+																<xs:sequence minOccurs="0">
+																	<xs:element maxOccurs="unbounded" name="value">
+																		<xs:complexType>
+																			<xs:simpleContent>
+																				<xs:extension base="xs:unsignedByte">
+																					<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+																				</xs:extension>
+																			</xs:simpleContent>
+																		</xs:complexType>
+																	</xs:element>
+																</xs:sequence>
+															</xs:complexType>
+														</xs:element>
 														<xs:element minOccurs="0" name="fullLethal" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="halfLethal" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="amount">
@@ -2628,7 +2645,21 @@
 															<xs:element name="staticChance" type="xs:boolean" />
 															<xs:element name="magicTypes" type="xs:string" />
 															<xs:element name="skillId" type="xs:unsignedShort" />
-															<xs:element name="skillLevel" type="xs:unsignedByte" />
+															<xs:element name="skillLevel">
+																<xs:complexType mixed="true">
+																	<xs:sequence minOccurs="0">
+																		<xs:element maxOccurs="unbounded" name="value">
+																			<xs:complexType>
+																				<xs:simpleContent>
+																					<xs:extension base="xs:unsignedByte">
+																						<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+																					</xs:extension>
+																				</xs:simpleContent>
+																			</xs:complexType>
+																		</xs:element>
+																	</xs:sequence>
+																</xs:complexType>
+															</xs:element>
 															<xs:element name="fullLethal" type="xs:unsignedByte" />
 															<xs:element name="halfLethal" type="xs:unsignedByte" />
 															<xs:element name="amount">
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6:
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
index a59baa8d3d..300feba340 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
@@ -477,13 +477,6 @@
 				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11509" toLevel="13" name="Radiant Crash">
 		<!-- Attacks the target with $s1 Power added to P. Atk., P./ M. Def. -$s3 for $s2 Requires a sword/ blunt/ dual sword/ dual blunt to be equipped. Over-hit. Critical. -->
@@ -610,13 +603,6 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11510" toLevel="13" name="Resolving Bash">
 		<!-- Attacks target with $s1 Power added to P. Atk. For $s2, P./ M. Atk. -$s3. Requires a sword/ blunt/ dual sword/ dual blunt to be equipped. Over-hit. Critical. -->
@@ -743,13 +729,6 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11511" toLevel="13" name="Phantom Slasher">
 		<!-- Attacks the target with $s1 Power added to P. Atk., P. Atk./ M. Atk./ P. Def./ M. Def. -$s3 for $s2 The target can remove these debuffs if it has Spectral Slash Stage 3 or higher. Requires a sword/ blunt/ dual sword/ dual blunt to be equipped. Over-hit. Critical. -->
@@ -820,6 +799,11 @@
 		<affectScope>SINGLE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<conditions>
+			<condition name="OpCheckAbnormal">
+				<type>ULTIMATE_DEBUFF</type>
+				<level>1</level>
+				<hasAbnormal>true</hasAbnormal>
+			</condition>
 			<condition name="EquipWeapon">
 				<weaponType>
 					<item>DUAL</item>
@@ -870,32 +854,7 @@
 				<amount>-20</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="CallSkill">
-				<skillId>19435</skillId> <!-- Spectral Slash -->
-				<skillLevel>
-					<value level="1">1</value> <!-- Guessed -->
-					<value level="2">1</value> <!-- Guessed -->
-					<value level="3">2</value> <!-- Guessed -->
-					<value level="4">2</value> <!-- Guessed -->
-					<value level="5">3</value> <!-- Guessed -->
-					<value level="6">3</value> <!-- Guessed -->
-					<value level="7">3</value> <!-- Guessed -->
-					<value level="8">4</value> <!-- Guessed -->
-					<value level="9">4</value> <!-- Guessed -->
-					<value level="10">4</value> <!-- Guessed -->
-					<value level="11">5</value> <!-- Guessed -->
-					<value level="12">5</value> <!-- Guessed -->
-					<value level="13">5</value> <!-- Guessed -->
-				</skillLevel>
-			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11513" toLevel="13" name="Radiant Crash">
 		<!-- Attacks target and nearby enemies with $s1 Power added to P. Atk. for $s2, target's P./ M. Def. -$s3. Requires a sword/ blunt/ dual sword/ dual blunt to be equipped. Over-hit. Critical. -->
@@ -1015,13 +974,6 @@
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11514" toLevel="13" name="Resolving Bash">
 		<!-- Attacks target and nearby enemies with $s1 Power added to P. Atk. For $s2, P./ M. Atk. -$s3. Requires a sword/ blunt/ dual sword/ dual blunt to be equipped. Over-hit. Critical. -->
@@ -1137,13 +1089,6 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11515" toLevel="5" name="Confusion Bomber">
 		<!-- Curses target with darkness. For $s1, decreases Speed and Atk. Spd. by $s2. After $s3, detonates target to inflict damage nearby. Requires a sword, dual sword or dual blunt to be equipped. -->
@@ -2311,6 +2256,10 @@
 		<affectScope>PARTY</affectScope>
 		<affectObject>FRIEND</affectObject>
 		<effects>
+			<effect name="MaxHp">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="DispelBySlotProbability">
 				<dispel>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</dispel>
 				<rate>100</rate>
@@ -2330,10 +2279,6 @@
 				<amount>-40</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxHp">
-				<amount>30</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="VampiricAttack">
 				<amount>8</amount>
 				<chance>30</chance>
@@ -3440,6 +3385,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<endEffects>
+			<effect name="Confuse" abnormalTime="3">
+				<chance>100</chance>
+			</effect>
+		</endEffects>
 	</skill>
 	<skill id="11547" toLevel="10" name="Superior HP Recovery">
 		<!-- HP Recovery Bonus +$s1. STR +$s2. -->
@@ -4393,47 +4343,25 @@
 		<!-- M. Atk. +$s1, Skill Power +$s2 and Skill Cooldown -$s3. -->
 		<icon>icon.skill11581</icon>
 		<operateType>P</operateType>
-		<magicLvl>85</magicLvl>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
 		<effects>
-			<effect name="MaxCp">
+			<effect name="MAtk">
 				<amount>
-					<value level="1">1.05</value>
-					<value level="2">1.06</value>
-					<value level="3">1.07</value>
-					<value level="4">1.10</value>
+					<value level="1">20</value>
+					<value level="2">25</value>
+					<value level="3">30</value>
+					<value level="4">35</value>
 				</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MaxMp">
-				<amount>
-					<value level="1">1.05</value>
-					<value level="2">1.06</value>
-					<value level="3">1.07</value>
-					<value level="4">1.10</value>
-				</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MpRegen">
-				<amount>
-					<value level="1">5</value>
-					<value level="2">6</value>
-					<value level="3">7</value>
-					<value level="4">10</value>
-				</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="PhysicalSkillPower">
-				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MaxHp">
-				<amount>
-					<value level="1">1.05</value>
-					<value level="2">1.06</value>
-					<value level="3">1.07</value>
-					<value level="4">1.10</value>
-				</amount>
-				<mode>DIFF</mode>
+			<effect name="MagicalSkillPower">
+				<amount>5</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="Reuse">
 				<amount>
@@ -4455,15 +4383,6 @@
 				<mode>PER</mode>
 				<magicType>1</magicType>
 			</effect>
-			<effect name="SkillCriticalProbability">
-				<amount>
-					<value level="1">10</value>
-					<value level="2">20</value>
-					<value level="3">50</value>
-					<value level="4">100</value>
-				</amount>
-				<mode>PER</mode>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="11582" toLevel="4" name="Mass Song of Silence">
@@ -4507,35 +4426,63 @@
 	<skill id="11583" toLevel="4" name="Grand Melody of Spirit">
 		<!-- Atk. Spd./ Casting Spd. +$s1 and Attack Attribute +$s2. Activates the Single Note effect on you if Sforzando Sting, Radiant Crash or Resolving Bash is cast. -->
 		<icon>icon.skill11583</icon>
+		<operateType>P</operateType>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
 			<value level="3">95</value>
 			<value level="4">99</value>
 		</magicLvl>
-		<operateType>P</operateType>
 		<effects>
-			<effect name="MagicalDefence">
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19442</skillId> <!-- Single Note -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+				<attackSkillId>19431</attackSkillId> <!--  Sforzando Sting -->
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19442</skillId> <!-- Single Note -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+				<attackSkillId>11509</attackSkillId> <!-- Radiant Crash -->
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19442</skillId> <!-- Single Note -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+				<attackSkillId>11510</attackSkillId> <!-- Resolving Bash -->
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
 				<amount>
-					<value level="1">5</value>
-					<value level="2">7</value>
-					<value level="3">10</value>
+					<value level="1">10</value>
+					<value level="2">11</value>
+					<value level="3">13</value>
 					<value level="4">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalDefence">
+			<effect name="MagicalAttackSpeed">
 				<amount>
-					<value level="1">5</value>
-					<value level="2">7</value>
-					<value level="3">10</value>
+					<value level="1">10</value>
+					<value level="2">11</value>
+					<value level="3">13</value>
 					<value level="4">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
-				<amount>5</amount>
-				<mode>PER</mode>
+			<effect name="AttackAttributeAdd">
+				<amount>
+					<value level="1">50</value>
+					<value level="2">60</value>
+					<value level="3">80</value>
+					<value level="4">100</value>
+				</amount>
 			</effect>
 		</effects>
 	</skill>
@@ -4582,26 +4529,35 @@
 		<!-- P. Atk./ M. Atk. +$s1 and P. Skill Power +$s2. Activates the Spectral Slash effect on the target if Trace of Twin Edges, Shadow Blade or Resolving Bash is cast. -->
 		<icon>icon.skill11585</icon>
 		<operateType>P</operateType>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
 		<effects>
-			<effect name="TriggerSkillBySkill">
-				<castSkillId>11508</castSkillId><!-- Trace of Twin Edges -->
-				<skillId>19435</skillId> <!-- Spectral Slash -->
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19435</skillId> <!-- Phantom Slasher -->
 				<skillLevel>1</skillLevel>
-				<chance>30</chance>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<attackSkillId>11508</attackSkillId> <!-- Trace of Twin Edges -->
+				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
-			<effect name="TriggerSkillBySkill">
-				<castSkillId>19426</castSkillId><!-- Shadow Blade -->
-				<skillId>19435</skillId> <!-- Spectral Slash -->
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19435</skillId> <!-- Phantom Slasher -->
 				<skillLevel>1</skillLevel>
-				<chance>30</chance>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<attackSkillId>19426</attackSkillId> <!-- Shadow Blade -->
+				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
-			<effect name="TriggerSkillBySkill">
-				<castSkillId>11510</castSkillId><!-- Resolving Bash -->
-				<skillId>19435</skillId> <!-- Spectral Slash -->
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19435</skillId> <!-- Phantom Slasher -->
 				<skillLevel>1</skillLevel>
-				<chance>30</chance>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+				<attackSkillId>11510</attackSkillId> <!-- Resolving Bash -->
+				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
 			<effect name="PAtk">
@@ -4726,6 +4682,12 @@
 		<!-- PvP damage +$s1 and Max MP/ CP +$s2. -->
 		<icon>icon.skill11588</icon>
 		<operateType>P</operateType>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
 		<effects>
 			<effect name="MaxMp">
 				<amount>
@@ -4736,6 +4698,18 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDamageBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDamageBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="11589" toLevel="5" name="Horn Frenzy">
@@ -5122,7 +5096,7 @@
 			<effect name="MagicMpCost">
 				<amount>-10</amount>
 				<mode>PER</mode>
-				<magicType>22</magicType>
+				<magicType>2</magicType>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml
index f07b87b7d1..5e40be9ece 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml
@@ -133,7 +133,7 @@
 		<abnormalType>SONG_WEAPON</abnormalType> <!-- find proper name -->
 		<itemConsumeCount>5</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ores -->
-		<operateType>A2</operateType>
+		<operateType>A3</operateType>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<mpConsume>270</mpConsume>
@@ -168,11 +168,13 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
+		</effects>
+		<selfEffects>
 			<effect name="CallSkill">
 				<skillId>19447</skillId> <!-- Glaring -->
 				<skillLevel>1</skillLevel>
 			</effect>
-		</effects>
+		</selfEffects>
 	</skill>
 	<skill id="19205" toLevel="1" name="Song of Archery">
 		<!-- Increases Bow/ Crossbow Resistance of all party members by 50% for 30 sec. Consumes 5 Spirit Ore. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19400-19499.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19400-19499.xml
index fe93edab38..1993bd92bd 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19400-19499.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19400-19499.xml
@@ -1209,10 +1209,6 @@
 			<effect name="CallSkill">
 				<skillId>19432</skillId> <!-- Swift Praise -->
 				<skillLevel>1</skillLevel>
-			</effect>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad lvl 1 -->
-				<skillLevel>1</skillLevel>
 				<skillLevelScaleTo>3</skillLevelScaleTo>
 			</effect>
 		</selfEffects>
@@ -1344,6 +1340,12 @@
 					<item>BLUNT</item>
 				</weaponType>
 			</condition>
+			<condition name="OpCheckAbnormal">
+				<type>TRIAD</type>
+				<level>3</level>
+				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="PhysicalAttackWeaponBonus">
@@ -1389,8 +1391,14 @@
 		</effects>
 		<selfEffects>
 			<effect name="Reuse">
-				<amount>10</amount>
+				<amount>-10</amount>
 				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-10</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
 			</effect>
 			<effect name="CallSkill">
 				<skillId>19432</skillId> <!-- Swift Praise -->
@@ -1419,9 +1427,7 @@
 			<value level="12">12</value>
 			<value level="13">13</value>
 		</abnormalLvl>
-		<abnormalTime>20</abnormalTime>
 		<abnormalType>ULTIMATE_DEBUFF</abnormalType>
-		<activateRate>100</activateRate>
 		<castRange>100</castRange>
 		<coolTime>300</coolTime>
 		<effectRange>400</effectRange>
@@ -1456,8 +1462,7 @@
 			<value level="12">70</value>
 			<value level="13">72</value>
 		</mpConsume>
-		<operateType>A2</operateType>
-		<nextAction>ATTACK</nextAction>
+		<operateType>DA3</operateType>
 		<reuseDelay>7000</reuseDelay>
 		<effectPoint>
 			<value level="1">-687</value>
@@ -1479,6 +1484,7 @@
 		<isDebuff>true</isDebuff>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -1488,6 +1494,16 @@
 					<item>BLUNT</item>
 				</weaponType>
 			</condition>
+			<condition name="OpBlink">
+				<direction>BACK</direction>
+				<range>400</range>
+			</condition>
+			<condition name="OpCheckAbnormal">
+				<type>TRIAD</type>
+				<level>3</level>
+				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="PhysicalAttackWeaponBonus">
@@ -1513,28 +1529,8 @@
 					<value fromLevel="7" toLevel="13" fromSubLevel="3001" toSubLevel="3020">{0.99 - 0.006 * (subIndex - 1)}</value>
 				</pDefMod>
 			</effect>
-			<effect name="PhysicalAttackSpeed">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MagicalAttackSpeed">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PhysicalDefence">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MagicalDefence">
-				<amount>-50</amount>
-				<mode>PER</mode>
-			</effect>
 		</effects>
 		<selfEffects>
-			<effect name="Reuse">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="CallSkill">
 				<skillId>19432</skillId> <!-- Swift Praise -->
 				<skillLevel>1</skillLevel>
@@ -1543,11 +1539,51 @@
 				<dispel>TRIAD</dispel>
 			</effect>
 		</selfEffects>
+		<pveEffects>
+			<effect name="CallSkill">
+				<skillId>19522</skillId> <!-- Repeat Mark Somersault -->
+				<skillLevel>
+					<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>
+					<value level="12">12</value>
+					<value level="13">13</value>
+				</skillLevel>
+			</effect>
+		</pveEffects>
+		<pvpEffects>
+			<effect name="CallSkill">
+				<skillId>19522</skillId> <!-- Repeat Mark Somersault -->
+				<skillLevel>
+					<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>
+					<value level="12">12</value>
+					<value level="13">13</value>
+				</skillLevel>
+			</effect>
+		</pvpEffects>
 	</skill>
 	<skill id="19435" toLevel="5" name="Spectral Slash">
 		<!-- The Spectral Sword attacks the target with $s1 Power added to P. Atk. and decreases P./ M. Def. by $s3 for $s2. -->
 		<icon>icon.skill19435</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 		<isTriggeredSkill>true</isTriggeredSkill>
 		<isDebuff>true</isDebuff>
 		<abnormalTime>10</abnormalTime>
@@ -1673,6 +1709,11 @@
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<conditions>
+			<condition name="OpCheckAbnormal">
+				<type>ULTIMATE_DEBUFF</type>
+				<level>2</level>
+				<hasAbnormal>true</hasAbnormal>
+			</condition>
 			<condition name="EquipWeapon">
 				<weaponType>
 					<item>DUAL</item>
@@ -1735,6 +1776,12 @@
 				<chance>100</chance>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>15404</skillId> <!-- Unable to Target -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19437" toLevel="1" name="Vanguard of Baylor">
 		<!-- Summons the Dominant Flag. If used near the Dominant Flag, it applies the effects of Melody, Harmony, Drum, Ditty and Rhapsody buff skills to clan members and enhances Seal Mesmerizing skills (Lv. 4 or higher). Also makes the caster immune to Pull. Consumes 5 Spirit Ore. -->
@@ -1857,6 +1904,8 @@
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<reuseDelay>1000</reuseDelay>
 		<effectPoint>-418</effectPoint>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="MagicalAttack">
 				<power>50</power>
@@ -1867,6 +1916,55 @@
 		<!-- P. Atk., P. Def, M. Atk. and M. Def. +$s1 and P. Skill Power +$s2. Increases the chance to activate additional effect when the Rampageous Beat is cast. -->
 		<icon>icon.skill19441</icon>
 		<operateType>P</operateType>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
+		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+			<effect name="PAtk">
+				<amount>
+					<value level="1">14</value>
+					<value level="2">16</value>
+					<value level="3">18</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>
+					<value level="1">14</value>
+					<value level="2">16</value>
+					<value level="3">18</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>
+					<value level="1">14</value>
+					<value level="2">16</value>
+					<value level="3">18</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>
+					<value level="1">14</value>
+					<value level="2">16</value>
+					<value level="3">18</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalSkillPower">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19442" toLevel="3" name="Single Note">
 		<!-- For $s1, P. Atk. and Atk. Spd. +$s2. -->
@@ -1910,6 +2008,12 @@
 				<value level="3">10</value>
 				<mode>PER</mode>
 			</effect>
+			<effect name="MagicalAttackSpeed">
+				<value level="1">0</value>
+				<value level="2">0</value>
+				<value level="3">10</value>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19443" toLevel="9" name="Melody of Refection">
@@ -2017,7 +2121,6 @@
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="VampiricAttack">
-				<!-- Custom chance -->
 				<amount>8</amount>
 				<chance>30</chance>
 			</effect>
@@ -2100,14 +2203,6 @@
 			<effect name="BlockAbnormalSlot">
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;BUFF_UNICORN_SERAPHIM;BUFF_QUEEN_OF_CAT;KNIGHT_AURA;DMG_SHIELD;AVOID_UP</slot>
 			</effect>
-			<effect name="HpRegen">
-				<amount>75</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MpRegen">
-				<amount>100</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="PhysicalEvasion">
 				<amount>5</amount>
 				<mode>DIFF</mode>
@@ -2116,6 +2211,14 @@
 				<amount>5</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="HpRegen">
+				<amount>75</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MpRegen">
+				<amount>100</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="MagicMpCost">
 				<amount>-22</amount>
 				<mode>PER</mode>
@@ -2137,18 +2240,15 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 		</abnormalLvl>
-		<abnormalType>SONG_WEAPON</abnormalType>
-		<abnormalTime>300</abnormalTime>
+		<abnormalType>PD_UP_DMAGIC</abnormalType> <!-- NOT RETAIL: FIXME -->
 		<isTriggeredSkill>true</isTriggeredSkill>
 		<effectPoint>707</effectPoint>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<isTriggeredSkill>true</isTriggeredSkill>
 		<affectRange>2000</affectRange>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PAtk">
 				<amount>15</amount>
@@ -2158,6 +2258,13 @@
 				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="TriggerSkillBySkill">
+				<castSkillId>19204</castSkillId>
+				<skillId>19447</skillId> <!-- Glaring -->
+				<skillLevel>2</skillLevel>
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19448" toLevel="13" name="Rampageous Beat">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
index 92e65fe721..00f5150065 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
@@ -2371,6 +2371,7 @@
 															</xs:complexType>
 														</xs:element>
 														<xs:element minOccurs="0" name="mode" type="xs:string" />
+														<xs:element minOccurs="0" name="magicType" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="position" type="xs:string" />
 													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
@@ -2507,6 +2508,7 @@
 																</xs:sequence>
 															</xs:complexType>
 														</xs:element>
+														<xs:element minOccurs="0" name="chance" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="skillLevel">
 															<xs:complexType mixed="true">
@@ -2525,6 +2527,7 @@
 														</xs:element>
 													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
+													<xs:attribute name="abnormalTime" type="xs:unsignedByte" use="optional" />
 													<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
 													<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
 												</xs:complexType>
@@ -2543,7 +2546,21 @@
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
 														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
-														<xs:element minOccurs="0" name="skillLevel" type="xs:unsignedByte" />
+														<xs:element minOccurs="0" name="skillLevel">
+															<xs:complexType mixed="true">
+																<xs:sequence minOccurs="0">
+																	<xs:element maxOccurs="unbounded" name="value">
+																		<xs:complexType>
+																			<xs:simpleContent>
+																				<xs:extension base="xs:unsignedByte">
+																					<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+																				</xs:extension>
+																			</xs:simpleContent>
+																		</xs:complexType>
+																	</xs:element>
+																</xs:sequence>
+															</xs:complexType>
+														</xs:element>
 														<xs:element minOccurs="0" name="fullLethal" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="halfLethal" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="amount">
@@ -2628,7 +2645,21 @@
 															<xs:element name="staticChance" type="xs:boolean" />
 															<xs:element name="magicTypes" type="xs:string" />
 															<xs:element name="skillId" type="xs:unsignedShort" />
-															<xs:element name="skillLevel" type="xs:unsignedByte" />
+															<xs:element name="skillLevel">
+																<xs:complexType mixed="true">
+																	<xs:sequence minOccurs="0">
+																		<xs:element maxOccurs="unbounded" name="value">
+																			<xs:complexType>
+																				<xs:simpleContent>
+																					<xs:extension base="xs:unsignedByte">
+																						<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+																					</xs:extension>
+																				</xs:simpleContent>
+																			</xs:complexType>
+																		</xs:element>
+																	</xs:sequence>
+																</xs:complexType>
+															</xs:element>
 															<xs:element name="fullLethal" type="xs:unsignedByte" />
 															<xs:element name="halfLethal" type="xs:unsignedByte" />
 															<xs:element name="amount">
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6:
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
index d4f46ea0c1..21a2a6a6bc 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
@@ -477,13 +477,6 @@
 				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11509" toLevel="13" name="Radiant Crash">
 		<!-- Strikes the target with $s1 power, their P./ M. Def. -$s3 for $s2 Requires a sword, a blunt weapon, a dual sword, or a dual blunt weapon. Critical. Over-hit. -->
@@ -610,13 +603,6 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11510" toLevel="13" name="Resolving Bash">
 		<!-- Strikes the target with $s1 power, their P./ M. Atk. -$s3 for $s2 Requires a sword, a blunt weapon, a dual sword, or a dual blunt weapon. Critical. Over-hit. -->
@@ -743,13 +729,6 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11511" toLevel="13" name="Phantom Slasher">
 		<!-- Attacks the target with 26041 power. For 10 seconds, enemy's P./ M. Atk. and P./ M. Def. -50%. Removes the Spectral Slash Lv. 1+ effect from the target. Requires a sword, a blunt weapon, dual swords, or dual blunt weapons. Critical. Over-hit. -->
@@ -876,13 +855,6 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11513" toLevel="13" name="Radiant Crash">
 		<!-- Attacks the target and nearby enemies with $s1 power, their P./ M. Def. -$s3 for $s2 Requires a sword, a blunt weapon, a dual sword, or a dual blunt weapon. Critical. Over-hit. -->
@@ -1002,13 +974,6 @@
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11514" toLevel="13" name="Resolving Bash">
 		<!-- Attacks the target and nearby enemies with $s1 power, their P./ M. Atk. -$s3 for $s2 Requires a sword, a blunt weapon, a dual sword, or a dual blunt weapon. Critical. Over-hit. -->
@@ -1124,13 +1089,6 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
-		<selfEffects>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad -->
-				<skillLevel>1</skillLevel>
-				<skillLevelScaleTo>3</skillLevelScaleTo>
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="11515" toLevel="5" name="Confusion Bomber">
 		<!-- Summons dark powers to curse the target. For $s1, their Speed/ Atk. Spd. -$s2. After $s3, detonates the target inflicting damage to nearby enemies. Requires a sword, a blunt weapon, a dual sword, or a dual blunt weapon. Inflicted status: Confusion (Fear, Aerial Yoke, Faint, Charm, Stun, Paralysis, Knockback, Knockdown, Pull). -->
@@ -4374,50 +4332,28 @@
 		</effects>
 	</skill>
 	<skill id="11581" toLevel="4" name="Grand Incarnation of Light">
-		<!-- M. Atk. +$s1, Skill Power +$s2 and Skill Cooldown -$s3. -->
+		<!-- M. Atk. +20%, Skill Power +5% and Skill Cooldown -5%. -->
 		<icon>icon.skill11581</icon>
 		<operateType>P</operateType>
-		<magicLvl>85</magicLvl>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
 		<effects>
-			<effect name="MaxCp">
+			<effect name="MAtk">
 				<amount>
-					<value level="1">1.05</value>
-					<value level="2">1.06</value>
-					<value level="3">1.07</value>
-					<value level="4">1.10</value>
+					<value level="1">20</value>
+					<value level="2">25</value>
+					<value level="3">30</value>
+					<value level="4">35</value>
 				</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MaxMp">
-				<amount>
-					<value level="1">1.05</value>
-					<value level="2">1.06</value>
-					<value level="3">1.07</value>
-					<value level="4">1.10</value>
-				</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="MpRegen">
-				<amount>
-					<value level="1">5</value>
-					<value level="2">6</value>
-					<value level="3">7</value>
-					<value level="4">10</value>
-				</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="PhysicalSkillPower">
-				<amount>5</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MaxHp">
-				<amount>
-					<value level="1">1.05</value>
-					<value level="2">1.06</value>
-					<value level="3">1.07</value>
-					<value level="4">1.10</value>
-				</amount>
-				<mode>DIFF</mode>
+			<effect name="MagicalSkillPower">
+				<amount>5</amount>
+				<mode>PER</mode>
 			</effect>
 			<effect name="Reuse">
 				<amount>
@@ -4439,15 +4375,6 @@
 				<mode>PER</mode>
 				<magicType>1</magicType>
 			</effect>
-			<effect name="SkillCriticalProbability">
-				<amount>
-					<value level="1">10</value>
-					<value level="2">20</value>
-					<value level="3">50</value>
-					<value level="4">100</value>
-				</amount>
-				<mode>PER</mode>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="11582" toLevel="4" name="Mass Song of Silence">
@@ -4489,37 +4416,65 @@
 		</effects>
 	</skill>
 	<skill id="11583" toLevel="4" name="Grand Melody of Spirit">
-		<!-- Atk. Spd./ Casting Spd. +$s1 and Attack Attribute +$s2. Activates the Single Note effect on you if Sforzando Sting, Radiant Crash or Resolving Bash is cast. -->
+		<!-- Atk. Spd./ Casting Spd. +10% and Attack Attribute +50. Activates the Single Note effect on you if Sforzando Sting, Radiant Crash or Resolving Bash is cast. -->
 		<icon>icon.skill11583</icon>
+		<operateType>P</operateType>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
 			<value level="3">95</value>
 			<value level="4">99</value>
 		</magicLvl>
-		<operateType>P</operateType>
 		<effects>
-			<effect name="MagicalDefence">
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19442</skillId> <!-- Single Note -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+				<attackSkillId>19431</attackSkillId> <!--  Sforzando Sting -->
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19442</skillId> <!-- Single Note -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+				<attackSkillId>11509</attackSkillId> <!-- Radiant Crash -->
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
+			<effect name="TriggerSkillBySkillAttack">
+				<skillId>19442</skillId> <!-- Single Note -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>3</skillLevelScaleTo>
+				<attackSkillId>11510</attackSkillId> <!-- Resolving Bash -->
+				<chance>100</chance>
+				<targetType>SELF</targetType>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
 				<amount>
-					<value level="1">5</value>
-					<value level="2">7</value>
-					<value level="3">10</value>
+					<value level="1">10</value>
+					<value level="2">11</value>
+					<value level="3">13</value>
 					<value level="4">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalDefence">
+			<effect name="MagicalAttackSpeed">
 				<amount>
-					<value level="1">5</value>
-					<value level="2">7</value>
-					<value level="3">10</value>
+					<value level="1">10</value>
+					<value level="2">11</value>
+					<value level="3">13</value>
 					<value level="4">15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
-				<amount>5</amount>
-				<mode>PER</mode>
+			<effect name="AttackAttributeAdd">
+				<amount>
+					<value level="1">50</value>
+					<value level="2">60</value>
+					<value level="3">80</value>
+					<value level="4">100</value>
+				</amount>
 			</effect>
 		</effects>
 	</skill>
@@ -4566,6 +4521,12 @@
 		<!-- P. Atk./ M. Atk. +$s1 and P. Skill Power +$s2. Activates the Spectral Slash effect on the target if Trace of Twin Edges, Shadow Blade or Resolving Bash is cast. -->
 		<icon>icon.skill11585</icon>
 		<operateType>P</operateType>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
 		<effects>
 			<effect name="TriggerSkillBySkillAttack">
 				<skillId>19435</skillId> <!-- Phantom Slasher -->
@@ -4716,9 +4677,15 @@
 		</effects>
 	</skill>
 	<skill id="11588" toLevel="4" name="Grand Vanguard of Baylor">
-		<!-- PvP damage +$s1 and Max MP/ CP +$s2. -->
+		<!-- PvP damage +10% and Max MP/ CP +10%. -->
 		<icon>icon.skill11588</icon>
 		<operateType>P</operateType>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
 		<effects>
 			<effect name="MaxMp">
 				<amount>
@@ -4729,6 +4696,18 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDamageBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDamageBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="11589" toLevel="5" name="Horn Frenzy">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml
index 1ecc8870fe..862c4fdcb4 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml
@@ -133,7 +133,7 @@
 		<abnormalType>SONG_WEAPON</abnormalType> <!-- find proper name -->
 		<itemConsumeCount>5</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ores -->
-		<operateType>A2</operateType>
+		<operateType>A3</operateType>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<mpConsume>270</mpConsume>
@@ -168,11 +168,13 @@
 				<amount>25</amount>
 				<mode>PER</mode>
 			</effect>
+		</effects>
+		<selfEffects>
 			<effect name="CallSkill">
 				<skillId>19447</skillId> <!-- Glaring -->
 				<skillLevel>1</skillLevel>
 			</effect>
-		</effects>
+		</selfEffects>
 	</skill>
 	<skill id="19205" toLevel="1" name="Song of Archery">
 		<!-- Increases Bow/ Crossbow Resistance of all party members by 50% for 30 sec. Consumes 5 Spirit Ore. -->
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19400-19499.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19400-19499.xml
index 04e87ce9b8..8fbd0517d3 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19400-19499.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19400-19499.xml
@@ -1209,10 +1209,6 @@
 			<effect name="CallSkill">
 				<skillId>19432</skillId> <!-- Swift Praise -->
 				<skillLevel>1</skillLevel>
-			</effect>
-			<effect name="CallSkill">
-				<skillId>19442</skillId> <!-- Single Note - Triad lvl 1 -->
-				<skillLevel>1</skillLevel>
 				<skillLevelScaleTo>3</skillLevelScaleTo>
 			</effect>
 		</selfEffects>
@@ -1222,9 +1218,11 @@
 		<icon>icon.skill19432</icon>
 		<operateType>A2</operateType>
 		<isTriggeredSkill>true</isTriggeredSkill>
-		<operateType>A2</operateType>
 		<effectPoint>687</effectPoint>
-		<abnormalLvl>4</abnormalLvl>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLvl>
 		<abnormalTime>4</abnormalTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
@@ -1892,6 +1890,8 @@
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<reuseDelay>1000</reuseDelay>
 		<effectPoint>-418</effectPoint>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="MagicalAttack">
 				<power>50</power>
@@ -1902,6 +1902,12 @@
 		<!-- P. Atk., P. Def, M. Atk. and M. Def. +14% and P. Skill Power +5%. Increases the chance to activate additional effect when the Rampageous Beat is cast. -->
 		<icon>icon.skill19441</icon>
 		<operateType>P</operateType>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+		</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PAtk">
@@ -1988,6 +1994,12 @@
 				<value level="3">10</value>
 				<mode>PER</mode>
 			</effect>
+			<effect name="MagicalAttackSpeed">
+				<value level="1">0</value>
+				<value level="2">0</value>
+				<value level="3">10</value>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19443" toLevel="9" name="Melody of Refection">
@@ -2234,8 +2246,7 @@
 		<affectRange>2000</affectRange>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PAtk">
 				<amount>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6:
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6:
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6:
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6:
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6:
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6:
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6:
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/skills.xsd
index e0c2acbe3b..6abcf760b3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/skills.xsd
@@ -2353,6 +2353,7 @@
 															</xs:complexType>
 														</xs:element>
 														<xs:element minOccurs="0" name="mode" type="xs:string" />
+														<xs:element minOccurs="0" name="magicType" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="position" type="xs:string" />
 													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
@@ -2489,6 +2490,7 @@
 																</xs:sequence>
 															</xs:complexType>
 														</xs:element>
+														<xs:element minOccurs="0" name="chance" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="skillLevel">
 															<xs:complexType mixed="true">
@@ -2507,6 +2509,7 @@
 														</xs:element>
 													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
+													<xs:attribute name="abnormalTime" type="xs:unsignedByte" use="optional" />
 													<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
 													<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
 												</xs:complexType>
@@ -2525,7 +2528,21 @@
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
 														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
-														<xs:element minOccurs="0" name="skillLevel" type="xs:unsignedByte" />
+														<xs:element minOccurs="0" name="skillLevel">
+															<xs:complexType mixed="true">
+																<xs:sequence minOccurs="0">
+																	<xs:element maxOccurs="unbounded" name="value">
+																		<xs:complexType>
+																			<xs:simpleContent>
+																				<xs:extension base="xs:unsignedByte">
+																					<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+																				</xs:extension>
+																			</xs:simpleContent>
+																		</xs:complexType>
+																	</xs:element>
+																</xs:sequence>
+															</xs:complexType>
+														</xs:element>
 														<xs:element minOccurs="0" name="fullLethal" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="halfLethal" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="amount">
@@ -2610,7 +2627,21 @@
 															<xs:element name="staticChance" type="xs:boolean" />
 															<xs:element name="magicTypes" type="xs:string" />
 															<xs:element name="skillId" type="xs:unsignedShort" />
-															<xs:element name="skillLevel" type="xs:unsignedByte" />
+															<xs:element name="skillLevel">
+																<xs:complexType mixed="true">
+																	<xs:sequence minOccurs="0">
+																		<xs:element maxOccurs="unbounded" name="value">
+																			<xs:complexType>
+																				<xs:simpleContent>
+																					<xs:extension base="xs:unsignedByte">
+																						<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+																					</xs:extension>
+																				</xs:simpleContent>
+																			</xs:complexType>
+																		</xs:element>
+																	</xs:sequence>
+																</xs:complexType>
+															</xs:element>
 															<xs:element name="fullLethal" type="xs:unsignedByte" />
 															<xs:element name="halfLethal" type="xs:unsignedByte" />
 															<xs:element name="amount">
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
index adbb928cbd..e2facb28f5 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -45,7 +45,7 @@ public enum SkillOperateType
 	A2,
 	
 	/**
-	 * Active Skill with "Instant effect for target + Continuous effect for self"
+	 * Active Skill with "Instant effect for target + Continuous effect + Continuous effect for self"
 	 */
 	A3,
 	
@@ -163,6 +163,7 @@ public enum SkillOperateType
 		switch (this)
 		{
 			case A2:
+			case A3:
 			case A4:
 			case A5:
 			case A6: