diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19000-19099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19000-19099.xml
index 1ad97ced31..e6d72bd2a5 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19000-19099.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19000-19099.xml
@@ -921,18 +921,11 @@
 		</effects>
 	</skill>
 	<skill id="19032" toLevel="1" name="Ability of Light">
-		<!-- TODO: confirm me -->
 		<!-- Imbued with the Ability of Light. Increases Max CP by 3000 and damage inflicted during PvP by 10%. Effects do not apply when in Chaotic state. Can be used by a Marquis or higher. -->
 		<icon>icon.skill19008</icon>
 		<magicLvl>85</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
-		<passiveConditions>
-			<condition name="OpAlignment">
-				<alignment>LAWFUL</alignment>
-				<affectType>CASTER</affectType>
-			</condition>
-		</passiveConditions>
 		<effects>
 			<effect name="MaxCp">
 				<amount>3000</amount>
@@ -953,7 +946,6 @@
 		</effects>
 	</skill>
 	<skill id="19033" toLevel="1" name="Ability of Darkness">
-		<!-- TODO: confirm me -->
 		<!-- Imbued with the Ability of Darkness. Increases Max CP by 3000 and damage inflicted during PvP by 10%. Can be used by a Marquis or higher. -->
 		<icon>icon.skill19008</icon>
 		<magicLvl>85</magicLvl>
@@ -1031,7 +1023,6 @@
 		</effects>
 	</skill>
 	<skill id="19036" toLevel="1" name="Blessing of Light">
-		<!-- TODO: Confir me -->
 		<!-- Acquires 3% additional XP and SP through the blessing of the Guardian of Light. -->
 		<icon>icon.etc_pi_gift_box_i04</icon>
 		<operateType>A2</operateType>
@@ -1252,7 +1243,6 @@
 		</effects>
 	</skill>
 	<skill id="19041" toLevel="1" name="Escape: Castle">
-		<!-- TODO: Confirm me -->
 		<!-- Return to Castle. -->
 		<hitTime>20000</hitTime>
 		<icon>icon.vesper_cloack_i00</icon>
@@ -1274,7 +1264,6 @@
 		</effects>
 	</skill>
 	<skill id="19042" toLevel="1" name="Blessed Scroll of Escape: Castle">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Return to Castle. -->
 		<icon>icon.vesper_cloack_i00</icon>
 		<operateType>A1</operateType>
@@ -1293,6 +1282,11 @@
 				<type>CASTLE</type>
 			</condition>
 		</conditions>
+		<effects>
+			<effect name="Escape">
+				<escapeType>CASTLE</escapeType>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19074" toLevel="2" name="Academy Precept">
 		<!-- AUTO GENERATED SKILL -->
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml
index c7191446df..eedb5544b8 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml
@@ -316,6 +316,7 @@
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>3600</abnormalTime>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
@@ -344,6 +345,7 @@
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>3600</abnormalTime>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
@@ -386,14 +388,31 @@
 		<reuseDelay>4000</reuseDelay>
 	</skill>
 	<skill id="19119" toLevel="1" name="Noblesse Grace">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Retains target's buffs/debuffs upon death, except for Noblesse Grace and Lucky Charm. Consumes 1000 Spirit Ore. -->
 		<icon>icon.skill1323</icon>
 		<operateType>A2</operateType>
 		<mpConsume>500</mpConsume>
-		<hitTime>4000</hitTime>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>3600</abnormalTime>
+		<abnormalType>PRESERVE_ABNORMAL</abnormalType>
+		<affectRange>2000</affectRange>
+		<canBeDispelled>false</canBeDispelled>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<effectPoint>1</effectPoint>
-		<isMagic>1</isMagic>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<itemConsumeCount>1000</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<magicLvl>1</magicLvl>
+		<icon>icon.skill1323</icon>
+		<reuseDelay>1000</reuseDelay>
+		<isMagic>2</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>RANGE</affectScope>
+		<affectObject>FRIEND</affectObject>
+		<effects>
+			<effect name="NoblesseBless" />
+		</effects>
 	</skill>
 	<skill id="19120" toLevel="4" name="Noble Shield">
 		<!-- P. Def. + 2%. -->
