diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/RaidbossSpawns.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/RaidbossSpawns.xml
index 241397d755..5a917338c0 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/RaidbossSpawns.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/RaidbossSpawns.xml
@@ -1928,4 +1928,7 @@
 	<spawn>
 		<npc id="25698" x="-213006" y="175614" z="-11953" heading="16141" dbSave="true" dbName="Dopagen" respawnTime="36hour" respawnRandom="24hour" /> <!-- Dopagen -->
 	</spawn>
+	<spawn>
+		<npc id="25931" x="16037" y="-119436" z="-880" heading="38391" dbSave="true" dbName="Theor" respawnTime="36hour" respawnRandom="24hour" /> <!-- Theor -->
+	</spawn>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25900-25999.xml
index a52a36253c..eedcb1a529 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25900-25999.xml
@@ -1393,12 +1393,11 @@
 		</collision>
 	</npc>
 	<npc id="25931" level="99" type="L2RaidBoss" name="Theor" title="Raid Monster">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ORC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="1188371250" sp="1901394" raidPoints="30" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="2148796" hpRegen="10.5" mp="47100" mpRegen="3.6" />
+			<vitals hp="5116286" hpRegen="10.5" mp="47100" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -1425,42 +1424,33 @@
 		</skill_list>
 		<drop_lists>
 			<death>
