diff --git a/trunk/dist/game/data/stats/skills/10100-10199.xml b/trunk/dist/game/data/stats/skills/10100-10199.xml
index a0aee175df..8e3a56919c 100644
--- a/trunk/dist/game/data/stats/skills/10100-10199.xml
+++ b/trunk/dist/game/data/stats/skills/10100-10199.xml
@@ -179,10 +179,35 @@
 	</skill>
 	<!-- Increases M. Def. by $s1, $s2 Attribute Resistance by $s3, and Debuff Resistance by $s4. Increases party members' M. Def. by $s5, $s6 Attribute Resistance by $s7, and Debuff Resistance by $s8. Only one Knight's Aura can be active at any time. --> 
 	<skill id="10106" levels="1" name="Sentinel's Aura">
-		<!-- AUTO GENERATED INFINITE ODYSSEY SKILL TODO: FIX IT -->
-		<set name="icon" val="icon.skill0000" />
-		<set name="operateType" val="ACTIVE_INSTANT" />
+		<set name="icon" val="icon.skill10106" />
+		<set name="magicLvl" val="85" />
+		<set name="abnormalLvl" val="2" />
+		<set name="abnormalType" val="SIGEL_AURA" />
+		<set name="operateType" val="TOGGLE" />
+		<set name="abnormalVisualEffect" val="AURA_BUFF_SELF" />
+		<set name="reuseDelay" val="1000" />
 		<set name="targetType" val="SELF" />
+		<for>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.25" />
+				<add stat="waterRes" val="50" />
+				<add stat="fireRes" val="50" />
+				<add stat="windRes" val="50" />
+				<add stat="earthRes" val="50" />
+				<add stat="darkRes" val="50" />	
+				<add stat="holyRes" val="50" />				
+			</effect>
+			<effect name="DefenceTrait">
+				<param SHOCK="25" />
+				<param HOLD="25" />
+				<param SLEEP="25" />
+				<param PARALYZE="25" />
+			</effect>
+			<effect name="TriggerForce" ticks="2">
+				<param skillId="10110" skillLevel="1" />
+				<param targetType="PARTY" />
+			</effect>
+		</for>
 	</skill>
 	<!-- Increases P. Atk. by $s1, Atk. Spd. by $s2, and Speed by $s3. Increases party members' P. Atk. By $s4, Atk. Spd. by $s5, M. Atk. by $s6, Casting Spd. by $s7 and Speed by $s8. Only one Knight's Aura can be active at any time. --> 
 	<skill id="10107" levels="1" name="Templar's Aura">
@@ -207,10 +232,33 @@
 	</skill>
 	<!-- M. Def. + $s1, $s2 Attribute Resistance + $s3, Debuff Resistance + $s4. --> 
 	<skill id="10110" levels="1" name="Sentinel's Aura">
-		<!-- AUTO GENERATED INFINITE ODYSSEY SKILL TODO: FIX IT -->
-		<set name="icon" val="icon.skill0000" />
-		<set name="operateType" val="ACTIVE_INSTANT" />
+		<set name="icon" val="icon.skill10110" />
+		<set name="hitTime" val="500" />
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalType" val="SIGEL_AURA" />
+		<set name="abnormalVisualEffect" val="AURA_BUFF" />
+		<set name="operateType" val="TOGGLE" />
 		<set name="targetType" val="SELF" />
+		<set name="magicLvl" val="85" />
+		<set name="isMagic" val="3" />
+		<set name="isTriggeredSkill" val="true" />
+		<for>
+			<effect name="Buff">
+				<mul stat="mDef" val="1.2" />
+				<add stat="waterRes" val="40" />
+				<add stat="fireRes" val="40" />
+				<add stat="windRes" val="40" />
+				<add stat="earthRes" val="40" />
+				<add stat="darkRes" val="40" />	
+				<add stat="holyRes" val="40" />				
+			</effect>
+			<effect name="DefenceTrait">
+				<param SHOCK="20" />
+				<param HOLD="20" />
+				<param SLEEP="20" />
+				<param PARALYZE="20" />
+			</effect>
+		</for>
 	</skill>
 	<!-- P. Atk. + $s1, Atk. Spd. + $s2, M. Atk. + $s3, Casting Spd. + $s4, Speed + $s5. --> 
 	<skill id="10111" levels="1" name="Templar's Aura">