@@ -754,7 +773,32 @@
 		<!-- Received damage - 10%. -->
 		<operateType>P</operateType>
 		<icon>icon.skill19137</icon>
-		<!-- TODO: Handle received damage - 10% -->
+		<effects>
+			<effect name="PveMagicalSkillDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalAttackDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalSkillDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>		
+		</effects>
 	</skill>
 	<skill id="19138" toLevel="1" name="Noble Frenzy">
 		<!-- Physical Skill Power + 10%. -->
@@ -879,7 +923,10 @@
 		<operateType>P</operateType>
 		<icon>icon.skill19146</icon>
 		<effects>
-			<!-- TODO: Find which skill triggers and under what circumstances -->
+			<effect name="DefenceMagicCriticalRate">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19147" toLevel="2" name="Noble Ambush">
@@ -1334,47 +1381,11 @@
 		<operateType>P</operateType>
 		<icon>icon.skill19130</icon>
 		<effects>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
+			<effect name="AttackAttributeAdd">
 				<amount>
 					<value level="1">20</value>
 					<value level="2">50</value>
 				</amount>
-				<attribute>FIRE</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>WATER</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>WIND</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>EARTH</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>HOLY</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>DARK</attribute>
 			</effect>
 			<effect name="DefenceAttribute">
 				<amount>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19200-19299.xml
index 3eed2479c1..0340640ed5 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19200-19299.xml
@@ -90,8 +90,8 @@
 		<!-- Decreases target's Bow/Crossbow Resistance by 60% for 7 seconds. Does not cancel when striking. Consumes 1 Soulstone. -->
 		<abnormalLvl>8</abnormalLvl>
 		<abnormalTime>7</abnormalTime>
-		<abnormalType>REAL_TARGET</abnormalType> <!-- TODO confirm -->
-		<abnormalVisualEffect>REAL_TARGET_2</abnormalVisualEffect> <!-- TODO confirm -->
+		<abnormalType>REAL_TARGET</abnormalType>
+		<abnormalVisualEffect>REAL_TARGET</abnormalVisualEffect>
 		<icon>icon.skill19203</icon>
 		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>1785</itemConsumeId> <!-- Soulstones -->
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/20000-20099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/20000-20099.xml
index 57e4a2ecdf..345f2bc340 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/20000-20099.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/20000-20099.xml
@@ -46,12 +46,13 @@
 	<skill id="20002" toLevel="1" name="Dragon Kick">
 		<!-- A dragon's powerful blow that attacks an enemy with 3420 Power added to P. Atk. Over-hit is possible. -->
 		<castRange>20</castRange>
-		<effectRange>400</effectRange> <!-- FIXME: value unconfirmed -->
+		<effectRange>400</effectRange>
 		<hitTime>2000</hitTime>
-		<magicLvl>85</magicLvl> <!-- FIXME: value unconfirmed -->
-		<operateType>A1</operateType> <!-- FIXME: value unconfirmed -->
-		<reuseDelay>7000</reuseDelay> <!-- FIXME: value unconfirmed -->
+		<magicLvl>85</magicLvl>
+		<operateType>A1</operateType>
+		<reuseDelay>7000</reuseDelay>
 		<rideState>NONE</rideState>
+		<mpConsume>55</mpConsume>
 		<effectPoint>-347</effectPoint>
 		<magicCriticalRate>5</magicCriticalRate>
 		<icon>icon.skill_transform_s_attack</icon>
@@ -70,12 +71,13 @@
 	<skill id="20003" toLevel="1" name="Dragon Slash">
 		<!-- A dragon's powerful slash that attacks an enemy with 3420 Power added to P. Atk. Over-hit is possible. -->
 		<castRange>20</castRange>
-		<effectRange>400</effectRange> <!-- FIXME: value unconfirmed -->
+		<effectRange>400</effectRange>
 		<hitTime>2000</hitTime>
-		<magicLvl>85</magicLvl> <!-- FIXME: value unconfirmed -->
+		<magicLvl>85</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>7000</reuseDelay> <!-- FIXME: value unconfirmed -->
+		<reuseDelay>7000</reuseDelay>
 		<rideState>NONE</rideState>
