diff --git a/L2J_Mobius_Classic/dist/game/data/spawns/Test/TestSpawnlist.xml b/L2J_Mobius_Classic/dist/game/data/spawns/Test/TestSpawnlist.xml
index da771c0157..945e388d1a 100644
--- a/L2J_Mobius_Classic/dist/game/data/spawns/Test/TestSpawnlist.xml
+++ b/L2J_Mobius_Classic/dist/game/data/spawns/Test/TestSpawnlist.xml
@@ -2048,28 +2048,6 @@
 			<npc id="21145" x="-52822" y="-244365" z="-7904" heading="0" respawnTime="140sec" />
 			<npc id="21145" x="-52884" y="-244275" z="-7904" heading="0" respawnTime="140sec" />
 			<npc id="21145" x="-52944" y="-242860" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-42362" y="-244608" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-42472" y="-242453" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-42536" y="-241649" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-42536" y="-244864" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-42738" y="-239975" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-42760" y="-242118" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-43599" y="-239883" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-43773" y="-240038" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-44409" y="-242336" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-44475" y="-242609" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-44499" y="-244684" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-44673" y="-242063" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-44856" y="-239783" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-44922" y="-240062" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-44961" y="-244684" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-45159" y="-244876" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-45780" y="-240093" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-46959" y="-241951" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-47114" y="-242809" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-47122" y="-244829" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-47267" y="-239916" z="-7904" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="-47267" y="-240040" z="-7904" heading="0" respawnTime="140sec" />
 			<npc id="21236" x="-48139" y="-245674" z="-7904" heading="0" respawnTime="142sec" />
 			<npc id="21236" x="-48320" y="-250249" z="-7904" heading="0" respawnTime="142sec" />
 			<npc id="21236" x="-48351" y="-250452" z="-7904" heading="0" respawnTime="142sec" />
@@ -17197,27 +17175,6 @@
 			<npc id="21145" x="55525" y="113047" z="-5408" heading="0" respawnTime="140sec" />
 			<npc id="21145" x="55649" y="113137" z="-5408" heading="0" respawnTime="140sec" />
 			<npc id="21145" x="55652" y="115107" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="50716" y="115606" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="50780" y="114436" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="50852" y="117865" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="51063" y="113107" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="51090" y="116889" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="51100" y="114566" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="51140" y="118010" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="52758" y="117968" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="52980" y="113241" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="53026" y="117776" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="53244" y="113139" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="53310" y="113139" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="53428" y="117712" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="53475" y="115694" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="54465" y="115598" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="55536" y="117683" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="55652" y="115701" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="55691" y="117915" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="55773" y="113467" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="55784" y="114909" z="-5408" heading="0" respawnTime="140sec" />
-			<npc id="21146" x="55850" y="114975" z="-5408" heading="0" respawnTime="140sec" />
 			<npc id="21213" x="45175" y="120444" z="-5408" heading="0" respawnTime="140sec" />
 			<npc id="21213" x="45271" y="120913" z="-5408" heading="0" respawnTime="140sec" />
 			<npc id="21213" x="45315" y="119035" z="-5408" heading="0" respawnTime="140sec" />
@@ -28256,7 +28213,6 @@
 			<npc id="20542" x="21683" y="-107781" z="-3040" heading="0" respawnTime="68sec" />
 			<npc id="20542" x="21936" y="-107589" z="-3040" heading="0" respawnTime="68sec" />
 			<npc id="20542" x="21500" y="-107465" z="-3016" heading="0" respawnTime="68sec" />
-			<npc id="20542" x="21146" y="-107563" z="-3040" heading="0" respawnTime="68sec" />
 			<npc id="20542" x="21074" y="-107700" z="-3040" heading="0" respawnTime="68sec" />
 			<npc id="20542" x="20795" y="-108060" z="-3000" heading="0" respawnTime="68sec" />
 			<npc id="20542" x="21311" y="-108343" z="-3000" heading="0" respawnTime="68sec" />
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/skills/05400-05499.xml b/L2J_Mobius_Classic/dist/game/data/stats/skills/05400-05499.xml
index e72151cb98..abe31b4fe2 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/skills/05400-05499.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/skills/05400-05499.xml
@@ -1574,7 +1574,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>-5</magicCriticalRate>
 	</skill>
-	<skill id="5467" toLevel="1" name="Darkness Protection">
+	<skill id="5467" toLevel="5" name="Darkness Protection">
 		<icon>icon.skill4336_new</icon>
 		<magicLvl>1</magicLvl>
 		<operateType>P</operateType>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_Classic/dist/game/data/stats/skills/35000-35099.xml
index 6f30a52e27..9f298522be 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/skills/35000-35099.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/skills/35000-35099.xml
@@ -36,15 +36,30 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="35007" toLevel="10" name="Fire Dragon Pendant Enchant Effect">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>1200</abnormalTime>
-		<icon>icon.skill0000</icon>
-		<operateType>A2</operateType>
+		<!-- TODO: FIX IT -->
+		<abnormalLvl>3</abnormalLvl>
+		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<magicLvl>1</magicLvl>
+		<operateType>A1</operateType>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
-		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PAtk">
+				<amount>4</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CriticalDamage">
+				<amount>26</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CriticalRate">
+				<amount>1</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="35008" toLevel="1" name="Fire Dragon Resistance">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/skills/55100-55199.xml b/L2J_Mobius_Classic/dist/game/data/stats/skills/55100-55199.xml
index 84114a98dd..7a6a2c719f 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/skills/55100-55199.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/skills/55100-55199.xml
@@ -26,9 +26,9 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
-	<skill id="55104" toLevel="1" name="Water Dragon Pendant Basic Effect Lv. 3">
+	<skill id="55104" toLevel="3" name="Water Dragon Pendant Basic Effect Lv. 3">
 		<icon>icon.skill55104</icon>
-		<abnormalLvl>1</abnormalLvl>
+		<abnormalLvl>3</abnormalLvl>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>