diff --git a/trunk/dist/game/data/stats/skills/10300-10399.xml b/trunk/dist/game/data/stats/skills/10300-10399.xml
index a1e7257fe8..cfc75558c9 100644
--- a/trunk/dist/game/data/stats/skills/10300-10399.xml
+++ b/trunk/dist/game/data/stats/skills/10300-10399.xml
@@ -717,10 +717,50 @@
 	</skill>
 	<!-- Increases P. Atk. By $s2 for $s1 when a spear is equipped. Range of normal attacks increases by $s3 and has a $s4 chance to Stun when striking. Consumes $s5 Soulstones. --> 
 	<skill id="10333" levels="1" name="Winged Spear">
-		<!-- AUTO GENERATED INFINITE ODYSSEY SKILL TODO: FIX IT -->
-		<set name="icon" val="icon.skill0000" />
-		<set name="operateType" val="ACTIVE_INSTANT" />
+		<table name="#ench1abnormalTime"> 61 62 63 64 65 66 67 68 69 70 </table>
+		<table name="#ench2defCritDamage"> 0.99 0.985 0.98 0.975 0.97 0.965 0.96 0.955 0.95 0.945 0.94 0.935 0.93 0.925 0.92 0.915 0.91 0.905 0.90 0.895</table>
+		<table name="#ench3mDef"> 1.01 1.02 1.03 1.03 1.04 1.05 1.06 1.07 1.08 1.09 1.1 </table>
+		<set name="icon" val="icon.skill10333" />
+		<set name="abnormalTime" val="60" />
+		<set name="hitTime" val="2000" />
+		<set name="magicLvl" val="74" />
+		<set name="mpConsume" val="64" />
+		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="itemConsumeCount" val="5" />
+		<set name="itemConsumeId" val="3031" /> <!-- Spirit Ore -->	
+		<set name="reuseDelay" val="300000" />
+		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<for>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.3">
+					<using kind="POLE" />
+				</mul>
+				<add stat="pAtkRange" val="80" />
+			</effect>
+		</for>
+		<cond msgId="113" addName="1">
+			<using kind="POLE" />
+		</cond>
+		<enchant1 name="abnormalTime" val="#ench1abnormalTime" />
+		<enchant2for>
+			<effect name="Buff">
+				<mul stat="defCritDamage" val="#ench2defCritDamage" />
+			</effect>
+		</enchant2for>
+		<for>
+			<effect name="Buff">
+				<mul stat="mDef" val="#ench3mDef" />
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="107" />
+				<param isCritical="false" />
+				<param minDamage="50" chance="1" />
+				<param skillId="10339" skillLevel="1" /> <!-- Punch Drunk -->
+				<param targetType="ONE" />
+				<param allowWeapons="POLE" />
+			</effect>
+		</for>
 	</skill>
 	<!-- Increases P. Atk. by $s2 for $s1 when a two-handed sword/two-handed blunt weapon is equipped. Attack $s3 enemies at the same time with a regular attack. Consumes $s4 Soulstones. --> 
 	<skill id="10334" levels="1" name="Furious Slasher">
@@ -730,11 +770,53 @@
 		<set name="targetType" val="SELF" />
 	</skill>
 	<!-- Increases P. Atk. by $s2 and P. Critical Damage by $s3 for $s1 when a fist weapon is equipped. Has $s4 chance to decrease Fist Weapon Resistance by $s5 when striking. Consumes $s6 Soulstones. --> 