+		<mpConsume>55</mpConsume>
 		<effectPoint>-348</effectPoint>
 		<magicCriticalRate>5</magicCriticalRate>
 		<icon>icon.skill_transform_s_attack</icon>
@@ -93,10 +95,10 @@
 	<skill id="20004" toLevel="1" name="Dragon Dash">
 		<!-- Increases Speed by 100% for 5 seconds with a dragon's strength. -->
 		<abnormalTime>5</abnormalTime>
-		<mpConsume>1</mpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>25000</reuseDelay> <!-- FIXME: value unconfirmed -->
+		<reuseDelay>25000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<mpConsume>38</mpConsume>
 		<effectPoint>689</effectPoint>
 		<abnormalType>SPEED_UP_SPECIAL</abnormalType>
 		<basicProperty>NONE</basicProperty>
@@ -118,10 +120,10 @@
 		<!-- Increases Critical Rate by 30% for 20 minutes with a dragon's strength. -->
 		<abnormalTime>1200</abnormalTime>
 		<hitTime>4000</hitTime>
-		<mpConsume>1</mpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>1800000</reuseDelay> <!-- FIXME: value unconfirmed -->
+		<reuseDelay>1800000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<mpConsume>47</mpConsume>
 		<effectPoint>635</effectPoint>
 		<abnormalType>IMPROVE_CRT_RATE_DMG_UP</abnormalType>
 		<basicProperty>NONE</basicProperty>
@@ -148,10 +150,10 @@
 		<hitTime>1500</hitTime>
 		<icon>BranchSys2.icon.skill20006</icon>
 		<magicLvl>62</magicLvl>
-		<mpConsume>58</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>240000</reuseDelay>
 		<rideState>NONE</rideState>
+		<mpConsume>58</mpConsume>
 		<abnormalType>MAX_HP_UP_K</abnormalType>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -179,10 +181,10 @@
 		<!-- For 2 min., HP/MP Recovery Bonus increase, and Speed + 5. You cannot receive the Celestial Aegis, Celestial Protection, or the Celestial Party Protection effect. -->
 		<icon>icon.skill11560</icon>
 		<abnormalLvl>9</abnormalLvl>
-		<abnormalTime>70</abnormalTime> <!-- Tested, PLEASE CONFIRM AGAIN -->
+		<abnormalTime>120</abnormalTime>
 		<abnormalType>INVINCIBILITY_SPECIAL</abnormalType>
 		<operateType>A2</operateType>
-		<targetType>ENEMY</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<isMagic>1</isMagic>
 		<effectPoint>1</effectPoint>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19000-19099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19000-19099.xml
index 2ab156fb6b..655aa7b741 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19000-19099.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19000-19099.xml
@@ -921,18 +921,11 @@
 		</effects>
 	</skill>
 	<skill id="19032" toLevel="1" name="Ability of Light">
-		<!-- TODO: confirm me -->
 		<!-- Imbued with the Ability of Light. Increases Max CP by 3000 and damage inflicted during PvP by 10%. Effects do not apply when in Chaotic state. Can be used by a Marquis or higher. -->
 		<icon>icon.skill19008</icon>
 		<magicLvl>85</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
-		<passiveConditions>
-			<condition name="OpAlignment">
-				<alignment>LAWFUL</alignment>
-				<affectType>CASTER</affectType>
-			</condition>
-		</passiveConditions>
 		<effects>
 			<effect name="MaxCp">
 				<amount>3000</amount>
@@ -953,7 +946,6 @@
 		</effects>
 	</skill>
 	<skill id="19033" toLevel="1" name="Ability of Darkness">
-		<!-- TODO: confirm me -->
 		<!-- Imbued with the Ability of Darkness. Increases Max CP by 3000 and damage inflicted during PvP by 10%. Can be used by a Marquis or higher. -->
 		<icon>icon.skill19008</icon>
 		<magicLvl>85</magicLvl>
@@ -1031,7 +1023,6 @@
 		</effects>
 	</skill>
 	<skill id="19036" toLevel="1" name="Blessing of Light">
-		<!-- TODO: Confir me -->
 		<!-- Acquires 3% additional XP and SP through the blessing of the Guardian of Light. -->
 		<icon>icon.etc_pi_gift_box_i04</icon>
 		<operateType>A2</operateType>
