diff --git a/trunk/dist/game/data/stats/npcs/13000-13099.xml b/trunk/dist/game/data/stats/npcs/13000-13099.xml
index 40b6e42fcd..86884dd5b8 100644
--- a/trunk/dist/game/data/stats/npcs/13000-13099.xml
+++ b/trunk/dist/game/data/stats/npcs/13000-13099.xml
@@ -1156,7 +1156,7 @@
 	<npc id="13037" level="28" type="L2Npc" name="Trap">
 		<parameters>
 			<param name="trap_skill_type" value="1" />
-			<skill name="trap_skill" id="5267" level="1" /> <!-- Trap Explosion -->
+			<skill name="trap_skill" id="10806" level="1" /> <!-- Frost -->
 		</parameters>
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -1182,7 +1182,7 @@
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
 			<skill id="4416" level="19" /> <!-- Others -->
-			<skill id="5267" level="1" /> <!-- Trap Explosion -->
+			<skill id="10806" level="1" /> <!-- Trap Slow -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" />
@@ -1308,7 +1308,7 @@
 	<npc id="13041" level="55" type="L2Npc" name="Trap">
 		<parameters>
 			<param name="trap_skill_type" value="1" />
-			<skill name="trap_skill" id="5267" level="5" /> <!-- Trap Explosion -->
+			<skill name="trap_skill" id="10807" level="1" /> <!-- Gravity -->
 		</parameters>
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -1334,7 +1334,7 @@
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
 			<skill id="4416" level="19" /> <!-- Others -->
-			<skill id="5267" level="5" /> <!-- Trap Explosion -->
+			<skill id="10807" level="1" /> <!-- Hold Trap -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" />
diff --git a/trunk/dist/game/data/stats/skills/10700-10799.xml b/trunk/dist/game/data/stats/skills/10700-10799.xml
index 28a563e679..583b85b0f7 100644
--- a/trunk/dist/game/data/stats/skills/10700-10799.xml
+++ b/trunk/dist/game/data/stats/skills/10700-10799.xml
@@ -1426,28 +1426,46 @@
 	<skill id="10791" levels="4" name="Frost Trap">
 	<!-- Source: https://l2wiki.com/Frost_Trap_-_Yul_Sagittarius -->
 		<table name="#magicLvl"> 85 101 103 105 </table>
-		<set name="hitTime" val="800" />
-		<set name="coolTime" val="200" />
-		<set name="reuseDelay" val="45000" />
+		<table name="#npcId">13326 13326 13326 13326</table>
+		<set name="effectPoint" val="-1" />
+		<set name="hitTime" val="1500" />
+		<set name="icon" val="icon.skill0516" />
 		<set name="magicLvl" val="#magicLvl" />
-		<set name="mpConsume" val="39" />
+		<set name="mpConsume" val="40" />
+		<set name="mpInitialConsume" val="10" />
+		<set name="operateType" val="ACTIVE_INSTANT" />
+		<set name="reuseDelay" val="45000" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="SELF" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="npcId" val="13037"/>
+		<for>
+			<effect name="SummonTrap">
+				<param npcId="13037" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="10792" levels="4" name="Gravity Trap">
 	<!-- Source: https://l2wiki.com/Gravity_Trap_-_Yul_Ghost_Sentinel -->
 		<table name="#magicLvl"> 85 101 103 105 </table>
-		<table name="#ench1trigger"> 101 102 103 104 105 106 107 108 109 110 </table>
-		<set name="hitTime" val="800" />
-		<set name="coolTime" val="200" />
-		<set name="reuseDelay" val="45000" />
+		<table name="#npcId"> 13327 13327 13327 13327 </table>
+		<set name="effectPoint" val="-1" />
+		<set name="hitTime" val="1500" />
+		<set name="icon" val="icon.skill0518" />
 		<set name="magicLvl" val="#magicLvl" />