-	<skill id="10335" levels="1" name="Furious Fist">
-		<!-- AUTO GENERATED INFINITE ODYSSEY SKILL TODO: FIX IT -->
-		<set name="icon" val="icon.skill0000" />
-		<set name="operateType" val="ACTIVE_INSTANT" />
+	<skill id="10335" levels="1" name="Furious Fist" enchantGroup1="10" enchantGroup2="10" enchantGroup3="10">
+		<table name="#ench1abnormalTime"> 61 62 63 64 65 66 67 68 69 70 </table>
+		<table name="#ench2defCritDamage"> 0.99 0.985 0.98 0.975 0.97 0.965 0.96 0.955 0.95 0.945 0.94 0.935 0.93 0.925 0.92 0.915 0.91 0.905 0.90 0.895</table>
+		<table name="#ench3mDef"> 1.01 1.02 1.03 1.03 1.04 1.05 1.06 1.07 1.08 1.09 1.1 </table>
+		<set name="icon" val="icon.skill10335" />
+		<set name="abnormalTime" val="60" />
+		<set name="hitTime" val="2000" />
+		<set name="magicLvl" val="74" />
+		<set name="mpConsume" val="64" />
+		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="itemConsumeCount" val="5" />
+		<set name="itemConsumeId" val="3031" /> <!-- Spirit Ore -->	
+		<set name="reuseDelay" val="300000" />
+		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<for>
+			<effect name="Buff">
+				<mul stat="pAtk" val="1.3">
+					<using kind="DUALFIST" />
+				</mul>
+				<mul stat="critDmgAdd" val="1.1">
+					<using kind="DUALFIST" />
+				</mul>
+			</effect>
+		</for>
+		<cond msgId="113" addName="1">
+			<using kind="DUALFIST" />
+		</cond>
+		<enchant1 name="abnormalTime" val="#ench1abnormalTime" />
+		<enchant2for>
+			<effect name="Buff">
+				<mul stat="defCritDamage" val="#ench2defCritDamage" />
+			</effect>
+		</enchant2for>
+		<for>
+			<effect name="Buff">
+				<mul stat="mDef" val="#ench3mDef" />
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="107" />
+				<param isCritical="false" />
+				<param minDamage="50" chance="10" />
+				<param skillId="10338" skillLevel="1" /> <!-- Punch Drunk -->
+				<param targetType="ONE" />
+				<param allowWeapons="DUALFIST" />
+			</effect>
+		</for>
 	</skill>
 	<!-- Increases power when using the Rush Impact. --> 
 	<skill id="10336" levels="1" name="Infinity Rush">
@@ -752,17 +834,39 @@
 	</skill>
 	<!-- Decreases target's resistance to Fist Weapons by 30%%. --> 
 	<skill id="10338" levels="1" name="Punch Drunk">
-		<!-- AUTO GENERATED INFINITE ODYSSEY SKILL TODO: FIX IT -->
-		<set name="icon" val="icon.skill0000" />
-		<set name="operateType" val="ACTIVE_INSTANT" />
-		<set name="targetType" val="SELF" />
+		<set name="icon" val="icon.skill10338" />
+		<set name="abnormalTime" val="10" />
+		<set name="castRange" val="600" />
+		<set name="hitTime" val="100" />
+		<set name="isDebuff" val="true" />
+		<set name="isTriggeredSkill" val="true" />
+		<set name="magicLvl" val="80" />
+		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="reuseDelay" val="10000" />
+		<set name="rideState" val="NONE" />
+		<set name="staticReuse" val="true" />
+		<set name="targetType" val="ONE" />
+		<for>
+			<effect name="DefenceTrait">
+				<param DUALFIST="30" />
+			</effect>
+		</for>
 	</skill>
 	<!-- Stuns target for 3 seconds. --> 
 	<skill id="10339" levels="1" name="Winged Spear - Stun">
-		<!-- AUTO GENERATED INFINITE ODYSSEY SKILL TODO: FIX IT -->
-		<set name="icon" val="icon.skill0000" />
-		<set name="operateType" val="ACTIVE_INSTANT" />
-		<set name="targetType" val="SELF" />
+		<set name="icon" val="icon.skill10339" />
+		<set name="abnormalTime" val="3" />
+		<set name="abnormalType" val="STUN" />
+		<set name="abnormalVisualEffect" val="STUN" />
+		<set name="activateRate" val="50" />
+		<set name="isDebuff" val="true" />
+		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="ONE" />
+		<set name="trait" val="SHOCK" />
+		<for>
+			<effect name="Stun" />
+		</for>
 	</skill>
 	<!-- Attacks enemies in front with $s1 Power added to P. Atk. If the target is stunned, attacks with $s2 power. Can be used while a sword or blunt weapon is equipped. Consumes $s3 Soulstone. --> 
 	<skill id="10340" levels="3" name="Blade Slasher">
diff --git a/trunk/dist/game/data/stats/skills/10700-10799.xml b/trunk/dist/game/data/stats/skills/10700-10799.xml
index 037faeb129..10e817846e 100644
--- a/trunk/dist/game/data/stats/skills/10700-10799.xml
+++ b/trunk/dist/game/data/stats/skills/10700-10799.xml
@@ -64,10 +64,28 @@
 	</skill>
 	<!-- Front Critical Rate - 10%%, Side Critical Rate + 10%%, Critical Damage + 10%%, Rear Critical Rate + 20%%, Critical Damage + 20%%. --> 
 	<skill id="10705" levels="1" name="Shadow Walking">