@@ -1252,7 +1243,6 @@
 		</effects>
 	</skill>
 	<skill id="19041" toLevel="1" name="Escape: Castle">
-		<!-- TODO: Confirm me -->
 		<!-- Return to Castle. -->
 		<hitTime>20000</hitTime>
 		<icon>icon.vesper_cloack_i00</icon>
@@ -1274,7 +1264,6 @@
 		</effects>
 	</skill>
 	<skill id="19042" toLevel="1" name="Blessed Scroll of Escape: Castle">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Return to Castle. -->
 		<icon>icon.vesper_cloack_i00</icon>
 		<operateType>A1</operateType>
@@ -1293,6 +1282,11 @@
 				<type>CASTLE</type>
 			</condition>
 		</conditions>
+		<effects>
+			<effect name="Escape">
+				<escapeType>CASTLE</escapeType>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19074" toLevel="2" name="Academy Precept">
 		<!-- AUTO GENERATED SKILL -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml
index e884ad6e48..04686d7738 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml
@@ -316,6 +316,7 @@
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>3600</abnormalTime>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
@@ -344,6 +345,7 @@
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>3600</abnormalTime>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
@@ -386,14 +388,31 @@
 		<reuseDelay>4000</reuseDelay>
 	</skill>
 	<skill id="19119" toLevel="1" name="Noblesse Grace">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Retains target's buffs/debuffs upon death, except for Noblesse Grace and Lucky Charm. Consumes 1000 Spirit Ore. -->
 		<icon>icon.skill1323</icon>
 		<operateType>A2</operateType>
 		<mpConsume>500</mpConsume>
-		<hitTime>4000</hitTime>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>3600</abnormalTime>
+		<abnormalType>PRESERVE_ABNORMAL</abnormalType>
+		<affectRange>2000</affectRange>
+		<canBeDispelled>false</canBeDispelled>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<effectPoint>1</effectPoint>
-		<isMagic>1</isMagic>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<itemConsumeCount>1000</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<magicLvl>1</magicLvl>
+		<icon>icon.skill1323</icon>
+		<reuseDelay>1000</reuseDelay>
+		<isMagic>2</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>RANGE</affectScope>
+		<affectObject>FRIEND</affectObject>
+		<effects>
+			<effect name="NoblesseBless" />
+		</effects>
 	</skill>
 	<skill id="19120" toLevel="4" name="Noble Shield">
 		<!-- P. Def. + 2%. -->
@@ -754,7 +773,32 @@
 		<!-- Received damage - 10%. -->
 		<operateType>P</operateType>
 		<icon>icon.skill19137</icon>
-		<!-- TODO: Handle received damage - 10% -->
+		<effects>
+			<effect name="PveMagicalSkillDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalAttackDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalSkillDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>		
+		</effects>
 	</skill>
 	<skill id="19138" toLevel="1" name="Noble Frenzy">
 		<!-- Physical Skill Power + 10%. -->
@@ -879,7 +923,10 @@
 		<operateType>P</operateType>
 		<icon>icon.skill19146</icon>
 		<effects>
-			<!-- TODO: Find which skill triggers and under what circumstances -->
+			<effect name="DefenceMagicCriticalRate">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19147" toLevel="2" name="Noble Ambush">
@@ -1334,47 +1381,11 @@
 		<operateType>P</operateType>
 		<icon>icon.skill19130</icon>
 		<effects>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
+			<effect name="AttackAttributeAdd">
 				<amount>
 					<value level="1">20</value>
 					<value level="2">50</value>
 				</amount>
-				<attribute>FIRE</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>WATER</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>WIND</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>EARTH</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>HOLY</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>DARK</attribute>
 			</effect>
 			<effect name="DefenceAttribute">
 				<amount>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19200-19299.xml
index efd9982e88..c939fadb89 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19200-19299.xml
@@ -90,8 +90,8 @@
 		<!-- Decreases target's Bow/Crossbow Resistance by 60% for 7 seconds. Does not cancel when striking. Consumes 1 Soulstone. -->
 		<abnormalLvl>8</abnormalLvl>
 		<abnormalTime>7</abnormalTime>
