diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04700-04799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04700-04799.xml
index 2d6b8bb36a9e15516d2a513c1917e548a5cfb15b..d5d3db90dd3efadcf5f35f5b44bfe0700782df47 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04700-04799.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04700-04799.xml
@@ -117,88 +117,100 @@
 		<set name="aggroPoints" val="#aggroPoints" />
 	</skill>
 	<skill id="4705" levels="13" name="Curse of Shade">
-		<table name="#mpConsume"> 53 62 69 70 72 73 73 73 74 74 75 75 75 </table>
-		<table name="#pDef"> 0.94 0.92 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 </table>
-		<table name="#mDef"> 0.95 0.92 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 </table>
-		<table name="#power"> 40 40 40 41 42 43 44 45 46 47 48 49 50 </table> <!-- Base Land Rate -->
-		<table name="#magicLvl"> 57 66 75 77 78 79 80 81 82 83 84 85 86 </table>
+		<!-- Confirmed CT2.5 -->
+		<!-- Summon Nightshade Skill -->
 		<table name="#abnormalLvl"> 1 2 3 3 3 3 3 3 3 3 3 3 3 </table>
 		<table name="#abnormalLvls"> 1 2 3 3 3 3 3 3 3 3 3 3 3 </table>
+		<table name="#magicLvl"> 57 66 75 77 78 79 80 81 82 83 84 85 86 </table>
+		<table name="#mpConsume"> 42 49 55 56 57 58 58 58 59 59 60 60 60 </table>
+		<table name="#mpInitialConsume"> 11 13 14 14 15 15 15 15 15 15 15 15 15 </table>
+		<table name="#mpDef"> 0.94 0.92 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 </table>
+		<table name="#power"> 40 40 40 41 42 43 44 45 46 47 48 49 50 </table> <!-- Base Land Rate -->
 		<set name="abnormalLvl" val="#abnormalLvls" />
 		<set name="abnormalType" val="debuff_nightshade" />
-		<set name="mpConsume" val="#mpConsume" />
-		<set name="power" val="#power" />
-		<set name="target" val="TARGET_ONE" />
-		<set name="reuseDelay" val="8000" />
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="900" />
 		<set name="element" val="5" /> <!-- Dark -->
-		<set name="saveVs" val="MEN" />
-		<set name="skillType" val="DEBUFF" />
+		<set name="elementPower" val="20" />
 		<set name="hitTime" val="2000" />
 		<set name="isDebuff" val="true" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="lvlDepend" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume" val="#mpConsume" />
+		<set name="mpInitialConsume" val="#mpInitialConsume" />
 		<set name="operateType" val="A2" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="castRange" val="400" />
-		<set name="effectRange" val="900" />
+		<set name="power" val="#power" />
+		<set name="reuseDelay" val="8000" />
+		<set name="saveVs" val="MEN" />
+		<set name="skillType" val="DEBUFF" />
+		<set name="target" val="TARGET_ONE" />
 		<for>
 			<effect name="Debuff" abnormalTime="30" val="0" abnormalLvl="#abnormalLvl" abnormalType="debuff_nightshade">
-				<mul order="0x30" stat="mDef" val="#mDef" />
-				<mul order="0x30" stat="pDef" val="#pDef" />
+				<mul order="0x30" stat="mDef" val="#mpDef" />
+				<mul order="0x30" stat="pDef" val="#mpDef" />
 			</effect>
-			<effect name="TargetMe" val="0" />
+			<effect name="TargetMe" abnormalTime="30" noicon="1" val="0" effectPower="80" />
 		</for>
 	</skill>
 	<skill id="4706" levels="13" name="Mass Curse of Shade">
-		<table name="#mpConsume"> 79 93 104 105 107 108 109 109 110 112 112 113 113 </table>
-		<table name="#pDef"> 0.94 0.92 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 </table>
-		<table name="#mDef"> 0.95 0.92 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 </table>
-		<table name="#power"> 40 40 40 41 42 43 44 45 46 47 48 49 50 </table> <!-- Base Land Rate -->
-		<table name="#magicLvl"> 57 66 75 77 78 79 80 81 82 83 84 85 86 </table>
+		<!-- Confirmed CT2.5 -->
+		<!-- Summon Nightshade Skill -->
 		<table name="#abnormalLvl"> 1 2 3 3 3 3 3 3 3 3 3 3 3 </table>
 		<table name="#abnormalLvls"> 1 2 3 3 3 3 3 3 3 3 3 3 3 </table>
+		<table name="#magicLvl"> 57 66 75 77 78 79 80 81 82 83 84 85 86 </table>
+		<table name="#mpConsume"> 63 74 83 84 85 86 87 87 88 89 89 90 90 </table>
+		<table name="#mpInitialConsume"> 16 19 21 21 22 22 22 22 22 23 23 23 23 </table>
+		<table name="#mpDef"> 0.94 0.92 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 </table>
+		<table name="#power"> 40 40 40 41 42 43 44 45 46 47 48 49 50 </table> <!-- Base Land Rate -->
 		<set name="abnormalLvl" val="#abnormalLvls" />
 		<set name="abnormalType" val="debuff_nightshade" />
-		<set name="mpConsume" val="#mpConsume" />
-		<set name="power" val="#power" />
-		<set name="target" val="TARGET_AURA" />
-		<set name="skillRadius" val="200" />
-		<set name="reuseDelay" val="8000" />
-		<set name="staticReuse" val="true" />
 		<set name="element" val="5" /> <!-- Dark -->