-		<!-- AUTO GENERATED INFINITE ODYSSEY SKILL TODO: FIX IT -->
-		<set name="icon" val="icon.skill0000" />
-		<set name="operateType" val="ACTIVE_INSTANT" />
+		<set name="icon" val="icon.skill10705" />
+		<set name="magicLvl" val="40" />
+		<set name="mpConsume" val="64" />
+		<set name="operateType" val="TOGGLE" />
+		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<for>
+			<effect name="Buff">
+				<mul stat="critDmgPos" val="0.9">
+					<player front="true" />
+				</mul>
+				<mul stat="critDmgPos" val="1.1">
+					<and>
+						<player front="false" />
+						<player behind="false" />
+					</and>
+				</mul>
+				<mul stat="critDmgPos" val="1.2">
+					<player behind="true" />
+				</mul>
+			</effect>
+		</for>
 	</skill>
 	<skill id="10747" levels="1" name="Rogue - Individual Passive">
 		<!-- AUTO GENERATED SKILL -->
diff --git a/trunk/dist/game/data/stats/skills/11500-11599.xml b/trunk/dist/game/data/stats/skills/11500-11599.xml
index 5bd5771378..7275d63e16 100644
--- a/trunk/dist/game/data/stats/skills/11500-11599.xml
+++ b/trunk/dist/game/data/stats/skills/11500-11599.xml
@@ -1361,10 +1361,16 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="power" val="50" />
 		<set name="targetType" val="ONE" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<enchant1 name="mpInitialConsume" val="#ench1MpInitialConsume" />
 		<enchant2 name="power" val="#ench2power" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<for>
+			<effect name="DispelByCategory">
+				<param slot="buff" rate="25" max="2" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="11537" levels="10" name="Transform" enchantGroup1="10" enchantGroup2="10">
 	<!-- Source: https://l2wiki.com/Transform_-_Iss_Hierophant -->
diff --git a/trunk/dist/game/data/stats/skills/19200-19299.xml b/trunk/dist/game/data/stats/skills/19200-19299.xml
index 67b2b679ae..620335d3ea 100644
--- a/trunk/dist/game/data/stats/skills/19200-19299.xml
+++ b/trunk/dist/game/data/stats/skills/19200-19299.xml
@@ -198,11 +198,27 @@
 		<set name="targetType" val="SELF" />
 	</skill>
 	<!-- Increases Dagger/Dual Dagger Resistance of all party members by $s2 for $s1. Consumes $s3 Spirit Ores. --> 
-	<skill id="19228" levels="1" name="Song of Thief">
-		<!-- AUTO GENERATED INFINITE ODYSSEY SKILL TODO: FIX IT -->
-		<set name="icon" val="icon.skill0000" />
-		<set name="operateType" val="ACTIVE_INSTANT" />
-		<set name="targetType" val="SELF" />
+	<skill id="19228" levels="1" name="Song of Thief" enchantGroup1="20">
+		<table name="#ench1abnormalTime"> 31 32 33 34 35 36 37 38 39 40 40.5 41 41.5 42 42.5 43 43.5 44 44.5 45</table>
+		<set name="icon" val="icon.skill19228" />
+		<set name="magicLvl" val="89" />
+		<set name="targetType" val="PARTY" />
+		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="itemConsumeCount" val="5" />
+		<set name="itemConsumeId" val="3031" /> <!-- Spirit Ore -->		
+		<set name="hitTime" val="8000" />
+		<set name="coolTime" val="500" />
+		<set name="abnormalTime" val="30" />
+		<set name="reuseDelay" val="600000" />
+		<set name="mpConsume" val="113" />
+		<set name="mpInitialConsume" val="27" />
+		<enchant1 name="abnormalTime" val="#ench1abnormalTime" />	
+		<for>
+			<effect name="DefenceTrait">
+				<param DAGGER="50" />
+				<param DUALDAGGER="50" />
+			</effect>
+		</for>		
 	</skill>
 	<!-- LUC + 3. --> 
 	<skill id="19229" levels="1" name="Fate of the Exalted">