-		<abnormalType>REAL_TARGET</abnormalType> <!-- TODO confirm -->
-		<abnormalVisualEffect>REAL_TARGET_2</abnormalVisualEffect> <!-- TODO confirm -->
+		<abnormalType>REAL_TARGET</abnormalType>
+		<abnormalVisualEffect>REAL_TARGET</abnormalVisualEffect>
 		<icon>icon.skill19203</icon>
 		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>1785</itemConsumeId> <!-- Soulstones -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/20000-20099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/20000-20099.xml
index 554ee3e61f..8e10d1bb6d 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/20000-20099.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/20000-20099.xml
@@ -46,12 +46,13 @@
 	<skill id="20002" toLevel="1" name="Dragon Kick">
 		<!-- A dragon's powerful blow that attacks an enemy with 3420 Power added to P. Atk. Over-hit is possible. -->
 		<castRange>20</castRange>
-		<effectRange>400</effectRange> <!-- FIXME: value unconfirmed -->
+		<effectRange>400</effectRange>
 		<hitTime>2000</hitTime>
-		<magicLvl>85</magicLvl> <!-- FIXME: value unconfirmed -->
-		<operateType>A1</operateType> <!-- FIXME: value unconfirmed -->
-		<reuseDelay>7000</reuseDelay> <!-- FIXME: value unconfirmed -->
+		<magicLvl>85</magicLvl>
+		<operateType>A1</operateType>
+		<reuseDelay>7000</reuseDelay>
 		<rideState>NONE</rideState>
+		<mpConsume>55</mpConsume>
 		<effectPoint>-347</effectPoint>
 		<magicCriticalRate>5</magicCriticalRate>
 		<icon>icon.skill_transform_s_attack</icon>
@@ -70,12 +71,13 @@
 	<skill id="20003" toLevel="1" name="Dragon Slash">
 		<!-- A dragon's powerful slash that attacks an enemy with 3420 Power added to P. Atk. Over-hit is possible. -->
 		<castRange>20</castRange>
-		<effectRange>400</effectRange> <!-- FIXME: value unconfirmed -->
+		<effectRange>400</effectRange>
 		<hitTime>2000</hitTime>
-		<magicLvl>85</magicLvl> <!-- FIXME: value unconfirmed -->
+		<magicLvl>85</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>7000</reuseDelay> <!-- FIXME: value unconfirmed -->
+		<reuseDelay>7000</reuseDelay>
 		<rideState>NONE</rideState>
+		<mpConsume>55</mpConsume>
 		<effectPoint>-348</effectPoint>
 		<magicCriticalRate>5</magicCriticalRate>
 		<icon>icon.skill_transform_s_attack</icon>
@@ -93,10 +95,10 @@
 	<skill id="20004" toLevel="1" name="Dragon Dash">
 		<!-- Increases Speed by 100% for 5 seconds with a dragon's strength. -->
 		<abnormalTime>5</abnormalTime>
-		<mpConsume>1</mpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>25000</reuseDelay> <!-- FIXME: value unconfirmed -->
+		<reuseDelay>25000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<mpConsume>38</mpConsume>
 		<effectPoint>689</effectPoint>
 		<abnormalType>SPEED_UP_SPECIAL</abnormalType>
 		<basicProperty>NONE</basicProperty>
@@ -118,10 +120,10 @@
 		<!-- Increases Critical Rate by 30% for 20 minutes with a dragon's strength. -->
 		<abnormalTime>1200</abnormalTime>
 		<hitTime>4000</hitTime>
-		<mpConsume>1</mpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>1800000</reuseDelay> <!-- FIXME: value unconfirmed -->
+		<reuseDelay>1800000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<mpConsume>47</mpConsume>
 		<effectPoint>635</effectPoint>
 		<abnormalType>IMPROVE_CRT_RATE_DMG_UP</abnormalType>
 		<basicProperty>NONE</basicProperty>
@@ -148,10 +150,10 @@
 		<hitTime>1500</hitTime>
 		<icon>BranchSys2.icon.skill20006</icon>
 		<magicLvl>62</magicLvl>