-		<set name="saveVs" val="MEN" />
-		<set name="skillType" val="DEBUFF" />
+		<set name="elementPower" val="20" />
 		<set name="hitTime" val="2000" />
 		<set name="isDebuff" val="true" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="lvlDepend" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
+		<set name="mpConsume" val="#mpConsume" />
+		<set name="mpInitialConsume" val="#mpInitialConsume" />
 		<set name="operateType" val="A2" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="power" val="#power" />
+		<set name="target" val="TARGET_AURA" />
+		<set name="reuseDelay" val="8000" />
+		<set name="saveVs" val="MEN" />
+		<set name="skillRadius" val="200" />
+		<set name="skillType" val="DEBUFF" />
+		<set name="staticReuse" val="true" />
 		<for>
 			<effect name="Debuff" abnormalTime="30" val="0" abnormalLvl="#abnormalLvl" abnormalType="debuff_nightshade">
-				<mul order="0x30" stat="mDef" val="#mDef" />
-				<mul order="0x30" stat="pDef" val="#pDef" />
+				<mul order="0x30" stat="mDef" val="#mpDef" />
+				<mul order="0x30" stat="pDef" val="#mpDef" />
 			</effect>
-			<effect name="TargetMe" val="0" />
+			<effect name="TargetMe" abnormalTime="30" noicon="1" val="0" effectPower="40" />
 		</for>
 	</skill>
 	<skill id="4707" levels="13" name="Shade Sacrifice">
+		<!-- Confirmed CT2.5 -->
+		<!-- Summon Nightshade Skill -->
+		<table name="#aggroPoints"> 589 700 789 804 810 816 826 835 844 852 860 867 874 </table>
+		<table name="#heal"> 541 611 659 666 669 673 676 679 681 684 687 689 692 </table>
+		<table name="#hpConsume"> 706 840 946 964 972 979 991 1002 1013 1023 1032 1041 1049 </table>
 		<table name="#magicLvl"> 57 66 75 77 78 79 80 81 82 83 84 85 86 </table>
-		<table name="#hpConsume"> 706 840 946 964 973 980 988 994 1000 1005 1010 1014 1017 </table>
-		<table name="#amount"> 588 700 789 804 811 817 823 828 833 838 842 845 848 </table>
-		<set name="hpConsume" val="#hpConsume" />
-		<set name="target" val="TARGET_PARTY_MEMBER" />
-		<set name="reuseDelay" val="3000" />
-		<set name="skillType" val="HEAL" />
+		<set name="aggroPoints" val="#aggroPoints" />
+		<set name="castRange" val="600" />
+		<set name="effectRange" val="1100" />
 		<set name="hitTime" val="2000" />
+		<set name="hpConsume" val="#hpConsume" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="castRange" val="600" />
-		<set name="effectRange" val="1100" />
-		<set name="aggroPoints" val="#amount" />
+		<set name="reuseDelay" val="3000" />
+		<set name="skillType" val="HEAL" />
+		<!-- NOTE: skill description mention party members, but is client typo, it could affect any single target -->
+		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Heal" noicon="1" val="#amount" />
+			<effect name="Heal" noicon="1" val="#heal" />
 		</for>
 	</skill>
 	<skill id="4708" levels="10" name="Cursed Strike">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml
index 11b0441f8184488024f4984d06d8026b07d215b6..918dd848f12712534825669c7081c9b4248b3e55 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml
@@ -748,7 +748,8 @@
 	</skill>
 	<skill id="5652" levels="3" name="Nightshade - Death Whisper">
 		<!-- Confirmed CT2.5 -->
-		<table name="#aggro"> 379 457 532 </table>
+		<!-- Summon Nightshade Skill -->
+		<table name="#aggroPoints"> 379 457 532 </table>
 		<table name="#cAtk"> 1.25 1.3 1.35 </table>
 		<table name="#magicLvl"> 40 48 56 </table>
 		<table name="#mpConsume"> 28 35 41 </table>
@@ -757,7 +758,7 @@
 		<table name="#abnormalLvls"> 1 2 3 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
 		<set name="abnormalType" val="critical_dmg_up" />
-		<set name="aggroPoints" val="#aggro" />
+		<set name="aggroPoints" val="#aggroPoints" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="hitTime" val="4000" />
@@ -777,7 +778,8 @@
 	</skill>
 	<skill id="5653" levels="2" name="Nightshade - Focus">
 		<!-- Confirmed CT2.5 -->
-		<table name="#aggro"> 418 495 </table>
+		<!-- Summon Nightshade Skill -->
+		<table name="#aggroPoints"> 418 495 </table>
 		<table name="#magicLvl"> 44 52 </table>
 		<table name="#mpConsume"> 31 38 </table>
 		<table name="#mpInitialConsume"> 8 10 </table>
@@ -786,7 +788,7 @@
 		<table name="#abnormalLvls"> 2 3 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
 		<set name="abnormalType" val="critical_prob_up" />
-		<set name="aggroPoints" val="#aggro" />
+		<set name="aggroPoints" val="#aggroPoints" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="hitTime" val="4000" />
@@ -806,6 +808,7 @@
 	</skill>
 	<skill id="5654" levels="3" name="Nightshade - Guidance">
 		<!-- Confirmed CT2.5 -->
+		<!-- Summon Nightshade Skill -->
 		<table name="#accCombat"> 2 3 4 </table>
 		<table name="#aggro"> 379 457 532 </table>
 		<table name="#magicLvl"> 56 62 64 </table>