-				<group chance="17.577">
-					<item id="38056" min="1" max="1" chance="16.931216931217" /> <!-- Eternal Gaiters Crafting Pack Heavy Armor -->
-					<item id="38055" min="1" max="1" chance="16.771917847187" /> <!-- Eternal Breastplate Crafting Pack Heavy Armor -->
-					<item id="38066" min="1" max="1" chance="16.766228594186" /> <!-- Eternal Tunic Crafting Pack Robe -->
-					<item id="38061" min="1" max="1" chance="16.646754281163" /> <!-- Eternal Leather Armor Crafting Pack Light Armor -->
-					<item id="38067" min="1" max="1" chance="16.459008932127" /> <!-- Eternal Stockings Crafting Pack Robe -->
-					<item id="38062" min="1" max="1" chance="16.424873414121" /> <!-- Eternal Leather Leggings Crafting Pack Light Armor -->
-				</group>
-				<group chance="32.241">
-					<item id="38064" min="1" max="1" chance="9.3173288669706" /> <!-- Eternal Leather Boots Crafting Pack Light Armor -->
-					<item id="38059" min="1" max="1" chance="9.2646009739152" /> <!-- Eternal Shield Crafting Pack Heavy Armor -->
-					<item id="38054" min="1" max="1" chance="9.1963648770199" /> <!-- Eternal Helmet Crafting Pack Heavy Armor -->
-					<item id="38060" min="1" max="1" chance="9.1777550324121" /> <!-- Eternal Leather Helmet Crafting Pack Light Armor -->
-					<item id="38069" min="1" max="1" chance="9.0847058093732" /> <!-- Eternal Shoes Crafting Pack Robe -->
-					<item id="38058" min="1" max="1" chance="9.0381811978537" /> <!-- Eternal Boots Crafting Pack Heavy Armor -->
-					<item id="38063" min="1" max="1" chance="9.0350795570857" /> <!-- Eternal Leather Gloves Crafting Pack Light Armor -->
-					<item id="38065" min="1" max="1" chance="9.007164790174" /> <!-- Eternal Circlet Crafting Pack Robe -->
-					<item id="38070" min="1" max="1" chance="9.0009615086381" /> <!-- Eternal Sigil Crafting Pack Robe -->
-					<item id="38068" min="1" max="1" chance="8.9606401786545" /> <!-- Eternal Gloves Crafting Pack Robe -->
-					<item id="38057" min="1" max="1" chance="8.917217207903" /> <!-- Eternal Gauntlets Crafting Pack Heavy Armor -->
-				</group>
-				<group chance="100">
-					<item id="36389" min="1" max="1" chance="32.839563578391" /> <!-- Giant's Scroll: Enchant Armor (R-grade) -->
-					<item id="36386" min="1" max="1" chance="8.5274922364116" /> <!-- Giant's Scroll: Enchant Weapon (R-grade) -->
-					<item id="17695" min="1" max="1" chance="7.1325373233472" /> <!-- Lv. 4 Legendary WIT Dye WIT + 5 / MEN - 1 / Wind Resistance + 20 -->
-					<item id="17696" min="1" max="1" chance="7.1242340202933" /> <!-- Lv. 4 Legendary MEN Dye MEN + 5 / INT - 1 / Holy Resistance + 20 -->
-					<item id="17692" min="1" max="1" chance="7.0744142019695" /> <!-- Lv. 4 Legendary DEX Dye DEX + 5 / CON - 1 / Earth Resistance + 20 -->
-					<item id="17693" min="1" max="1" chance="7.0038361260109" /> <!-- Lv. 4 Legendary CON Dye CON + 5 / STR - 1 / Dark Resistance + 20 -->
-					<item id="17694" min="1" max="1" chance="6.9124997924174" /> <!-- Lv. 4 Legendary INT Dye INT + 5 / WIT - 1 / Water Resistance + 20 -->
-					<item id="17691" min="1" max="1" chance="6.8585283225667" /> <!-- Lv. 4 Legendary STR Dye STR + 5 / DEX - 1 / Fire Resistance + 20 -->
-					<item id="19468" min="1" max="1" chance="4.1786372619028" /> <!-- Teal Soul Crystal Fragment (R99-grade) -->
-					<item id="19467" min="1" max="1" chance="4.1778069315974" /> <!-- Yellow Soul Crystal Fragment (R99-grade) -->
-					<item id="19469" min="1" max="1" chance="4.0187986781142" /> <!-- Purple Soul Crystal Fragment (R99-grade) -->
-					<item id="35569" min="1" max="1" chance="2.0957536908182" /> <!-- Bloody Eternal Enhancement Stone -->
-					<item id="35567" min="1" max="1" chance="2.0558978361592" /> <!-- Dark Eternal Enhancement Stone -->
-				</group>
+				<item id="36389" min="1" max="1" chance="78.29" /> <!-- Giant's Scroll: Enchant Armor (R-grade) -->
+				<item id="36386" min="1" max="1" chance="20.93" /> <!-- Giant's Scroll: Enchant Weapon (R-grade) -->
+				<item id="17696" min="1" max="1" chance="17.25" /> <!-- Lv. 4 Legendary MEN Dye -->
+				<item id="17692" min="1" max="1" chance="17.14" /> <!-- Lv. 4 Legendary DEX Dye -->
+				<item id="17691" min="1" max="1" chance="17.06" /> <!-- Lv. 4 Legendary STR Dye -->
+				<item id="17694" min="1" max="1" chance="16.97" /> <!-- Lv. 4 Legendary INT Dye -->
+				<item id="17693" min="1" max="1" chance="16.34" /> <!-- Lv. 4 Legendary CON Dye -->
+				<item id="17695" min="1" max="1" chance="16.22" /> <!-- Lv. 4 Legendary WIT Dye -->
+				<item id="35569" min="1" max="1" chance="5.070" /> <!-- Bloody Eternal Enhancement Stone -->
+				<item id="35567" min="1" max="1" chance="5.019" /> <!-- Dark Eternal Enhancement Stone -->
+				<item id="38057" min="1" max="1" chance="3.006" /> <!-- Eternal Gauntlets Crafting Pack -->
+				<item id="38055" min="1" max="1" chance="2.993" /> <!-- Eternal Breastplate Crafting Pack -->
+				<item id="38067" min="1" max="1" chance="2.984" /> <!-- Eternal Stockings Crafting Pack -->
+				<item id="38054" min="1" max="1" chance="2.981" /> <!-- Eternal Helmet Crafting Pack -->
+				<item id="38070" min="1" max="1" chance="2.974" /> <!-- Eternal Sigil Crafting Pack -->
+				<item id="38060" min="1" max="1" chance="2.966" /> <!-- Eternal Leather Helmet Crafting Pack -->
+				<item id="38065" min="1" max="1" chance="2.959" /> <!-- Eternal Circlet Crafting Pack -->
+				<item id="38064" min="1" max="1" chance="2.942" /> <!-- Eternal Leather Boots Crafting Pack -->
+				<item id="38062" min="1" max="1" chance="2.935" /> <!-- Eternal Leather Leggings Crafting Pack -->
+				<item id="38058" min="1" max="1" chance="2.932" /> <!-- Eternal Boots Crafting Pack -->
+				<item id="38059" min="1" max="1" chance="2.928" /> <!-- Eternal Shield Crafting Pack -->
+				<item id="38063" min="1" max="1" chance="2.902" /> <!-- Eternal Leather Gloves Crafting Pack -->
+				<item id="38069" min="1" max="1" chance="2.901" /> <!-- Eternal Shoes Crafting Pack -->
+				<item id="38066" min="1" max="1" chance="2.896" /> <!-- Eternal Tunic Crafting Pack -->
+				<item id="38068" min="1" max="1" chance="2.886" /> <!-- Eternal Gloves Crafting Pack -->
+				<item id="38061" min="1" max="1" chance="2.883" /> <!-- Eternal Leather Armor Crafting Pack -->
+				<item id="38056" min="1" max="1" chance="2.875" /> <!-- Eternal Gaiters Crafting Pack -->
 			</death>
 			<lucky_corpse>
 				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/RaidbossSpawns.xml b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/RaidbossSpawns.xml