-		<mpConsume>58</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>240000</reuseDelay>
 		<rideState>NONE</rideState>
+		<mpConsume>58</mpConsume>
 		<abnormalType>MAX_HP_UP_K</abnormalType>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -179,10 +181,10 @@
 		<!-- For 2 min., HP/MP Recovery Bonus increase, and Speed + 5. You cannot receive the Celestial Aegis, Celestial Protection, or the Celestial Party Protection effect. -->
 		<icon>icon.skill11560</icon>
 		<abnormalLvl>9</abnormalLvl>
-		<abnormalTime>70</abnormalTime> <!-- Tested, PLEASE CONFIRM AGAIN -->
+		<abnormalTime>120</abnormalTime>
 		<abnormalType>INVINCIBILITY_SPECIAL</abnormalType>
 		<operateType>A2</operateType>
-		<targetType>ENEMY</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<isMagic>1</isMagic>
 		<effectPoint>1</effectPoint>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/27500-27599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/27500-27599.xml
index 240d3f0939..e9c09b2747 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/27500-27599.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/27500-27599.xml
@@ -2359,7 +2359,7 @@
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>60000</abnormalTime>
+		<abnormalTime>3600</abnormalTime>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19000-19099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19000-19099.xml
index d5d3505779..197d8060f9 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19000-19099.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19000-19099.xml
@@ -921,18 +921,11 @@
 		</effects>
 	</skill>
 	<skill id="19032" toLevel="1" name="Ability of Light">
-		<!-- TODO: confirm me -->
 		<!-- Imbued with the Ability of Light. Increases Max CP by 3000 and damage inflicted during PvP by 10%. Effects do not apply when in Chaotic state. Can be used by a Marquis or higher. -->
 		<icon>icon.skill19008</icon>
 		<magicLvl>85</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
-		<passiveConditions>
-			<condition name="OpAlignment">
-				<alignment>LAWFUL</alignment>
-				<affectType>CASTER</affectType>
-			</condition>
-		</passiveConditions>
 		<effects>
 			<effect name="MaxCp">
 				<amount>3000</amount>
@@ -953,7 +946,6 @@
 		</effects>
 	</skill>
 	<skill id="19033" toLevel="1" name="Ability of Darkness">
-		<!-- TODO: confirm me -->
 		<!-- Imbued with the Ability of Darkness. Increases Max CP by 3000 and damage inflicted during PvP by 10%. Can be used by a Marquis or higher. -->
 		<icon>icon.skill19008</icon>
 		<magicLvl>85</magicLvl>
@@ -1031,7 +1023,6 @@
 		</effects>
 	</skill>
 	<skill id="19036" toLevel="1" name="Blessing of Light">
-		<!-- TODO: Confir me -->
 		<!-- Acquires 3% additional XP and SP through the blessing of the Guardian of Light. -->
 		<icon>icon.etc_pi_gift_box_i04</icon>
 		<operateType>A2</operateType>
@@ -1252,7 +1243,6 @@
 		</effects>
 	</skill>
 	<skill id="19041" toLevel="1" name="King's Call">
-		<!-- TODO: Confirm me -->
 		<!-- Return to Castle. -->
 		<hitTime>20000</hitTime>
 		<icon>icon.vesper_cloack_i00</icon>
@@ -1274,7 +1264,6 @@
 		</effects>
 	</skill>
 	<skill id="19042" toLevel="1" name="King's Summon">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Return to Castle. -->
 		<icon>icon.vesper_cloack_i00</icon>
 		<operateType>A1</operateType>
@@ -1293,6 +1282,11 @@
 				<type>CASTLE</type>
 			</condition>
 		</conditions>
+		<effects>
+			<effect name="Escape">
+				<escapeType>CASTLE</escapeType>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19074" toLevel="2" name="Academy Precept">
 		<!-- AUTO GENERATED SKILL -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml
index 1490b49683..4246eee435 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml
@@ -316,6 +316,7 @@
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>3600</abnormalTime>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
@@ -344,6 +345,7 @@
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>3600</abnormalTime>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
@@ -386,14 +388,31 @@
 		<reuseDelay>4000</reuseDelay>
 	</skill>
 	<skill id="19119" toLevel="1" name="Noblesse Grace">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Retains target's buffs/debuffs upon death, except for Noblesse Grace and Lucky Charm. Consumes 1000 Spirit Ore. -->
 		<icon>icon.skill1323</icon>
 		<operateType>A2</operateType>
 		<mpConsume>500</mpConsume>