-		<set name="mpConsume" val="39" />
+		<set name="mpConsume" val="40" />
+		<set name="mpInitialConsume" val="10" />
+		<set name="operateType" val="ACTIVE_INSTANT" />
+		<set name="reuseDelay" val="45000" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="staticReuse" val="true" />
+		<set name="npcId" val="13041"/>
 		<set name="targetType" val="SELF" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
-		<enchant1 name="triggerSkillLvl" val="#ench1trigger" />
+		<for>
+			<effect name="SummonTrap">
+				<param npcId="13041" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="10793" levels="1" name="Flash">
 		<set name="hitTime" val="800" />
diff --git a/trunk/dist/game/data/stats/skills/10800-10899.xml b/trunk/dist/game/data/stats/skills/10800-10899.xml
index ee5f0761a3..607acbbb8f 100644
--- a/trunk/dist/game/data/stats/skills/10800-10899.xml
+++ b/trunk/dist/game/data/stats/skills/10800-10899.xml
@@ -169,34 +169,55 @@
 		</for>
 	</skill>
 	<skill id="10806" levels="1" name="Frost Trap">
-		<table name="#ench1power">81 82 83 84 85 86 87 88 89 90</table>
-		<set name="magicLvl" val="99" />
-		<set name="power" val="80" />
-		<set name="targetType" val="AURA" />
-		<set name="abnormalTime" val="30" />
+		<set name="abnormalLvl" val="3" />
+		<set name="abnormalTime" val="15" />
+		<set name="abnormalType" val="ALL_SPEED_DOWN" />
+		<set name="activateRate" val="80" />
+		<set name="affectRange" val="200" />
+		<set name="basicProperty" val="MEN" />
+		<set name="effectPoint" val="-100" />
 		<set name="isDebuff" val="true" />
+		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="lvlBonusRate" val="1" />
+		<set name="magicLvl" val="99" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
-		<enchant1 name="power" val="#ench1power" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="AURA" />
 		<for>
 			<effect name="Debuff">
-				<mul stat="runSpd" val="0.6" />
-				<mul stat="pAtkSpd" val="0.67" />
-				<mul stat="mAtkSpd" val="0.6" />
+				<mul stat="runSpd" val="0.7" />
+				<mul stat="pAtkSpd" val="0.77" />
+				<mul stat="mAtkSpd" val="0.7" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="10807" levels="1" name="Gravity Trap">
-		<table name="#ench1power">71 72 73 74 75 76 77 78 79 80</table>
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="15" />
+		<set name="abnormalType" val="ROOT_MAGICALLY" />
+		<set name="abnormalVisualEffect" val="ROOT" />
+		<set name="activateRate" val="80" />
+		<set name="affectRange" val="200" />
 		<set name="magicLvl" val="99" />
-		<set name="power" val="70" />
-		<set name="targetType" val="AURA" />
+		<set name="basicProperty" val="MEN" />
+		<set name="castRange" val="600" />
+		<set name="effectPoint" val="-100" />
+		<set name="effectRange" val="1100" />
+		<set name="icon" val="icon.skill0518" />
 		<set name="isDebuff" val="true" />
+		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="lvlBonusRate" val="1" />
+		<set name="magicLvl" val="99" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="targetType" val="ONE" />
 		<set name="trait" val="HOLD" />
-		<enchant1 name="power" val="#ench1power" />
-		<!--<for>
-			<effect abnormalLvl="1" abnormalTime="30" abnormalType="root_magically" name="SELF" val="0" />
-		</for>-->
+		<for>
+			<effect name="Root" />
+			<effect name="DefenceTrait">
+				<param HOLD="100" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="10808" levels="1" name="Decoy Provocation">
 		<set name="icon" val="icon.skill0000" />
diff --git a/trunk/dist/game/data/stats/skills/SkillsToDo.xlsx b/trunk/dist/game/data/stats/skills/SkillsToDo.xlsx
index 12fabdd078..e43da1b305 100644
Binary files a/trunk/dist/game/data/stats/skills/SkillsToDo.xlsx and b/trunk/dist/game/data/stats/skills/SkillsToDo.xlsx differ