index 7883028a2e..fc598fbf44 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/RaidbossSpawns.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/RaidbossSpawns.xml
@@ -1931,4 +1931,7 @@
 	<spawn>
 		<npc id="25698" x="-213006" y="175614" z="-11953" heading="16141" dbSave="true" dbName="Dopagen" respawnTime="36hour" respawnRandom="24hour" /> <!-- Dopagen -->
 	</spawn>
+	<spawn>
+		<npc id="25931" x="16037" y="-119436" z="-880" heading="38391" dbSave="true" dbName="Theor" respawnTime="36hour" respawnRandom="24hour" /> <!-- Theor -->
+	</spawn>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25900-25999.xml
index cf27ec04b3..1d726654cc 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25900-25999.xml
@@ -1418,12 +1418,11 @@
 		</collision>
 	</npc>
 	<npc id="25931" level="99" type="L2RaidBoss" name="Theor" title="Raid Monster">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ORC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="1188371250" sp="1901394" raidPoints="30" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="2148796" hpRegen="10.5" mp="47100" mpRegen="3.6" />
+			<vitals hp="5116286" hpRegen="10.5" mp="47100" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -1450,42 +1449,58 @@
 		</skill_list>
 		<drop_lists>
 			<death>
-				<group chance="17.577">
-					<item id="38056" min="1" max="1" chance="16.931216931217" /> <!-- Eternal Gaiters Crafting Pack Heavy Armor -->
-					<item id="38055" min="1" max="1" chance="16.771917847187" /> <!-- Eternal Breastplate Crafting Pack Heavy Armor -->
-					<item id="38066" min="1" max="1" chance="16.766228594186" /> <!-- Eternal Tunic Crafting Pack Robe -->
-					<item id="38061" min="1" max="1" chance="16.646754281163" /> <!-- Eternal Leather Armor Crafting Pack Light Armor -->
-					<item id="38067" min="1" max="1" chance="16.459008932127" /> <!-- Eternal Stockings Crafting Pack Robe -->
-					<item id="38062" min="1" max="1" chance="16.424873414121" /> <!-- Eternal Leather Leggings Crafting Pack Light Armor -->
-				</group>
-				<group chance="32.241">
-					<item id="38064" min="1" max="1" chance="9.3173288669706" /> <!-- Eternal Leather Boots Crafting Pack Light Armor -->
-					<item id="38059" min="1" max="1" chance="9.2646009739152" /> <!-- Eternal Shield Crafting Pack Heavy Armor -->
-					<item id="38054" min="1" max="1" chance="9.1963648770199" /> <!-- Eternal Helmet Crafting Pack Heavy Armor -->
-					<item id="38060" min="1" max="1" chance="9.1777550324121" /> <!-- Eternal Leather Helmet Crafting Pack Light Armor -->
-					<item id="38069" min="1" max="1" chance="9.0847058093732" /> <!-- Eternal Shoes Crafting Pack Robe -->
-					<item id="38058" min="1" max="1" chance="9.0381811978537" /> <!-- Eternal Boots Crafting Pack Heavy Armor -->
-					<item id="38063" min="1" max="1" chance="9.0350795570857" /> <!-- Eternal Leather Gloves Crafting Pack Light Armor -->
-					<item id="38065" min="1" max="1" chance="9.007164790174" /> <!-- Eternal Circlet Crafting Pack Robe -->
-					<item id="38070" min="1" max="1" chance="9.0009615086381" /> <!-- Eternal Sigil Crafting Pack Robe -->
-					<item id="38068" min="1" max="1" chance="8.9606401786545" /> <!-- Eternal Gloves Crafting Pack Robe -->
-					<item id="38057" min="1" max="1" chance="8.917217207903" /> <!-- Eternal Gauntlets Crafting Pack Heavy Armor -->
-				</group>
-				<group chance="100">
-					<item id="36389" min="1" max="1" chance="32.839563578391" /> <!-- Giant's Scroll: Enchant Armor (R-grade) -->
-					<item id="36386" min="1" max="1" chance="8.5274922364116" /> <!-- Giant's Scroll: Enchant Weapon (R-grade) -->
-					<item id="17695" min="1" max="1" chance="7.1325373233472" /> <!-- Lv. 4 Legendary WIT Dye WIT + 5 / MEN - 1 / Wind Resistance + 20 -->
-					<item id="17696" min="1" max="1" chance="7.1242340202933" /> <!-- Lv. 4 Legendary MEN Dye MEN + 5 / INT - 1 / Holy Resistance + 20 -->
-					<item id="17692" min="1" max="1" chance="7.0744142019695" /> <!-- Lv. 4 Legendary DEX Dye DEX + 5 / CON - 1 / Earth Resistance + 20 -->
-					<item id="17693" min="1" max="1" chance="7.0038361260109" /> <!-- Lv. 4 Legendary CON Dye CON + 5 / STR - 1 / Dark Resistance + 20 -->
-					<item id="17694" min="1" max="1" chance="6.9124997924174" /> <!-- Lv. 4 Legendary INT Dye INT + 5 / WIT - 1 / Water Resistance + 20 -->
-					<item id="17691" min="1" max="1" chance="6.8585283225667" /> <!-- Lv. 4 Legendary STR Dye STR + 5 / DEX - 1 / Fire Resistance + 20 -->
-					<item id="19468" min="1" max="1" chance="4.1786372619028" /> <!-- Teal Soul Crystal Fragment (R99-grade) -->
-					<item id="19467" min="1" max="1" chance="4.1778069315974" /> <!-- Yellow Soul Crystal Fragment (R99-grade) -->
-					<item id="19469" min="1" max="1" chance="4.0187986781142" /> <!-- Purple Soul Crystal Fragment (R99-grade) -->
-					<item id="35569" min="1" max="1" chance="2.0957536908182" /> <!-- Bloody Eternal Enhancement Stone -->
-					<item id="35567" min="1" max="1" chance="2.0558978361592" /> <!-- Dark Eternal Enhancement Stone -->
-				</group>
+				<item id="36389" min="1" max="1" chance="78.29" /> <!-- Giant's Scroll: Enchant Armor (R-grade) -->
+				<item id="36386" min="1" max="1" chance="20.93" /> <!-- Giant's Scroll: Enchant Weapon (R-grade) -->
+				<item id="17696" min="1" max="1" chance="17.25" /> <!-- Lv. 4 Legendary MEN Dye -->
+				<item id="17692" min="1" max="1" chance="17.14" /> <!-- Lv. 4 Legendary DEX Dye -->
+				<item id="17691" min="1" max="1" chance="17.06" /> <!-- Lv. 4 Legendary STR Dye -->
+				<item id="17694" min="1" max="1" chance="16.97" /> <!-- Lv. 4 Legendary INT Dye -->
+				<item id="17693" min="1" max="1" chance="16.34" /> <!-- Lv. 4 Legendary CON Dye -->
+				<item id="17695" min="1" max="1" chance="16.22" /> <!-- Lv. 4 Legendary WIT Dye -->
+				<item id="35569" min="1" max="1" chance="5.070" /> <!-- Bloody Eternal Enhancement Stone -->
+				<item id="35567" min="1" max="1" chance="5.019" /> <!-- Dark Eternal Enhancement Stone -->
+				<item id="38057" min="1" max="1" chance="3.006" /> <!-- Eternal Gauntlets Crafting Pack -->
+				<item id="38055" min="1" max="1" chance="2.993" /> <!-- Eternal Breastplate Crafting Pack -->
+				<item id="38067" min="1" max="1" chance="2.984" /> <!-- Eternal Stockings Crafting Pack -->
+				<item id="38054" min="1" max="1" chance="2.981" /> <!-- Eternal Helmet Crafting Pack -->
+				<item id="38070" min="1" max="1" chance="2.974" /> <!-- Eternal Sigil Crafting Pack -->
+				<item id="38060" min="1" max="1" chance="2.966" /> <!-- Eternal Leather Helmet Crafting Pack -->
+				<item id="38065" min="1" max="1" chance="2.959" /> <!-- Eternal Circlet Crafting Pack -->
+				<item id="38064" min="1" max="1" chance="2.942" /> <!-- Eternal Leather Boots Crafting Pack -->
+				<item id="38062" min="1" max="1" chance="2.935" /> <!-- Eternal Leather Leggings Crafting Pack -->
+				<item id="38058" min="1" max="1" chance="2.932" /> <!-- Eternal Boots Crafting Pack -->
+				<item id="38059" min="1" max="1" chance="2.928" /> <!-- Eternal Shield Crafting Pack -->
+				<item id="38063" min="1" max="1" chance="2.902" /> <!-- Eternal Leather Gloves Crafting Pack -->
+				<item id="38069" min="1" max="1" chance="2.901" /> <!-- Eternal Shoes Crafting Pack -->
+				<item id="38066" min="1" max="1" chance="2.896" /> <!-- Eternal Tunic Crafting Pack -->
+				<item id="38068" min="1" max="1" chance="2.886" /> <!-- Eternal Gloves Crafting Pack -->
+				<item id="38061" min="1" max="1" chance="2.883" /> <!-- Eternal Leather Armor Crafting Pack -->
+				<item id="38056" min="1" max="1" chance="2.875" /> <!-- Eternal Gaiters Crafting Pack -->
+				<item id="46475" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal - Stage 2 -->
+				<item id="46490" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 2 -->
+				<item id="46491" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
+				<item id="46505" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 2 -->
+				<item id="46506" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 3 -->
+				<item id="46476" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal - Stage 3 -->
+				<item id="46493" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46478" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 5 -->
+				<item id="46477" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 4 -->
+				<item id="46508" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46507" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 4 -->
+				<item id="46463" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
+				<item id="46445" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 2 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
+				<item id="46461" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46460" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal - Stage 2 -->
+				<item id="46446" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 3 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 4 -->
+				<item id="46448" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 5 -->
+				<item id="46464" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
+				<item id="46494" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
+				<item id="46449" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 6 -->
+				<item id="46479" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 6 -->
+				<item id="46509" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 6 -->
 			</death>
 			<lucky_corpse>
 				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/RaidbossSpawns.xml b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/RaidbossSpawns.xml