-		<hitTime>4000</hitTime>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>3600</abnormalTime>
+		<abnormalType>PRESERVE_ABNORMAL</abnormalType>
+		<affectRange>2000</affectRange>
+		<canBeDispelled>false</canBeDispelled>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<effectPoint>1</effectPoint>
-		<isMagic>1</isMagic>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<itemConsumeCount>1000</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<magicLvl>1</magicLvl>
+		<icon>icon.skill1323</icon>
+		<reuseDelay>1000</reuseDelay>
+		<isMagic>2</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>RANGE</affectScope>
+		<affectObject>FRIEND</affectObject>
+		<effects>
+			<effect name="NoblesseBless" />
+		</effects>
 	</skill>
 	<skill id="19120" toLevel="4" name="Noble Shield">
 		<!-- P. Def. + 2%. -->
@@ -754,7 +773,32 @@
 		<!-- Received damage - 10%. -->
 		<operateType>P</operateType>
 		<icon>icon.skill19137</icon>
-		<!-- TODO: Handle received damage - 10% -->
+		<effects>
+			<effect name="PveMagicalSkillDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalAttackDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalSkillDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>		
+		</effects>
 	</skill>
 	<skill id="19138" toLevel="1" name="Noble Frenzy">
 		<!-- Physical Skill Power + 10%. -->
@@ -879,7 +923,10 @@
 		<operateType>P</operateType>
 		<icon>icon.skill19146</icon>
 		<effects>
-			<!-- TODO: Find which skill triggers and under what circumstances -->
+			<effect name="DefenceMagicCriticalRate">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19147" toLevel="2" name="Noble Ambush">
@@ -1334,47 +1381,11 @@
 		<operateType>P</operateType>
 		<icon>icon.skill19130</icon>
 		<effects>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
+			<effect name="AttackAttributeAdd">
 				<amount>
 					<value level="1">20</value>
 					<value level="2">50</value>
 				</amount>
-				<attribute>FIRE</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>WATER</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>WIND</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>EARTH</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>HOLY</attribute>
-			</effect>
-			<effect name="AttackAttribute"> <!-- Default Fire, TODO: AttackCurrentAttribute Handler -->
-				<amount>
-					<value level="1">20</value>
-					<value level="2">50</value>
-				</amount>
-				<attribute>DARK</attribute>
 			</effect>
 			<effect name="DefenceAttribute">
 				<amount>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19200-19299.xml
index a81e49790c..34f62ac261 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19200-19299.xml
@@ -90,8 +90,8 @@
 		<!-- Decreases target's Bow/Crossbow Resistance by 60% for 7 seconds. Does not cancel when striking. Consumes 1 Soulstone. -->
 		<abnormalLvl>8</abnormalLvl>
 		<abnormalTime>7</abnormalTime>
-		<abnormalType>REAL_TARGET</abnormalType> <!-- TODO confirm -->
-		<abnormalVisualEffect>REAL_TARGET_2</abnormalVisualEffect> <!-- TODO confirm -->
+		<abnormalType>REAL_TARGET</abnormalType>
+		<abnormalVisualEffect>REAL_TARGET</abnormalVisualEffect>
 		<icon>icon.skill19203</icon>
 		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>1785</itemConsumeId> <!-- Soulstones -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/20000-20099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/20000-20099.xml
index 554ee3e61f..8e10d1bb6d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/20000-20099.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/20000-20099.xml
@@ -46,12 +46,13 @@
 	<skill id="20002" toLevel="1" name="Dragon Kick">
 		<!-- A dragon's powerful blow that attacks an enemy with 3420 Power added to P. Atk. Over-hit is possible. -->
 		<castRange>20</castRange>
-		<effectRange>400</effectRange> <!-- FIXME: value unconfirmed -->
+		<effectRange>400</effectRange>
 		<hitTime>2000</hitTime>