index 7883028a2e..fc598fbf44 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/RaidbossSpawns.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/RaidbossSpawns.xml
@@ -1931,4 +1931,7 @@
 	<spawn>
 		<npc id="25698" x="-213006" y="175614" z="-11953" heading="16141" dbSave="true" dbName="Dopagen" respawnTime="36hour" respawnRandom="24hour" /> <!-- Dopagen -->
 	</spawn>
+	<spawn>
+		<npc id="25931" x="16037" y="-119436" z="-880" heading="38391" dbSave="true" dbName="Theor" respawnTime="36hour" respawnRandom="24hour" /> <!-- Theor -->
+	</spawn>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25900-25999.xml
index cf27ec04b3..1d726654cc 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25900-25999.xml
@@ -1418,12 +1418,11 @@
 		</collision>
 	</npc>
 	<npc id="25931" level="99" type="L2RaidBoss" name="Theor" title="Raid Monster">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ORC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="1188371250" sp="1901394" raidPoints="30" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="2148796" hpRegen="10.5" mp="47100" mpRegen="3.6" />
+			<vitals hp="5116286" hpRegen="10.5" mp="47100" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -1450,42 +1449,58 @@
 		</skill_list>
 		<drop_lists>
 			<death>
-				<group chance="17.577">
-					<item id="38056" min="1" max="1" chance="16.931216931217" /> <!-- Eternal Gaiters Crafting Pack Heavy Armor -->
-					<item id="38055" min="1" max="1" chance="16.771917847187" /> <!-- Eternal Breastplate Crafting Pack Heavy Armor -->
-					<item id="38066" min="1" max="1" chance="16.766228594186" /> <!-- Eternal Tunic Crafting Pack Robe -->
-					<item id="38061" min="1" max="1" chance="16.646754281163" /> <!-- Eternal Leather Armor Crafting Pack Light Armor -->
-					<item id="38067" min="1" max="1" chance="16.459008932127" /> <!-- Eternal Stockings Crafting Pack Robe -->
-					<item id="38062" min="1" max="1" chance="16.424873414121" /> <!-- Eternal Leather Leggings Crafting Pack Light Armor -->
-				</group>
-				<group chance="32.241">
-					<item id="38064" min="1" max="1" chance="9.3173288669706" /> <!-- Eternal Leather Boots Crafting Pack Light Armor -->
-					<item id="38059" min="1" max="1" chance="9.2646009739152" /> <!-- Eternal Shield Crafting Pack Heavy Armor -->
-					<item id="38054" min="1" max="1" chance="9.1963648770199" /> <!-- Eternal Helmet Crafting Pack Heavy Armor -->
-					<item id="38060" min="1" max="1" chance="9.1777550324121" /> <!-- Eternal Leather Helmet Crafting Pack Light Armor -->
-					<item id="38069" min="1" max="1" chance="9.0847058093732" /> <!-- Eternal Shoes Crafting Pack Robe -->
-					<item id="38058" min="1" max="1" chance="9.0381811978537" /> <!-- Eternal Boots Crafting Pack Heavy Armor -->
-					<item id="38063" min="1" max="1" chance="9.0350795570857" /> <!-- Eternal Leather Gloves Crafting Pack Light Armor -->
-					<item id="38065" min="1" max="1" chance="9.007164790174" /> <!-- Eternal Circlet Crafting Pack Robe -->
-					<item id="38070" min="1" max="1" chance="9.0009615086381" /> <!-- Eternal Sigil Crafting Pack Robe -->
-					<item id="38068" min="1" max="1" chance="8.9606401786545" /> <!-- Eternal Gloves Crafting Pack Robe -->
-					<item id="38057" min="1" max="1" chance="8.917217207903" /> <!-- Eternal Gauntlets Crafting Pack Heavy Armor -->
-				</group>
-				<group chance="100">
-					<item id="36389" min="1" max="1" chance="32.839563578391" /> <!-- Giant's Scroll: Enchant Armor (R-grade) -->
-					<item id="36386" min="1" max="1" chance="8.5274922364116" /> <!-- Giant's Scroll: Enchant Weapon (R-grade) -->
-					<item id="17695" min="1" max="1" chance="7.1325373233472" /> <!-- Lv. 4 Legendary WIT Dye WIT + 5 / MEN - 1 / Wind Resistance + 20 -->
-					<item id="17696" min="1" max="1" chance="7.1242340202933" /> <!-- Lv. 4 Legendary MEN Dye MEN + 5 / INT - 1 / Holy Resistance + 20 -->
-					<item id="17692" min="1" max="1" chance="7.0744142019695" /> <!-- Lv. 4 Legendary DEX Dye DEX + 5 / CON - 1 / Earth Resistance + 20 -->
-					<item id="17693" min="1" max="1" chance="7.0038361260109" /> <!-- Lv. 4 Legendary CON Dye CON + 5 / STR - 1 / Dark Resistance + 20 -->
-					<item id="17694" min="1" max="1" chance="6.9124997924174" /> <!-- Lv. 4 Legendary INT Dye INT + 5 / WIT - 1 / Water Resistance + 20 -->
-					<item id="17691" min="1" max="1" chance="6.8585283225667" /> <!-- Lv. 4 Legendary STR Dye STR + 5 / DEX - 1 / Fire Resistance + 20 -->
-					<item id="19468" min="1" max="1" chance="4.1786372619028" /> <!-- Teal Soul Crystal Fragment (R99-grade) -->
-					<item id="19467" min="1" max="1" chance="4.1778069315974" /> <!-- Yellow Soul Crystal Fragment (R99-grade) -->
-					<item id="19469" min="1" max="1" chance="4.0187986781142" /> <!-- Purple Soul Crystal Fragment (R99-grade) -->
-					<item id="35569" min="1" max="1" chance="2.0957536908182" /> <!-- Bloody Eternal Enhancement Stone -->
-					<item id="35567" min="1" max="1" chance="2.0558978361592" /> <!-- Dark Eternal Enhancement Stone -->
-				</group>
+				<item id="36389" min="1" max="1" chance="78.29" /> <!-- Giant's Scroll: Enchant Armor (R-grade) -->
+				<item id="36386" min="1" max="1" chance="20.93" /> <!-- Giant's Scroll: Enchant Weapon (R-grade) -->
+				<item id="17696" min="1" max="1" chance="17.25" /> <!-- Lv. 4 Legendary MEN Dye -->
+				<item id="17692" min="1" max="1" chance="17.14" /> <!-- Lv. 4 Legendary DEX Dye -->
+				<item id="17691" min="1" max="1" chance="17.06" /> <!-- Lv. 4 Legendary STR Dye -->
+				<item id="17694" min="1" max="1" chance="16.97" /> <!-- Lv. 4 Legendary INT Dye -->
+				<item id="17693" min="1" max="1" chance="16.34" /> <!-- Lv. 4 Legendary CON Dye -->
+				<item id="17695" min="1" max="1" chance="16.22" /> <!-- Lv. 4 Legendary WIT Dye -->
+				<item id="35569" min="1" max="1" chance="5.070" /> <!-- Bloody Eternal Enhancement Stone -->
+				<item id="35567" min="1" max="1" chance="5.019" /> <!-- Dark Eternal Enhancement Stone -->
+				<item id="38057" min="1" max="1" chance="3.006" /> <!-- Eternal Gauntlets Crafting Pack -->
+				<item id="38055" min="1" max="1" chance="2.993" /> <!-- Eternal Breastplate Crafting Pack -->
+				<item id="38067" min="1" max="1" chance="2.984" /> <!-- Eternal Stockings Crafting Pack -->
+				<item id="38054" min="1" max="1" chance="2.981" /> <!-- Eternal Helmet Crafting Pack -->
+				<item id="38070" min="1" max="1" chance="2.974" /> <!-- Eternal Sigil Crafting Pack -->
+				<item id="38060" min="1" max="1" chance="2.966" /> <!-- Eternal Leather Helmet Crafting Pack -->
+				<item id="38065" min="1" max="1" chance="2.959" /> <!-- Eternal Circlet Crafting Pack -->
+				<item id="38064" min="1" max="1" chance="2.942" /> <!-- Eternal Leather Boots Crafting Pack -->
+				<item id="38062" min="1" max="1" chance="2.935" /> <!-- Eternal Leather Leggings Crafting Pack -->
+				<item id="38058" min="1" max="1" chance="2.932" /> <!-- Eternal Boots Crafting Pack -->
+				<item id="38059" min="1" max="1" chance="2.928" /> <!-- Eternal Shield Crafting Pack -->
+				<item id="38063" min="1" max="1" chance="2.902" /> <!-- Eternal Leather Gloves Crafting Pack -->
+				<item id="38069" min="1" max="1" chance="2.901" /> <!-- Eternal Shoes Crafting Pack -->
+				<item id="38066" min="1" max="1" chance="2.896" /> <!-- Eternal Tunic Crafting Pack -->
+				<item id="38068" min="1" max="1" chance="2.886" /> <!-- Eternal Gloves Crafting Pack -->
+				<item id="38061" min="1" max="1" chance="2.883" /> <!-- Eternal Leather Armor Crafting Pack -->
+				<item id="38056" min="1" max="1" chance="2.875" /> <!-- Eternal Gaiters Crafting Pack -->
+				<item id="46475" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal - Stage 2 -->
+				<item id="46490" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 2 -->
+				<item id="46491" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
+				<item id="46505" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 2 -->
+				<item id="46506" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 3 -->
+				<item id="46476" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal - Stage 3 -->
+				<item id="46493" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46478" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 5 -->
+				<item id="46477" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 4 -->
+				<item id="46508" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46507" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 4 -->
+				<item id="46463" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
+				<item id="46445" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 2 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
+				<item id="46461" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46460" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal - Stage 2 -->
+				<item id="46446" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 3 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 4 -->
+				<item id="46448" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 5 -->
+				<item id="46464" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
+				<item id="46494" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
+				<item id="46449" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 6 -->
+				<item id="46479" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 6 -->
+				<item id="46509" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 6 -->
 			</death>
 			<lucky_corpse>
 				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->