-		<magicLvl>85</magicLvl> <!-- FIXME: value unconfirmed -->
-		<operateType>A1</operateType> <!-- FIXME: value unconfirmed -->
-		<reuseDelay>7000</reuseDelay> <!-- FIXME: value unconfirmed -->
+		<magicLvl>85</magicLvl>
+		<operateType>A1</operateType>
+		<reuseDelay>7000</reuseDelay>
 		<rideState>NONE</rideState>
+		<mpConsume>55</mpConsume>
 		<effectPoint>-347</effectPoint>
 		<magicCriticalRate>5</magicCriticalRate>
 		<icon>icon.skill_transform_s_attack</icon>
@@ -70,12 +71,13 @@
 	<skill id="20003" toLevel="1" name="Dragon Slash">
 		<!-- A dragon's powerful slash that attacks an enemy with 3420 Power added to P. Atk. Over-hit is possible. -->
 		<castRange>20</castRange>
-		<effectRange>400</effectRange> <!-- FIXME: value unconfirmed -->
+		<effectRange>400</effectRange>
 		<hitTime>2000</hitTime>
-		<magicLvl>85</magicLvl> <!-- FIXME: value unconfirmed -->
+		<magicLvl>85</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>7000</reuseDelay> <!-- FIXME: value unconfirmed -->
+		<reuseDelay>7000</reuseDelay>
 		<rideState>NONE</rideState>
+		<mpConsume>55</mpConsume>
 		<effectPoint>-348</effectPoint>
 		<magicCriticalRate>5</magicCriticalRate>
 		<icon>icon.skill_transform_s_attack</icon>
@@ -93,10 +95,10 @@
 	<skill id="20004" toLevel="1" name="Dragon Dash">
 		<!-- Increases Speed by 100% for 5 seconds with a dragon's strength. -->
 		<abnormalTime>5</abnormalTime>
-		<mpConsume>1</mpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>25000</reuseDelay> <!-- FIXME: value unconfirmed -->
+		<reuseDelay>25000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<mpConsume>38</mpConsume>
 		<effectPoint>689</effectPoint>
 		<abnormalType>SPEED_UP_SPECIAL</abnormalType>
 		<basicProperty>NONE</basicProperty>
@@ -118,10 +120,10 @@
 		<!-- Increases Critical Rate by 30% for 20 minutes with a dragon's strength. -->
 		<abnormalTime>1200</abnormalTime>
 		<hitTime>4000</hitTime>
-		<mpConsume>1</mpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>1800000</reuseDelay> <!-- FIXME: value unconfirmed -->
+		<reuseDelay>1800000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<mpConsume>47</mpConsume>
 		<effectPoint>635</effectPoint>
 		<abnormalType>IMPROVE_CRT_RATE_DMG_UP</abnormalType>
 		<basicProperty>NONE</basicProperty>
@@ -148,10 +150,10 @@
 		<hitTime>1500</hitTime>
 		<icon>BranchSys2.icon.skill20006</icon>
 		<magicLvl>62</magicLvl>
-		<mpConsume>58</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>240000</reuseDelay>
 		<rideState>NONE</rideState>
+		<mpConsume>58</mpConsume>
 		<abnormalType>MAX_HP_UP_K</abnormalType>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -179,10 +181,10 @@
 		<!-- For 2 min., HP/MP Recovery Bonus increase, and Speed + 5. You cannot receive the Celestial Aegis, Celestial Protection, or the Celestial Party Protection effect. -->
 		<icon>icon.skill11560</icon>
 		<abnormalLvl>9</abnormalLvl>
-		<abnormalTime>70</abnormalTime> <!-- Tested, PLEASE CONFIRM AGAIN -->
+		<abnormalTime>120</abnormalTime>
 		<abnormalType>INVINCIBILITY_SPECIAL</abnormalType>
 		<operateType>A2</operateType>
-		<targetType>ENEMY</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<isMagic>1</isMagic>
 		<effectPoint>1</effectPoint>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/27500-27599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/27500-27599.xml
index d708e2ba54..8faa4add6d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/27500-27599.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/27500-27599.xml
@@ -2364,7 +2364,7 @@
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>60000</abnormalTime>
+		<abnormalTime>3600</abnormalTime>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>