diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/armorsets/Sets.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/armorsets/Sets.xml
index fa8ca5a399..a0c4136013 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/armorsets/Sets.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/armorsets/Sets.xml
@@ -8076,4 +8076,52 @@
 			<skill id="35638" level="1" minimumPieces="5" /> <!-- Set Effect - Blessed Exalted Robe Armor, 5-piece -->
 		</skills>
 	</set>
+	<set id="322" minimumPieces="2">
+		<requiredItems>
+			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->
+			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
+			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
+			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
+			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
+			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
+			<item id="48202" /> <!-- Warrior's Circlet -->
+			<item id="48203" /> <!-- Noble Warrior's Circlet -->
+			<item id="48204" /> <!-- Radiant Warrior's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29393" level="3" minimumPieces="2" /> <!-- Warrior's Heir -->
+		</skills>
+	</set>
+	<set id="323" minimumPieces="2">
+		<requiredItems>
+			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->
+			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
+			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
+			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
+			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
+			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
+			<item id="48205" /> <!-- Wizard's Circlet -->
+			<item id="48206" /> <!-- Noble Wizard's Circlet -->
+			<item id="48207" /> <!-- Radiant Wizard's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29394" level="3" minimumPieces="2" /> <!-- Wizard's Heir -->
+		</skills>
+	</set>
+	<set id="324" minimumPieces="2">
+		<requiredItems>
+			<item id="29751" /> <!-- Heir's Radiance Lv. 2 (PvE) -->
+			<item id="29752" /> <!-- Heir's Radiance Lv. 3 (PvE) -->
+			<item id="29753" /> <!-- Heir's Radiance Lv. 4 (PvE) -->
+			<item id="29755" /> <!-- Heir's Radiance Lv. 2 (PvP) -->
+			<item id="29756" /> <!-- Heir's Radiance Lv. 3 (PvP) -->
+			<item id="29757" /> <!-- Heir's Radiance Lv. 4 (PvP) -->
+			<item id="48208" /> <!-- Knight's Circlet -->
+			<item id="48209" /> <!-- Noble Knight's Circlet -->
+			<item id="48210" /> <!-- Radiant Knight's Circlet -->
+		</requiredItems>
+		<skills>
+			<skill id="29395" level="3" minimumPieces="2" /> <!-- Knight's Heir -->
+		</skills>
+	</set>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/29700-29799.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/29700-29799.xml
index 05aedf439b..a52f6b48ff 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/29700-29799.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/29700-29799.xml
@@ -749,8 +749,12 @@
 		<set name="weight" val="10" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
+		<set name="enchant_enabled" val="false" />
+		<skills>
+			<skill id="29382" level="1" /> <!-- Heir's Radiance Lv. 1 -->
+		</skills>
 	</item>
 	<item id="29751" name="Heir's Radiance Lv. 2" additionalName="PvE" type="Armor">
 		<!-- When equipped, Debuff Resistance +2%, Max HP +1500, all stats +1. <When used with Wizard's/ Knight's/ Warrior's Circlet>. Knight's Circlet: P./ M. Def. +1%. Warrior's Circlet: P. Atk. +1%. Wizard's Circlet: M. Atk. +1%. Cannot be enchanted. -->
@@ -762,8 +766,12 @@
 		<set name="weight" val="10" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
+		<set name="enchant_enabled" val="false" />
+		<skills>
+			<skill id="29383" level="1" /> <!-- Heir's Radiance Lv. 2 -->
+		</skills>
 	</item>
 	<item id="29752" name="Heir's Radiance Lv. 3" additionalName="PvE" type="Armor">
 		<!-- When equipped, Debuff Resistance +3%, Max HP +3000, all stats +2, PvE damage +3%, received damage from Dragon's weapons -1%. <When used with Wizard's/ Knight's/ Warrior's Circlet>. Knight's Circlet: P./ M. Def. +3%. Warrior's Circlet: P. Atk. +3%. Wizard's Circlet: M. Atk. +3%. Cannot be enchanted. -->
@@ -775,8 +783,12 @@
 		<set name="weight" val="10" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
+		<set name="enchant_enabled" val="false" />
+		<skills>
+			<skill id="29384" level="1" /> <!-- Heir's Radiance Lv. 3 -->
+		</skills>
 	</item>
 	<item id="29753" name="Heir's Radiance Lv. 4" additionalName="PvE" type="Armor">
 		<!-- When equipped, Debuff Resistance +5%, Max HP +4000, all stats +3, PvE damage +5%, received damage from Dragon's weapons -3%. Enables the Heir's Radiance - PvE skill. <When used with Wizard's/ Knight's/ Warrior's Circlet>. Knight's Circlet: P./ M. Def. +7%. Warrior's Circlet: P. Atk. +7%. Wizard's Circlet: M. Atk. +7%. Cannot be enchanted. -->
@@ -788,6 +800,11 @@
 		<set name="weight" val="10" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="enchant_enabled" val="false" />
+		<skills>
+			<skill id="29385" level="1" /> <!-- Heir's Radiance Lv. 4 -->
+			<skill id="29390" level="1" /> <!-- Heir's Radiance - PvE -->
+		</skills>
 	</item>
 	<item id="29754" name="Heir's Radiance Lv. 1" additionalName="PvP" type="Armor">
 		<!-- When equipped, Debuff Resistance +1%, Max HP +1000. Cannot be enchanted. -->
@@ -799,8 +816,12 @@
 		<set name="weight" val="10" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
+		<set name="enchant_enabled" val="false" />
+		<skills>
+			<skill id="29386" level="1" /> <!-- Heir's Radiance Lv. 1 -->
+		</skills>
 	</item>
 	<item id="29755" name="Heir's Radiance Lv. 2" additionalName="PvP" type="Armor">
 		<!-- When equipped, Debuff Resistance +2%, Max HP +1500, all stats +1. <When used with Wizard's/ Knight's/ Warrior's Circlet>. Knight's Circlet: P./ M. Def. +1%. Warrior's Circlet: P. Atk. +1%. Wizard's Circlet: M. Atk. +1%. Cannot be enchanted. -->
@@ -812,8 +833,12 @@
 		<set name="weight" val="10" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
+		<set name="enchant_enabled" val="false" />
+		<skills>
+			<skill id="29387" level="1" /> <!-- Heir's Radiance Lv. 2 -->
+		</skills>
 	</item>
 	<item id="29756" name="Heir's Radiance Lv. 3" additionalName="PvP" type="Armor">
 		<!-- When equipped, Debuff Resistance +3%, Max HP +3000, all stats +2, PvP damage +3%, received damage from Dragon's weapons -1%. <When used with Wizard's/ Knight's/ Warrior's Circlet>. Knight's Circlet: P./ M. Def. +3%. Warrior's Circlet: P. Atk. +3%. Wizard's Circlet: M. Atk. +3%. Cannot be enchanted. -->
@@ -825,8 +850,12 @@
 		<set name="weight" val="10" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
+		<set name="enchant_enabled" val="false" />
+		<skills>
+			<skill id="29388" level="1" /> <!-- Heir's Radiance Lv. 3 -->
+		</skills>
 	</item>
 	<item id="29757" name="Heir's Radiance Lv. 4" additionalName="PvP" type="Armor">
 		<!-- When equipped, Debuff Resistance +5%, Max HP +4000, all stats +3, PvP damage +5%, received damage from Dragon's weapons -3%. Enables the Heir's Radiance - PvP skill. <When used with Wizard's/ Knight's/ Warrior's Circlet>. Knight's Circlet: P./ M. Def. +7%. Warrior's Circlet: P. Atk. +7%. Wizard's Circlet: M. Atk. +7%. Cannot be enchanted. -->
@@ -838,6 +867,11 @@
 		<set name="weight" val="10" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="enchant_enabled" val="false" />
+		<skills>
+			<skill id="29389" level="1" /> <!-- Heir's Radiance Lv. 4 -->
+			<skill id="29391" level="1" /> <!-- Heir's Radiance - PvP -->
+		</skills>
 	</item>
 	<item id="29758" name="Hidden Secret Book" type="EtcItem">
 		<!-- Required for upgrading Heir's Radiance. Take it to Denign. -->
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/48200-48299.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/48200-48299.xml
index e006436747..666dc44845 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/48200-48299.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/48200-48299.xml
@@ -65,7 +65,7 @@
 		<set name="weight" val="10" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="enchant_enabled" val="true" />
@@ -1305,7 +1305,7 @@
 		<set name="weight" val="10" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_stackable" val="true" />
 		<set name="immediate_effect" val="true" />
 		<set name="etcitem_type" val="POTION" />
@@ -1527,8 +1527,8 @@
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_destroyable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_destroyable" val="true" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_premium" val="true" />
@@ -1557,7 +1557,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 	</item>
@@ -1569,7 +1569,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 	</item>
@@ -1581,7 +1581,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 	</item>
@@ -1593,7 +1593,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 	</item>
@@ -1605,7 +1605,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 	</item>
@@ -1617,7 +1617,7 @@
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 	</item>
@@ -1629,8 +1629,8 @@
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_destroyable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_destroyable" val="true" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 	</item>
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/29300-29399.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/29300-29399.xml
index 665065470c..3a0ca5e5d6 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/29300-29399.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/29300-29399.xml
@@ -218,72 +218,985 @@
 	</skill>
 	<skill id="29382" toLevel="1" name="Heir's Radiance Lv. 1">
 		<!-- Debuff Resistance +$s1, Max HP +$s2. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="ResistAbnormalByCategory">
+				<amount>1</amount>
+				<slot>DEBUFF</slot>
+			</effect>
+			<effect name="MaxHp">
+				<amount>1000</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AttackAttributeAdd">
+				<amount>10</amount>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>10</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>10</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>10</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>10</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>10</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>10</amount>
+				<attribute>DARK</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29383" toLevel="1" name="Heir's Radiance Lv. 2">
 		<!-- When equipped, Debuff Resistance +$s1, Max HP +$s2, all stats +$s3. <When used with Warrior's/ Wizard's/ Knight's Circlet>. Knight's Circlet: P./ M. Def. +$s4. Warrior's Circlet: P. Atk. +$s4. Wizard's Circlet: M. Atk. +$s4. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="ResistAbnormalByCategory">
+				<amount>2</amount>
+				<slot>DEBUFF</slot>
+			</effect>
+			<effect name="MaxHp">
+				<amount>1500</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AttackAttributeAdd">
+				<amount>15</amount>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>15</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>15</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>15</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>15</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>15</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>15</amount>
+				<attribute>DARK</attribute>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>WIT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>MEN</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>LUC</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>CHA</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29384" toLevel="1" name="Heir's Radiance Lv. 3">
 		<!-- When equipped, Debuff Resistance +$s1, Max HP +$s2, all stats +$s3, PvE Damage +$s4, damage from dragon's weapon -$s5. <When used with Warrior's/ Wizard's/ Knight's Circlet>. Knight's Circlet: P./ M. Def. +$s6. Warrior's Circlet: P. Atk. +$s6. Wizard's Circlet: M. Atk. +$s6. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="ResistAbnormalByCategory">
+				<amount>3</amount>
+				<slot>DEBUFF</slot>
+			</effect>
+			<effect name="MaxHp">
+				<amount>3000</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AttackAttributeAdd">
+				<amount>20</amount>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>20</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>20</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>20</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>20</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>20</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>20</amount>
+				<attribute>DARK</attribute>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>WIT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>MEN</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>LUC</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>CHA</stat>
+			</effect>
+			<effect name="PhysicalSkillPower">
+				<amount>1</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalSkillPower">
+				<amount>1</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="CriticalDamage">
+				<amount>1</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicCriticalDamage">
+				<amount>1</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="SkillCriticalDamage">
+				<amount>1</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalAttackDamageBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalSkillDamageBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PveMagicalSkillDamageBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="DragonWeaponDefence">
+				<amount>-1</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29385" toLevel="1" name="Heir's Radiance Lv. 4">
 		<!-- When equipped, Debuff Resistance +$s1, Max HP +$s2, all stats +$s3, PvE Damage +$s4, damage from dragon's weapon -$s5. Enables the Heir's Radiance - PvE skill. <When used with Warrior's/ Wizard's/ Knight's Circlet>. Knight's Circlet: P./ M. Def. +$s6. Warrior's Circlet: P. Atk. +$s6. Wizard's Circlet: M. Atk. +$s6. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="ResistAbnormalByCategory">
+				<amount>5</amount>
+				<slot>DEBUFF</slot>
+			</effect>
+			<effect name="MaxHp">
+				<amount>4000</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AttackAttributeAdd">
+				<amount>30</amount>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>30</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>30</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>30</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>30</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>30</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>30</amount>
+				<attribute>DARK</attribute>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>WIT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>MEN</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>LUC</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>CHA</stat>
+			</effect>
+			<effect name="PhysicalSkillPower">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalSkillPower">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="CriticalDamage">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicCriticalDamage">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="SkillCriticalDamage">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalAttackDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalSkillDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PveMagicalSkillDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="DragonWeaponDefence">
+				<amount>-3</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29386" toLevel="1" name="Heir's Radiance Lv. 1">
 		<!-- Debuff Resistance +$s1, Max HP +$s2. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="ResistAbnormalByCategory">
+				<amount>1</amount>
+				<slot>DEBUFF</slot>
+			</effect>
+			<effect name="MaxHp">
+				<amount>1000</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AttackAttributeAdd">
+				<amount>10</amount>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>10</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>10</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>10</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>10</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>10</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>10</amount>
+				<attribute>DARK</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29387" toLevel="1" name="Heir's Radiance Lv. 2">
 		<!-- When equipped, Debuff Resistance +$s1, Max HP +$s2, all stats +$s3. <When used with Warrior's/ Wizard's/ Knight's Circlet>. Knight's Circlet: P./ M. Def. +$s4. Warrior's Circlet: P. Atk. +$s4. Wizard's Circlet: M. Atk. +$s4. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="ResistAbnormalByCategory">
+				<amount>2</amount>
+				<slot>DEBUFF</slot>
+			</effect>
+			<effect name="MaxHp">
+				<amount>1500</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AttackAttributeAdd">
+				<amount>15</amount>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>15</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>15</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>15</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>15</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>15</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>15</amount>
+				<attribute>DARK</attribute>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>WIT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>MEN</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>LUC</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>CHA</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29388" toLevel="1" name="Heir's Radiance Lv. 3">
 		<!-- When equipped, Debuff Resistance +$s1, Max HP +$s2, all stats +$s3, PvP Damage +$s4, damage from dragon's weapon -$s5. <When used with Warrior's/ Wizard's/ Knight's Circlet>. Knight's Circlet: P./ M. Def. +$s6. Warrior's Circlet: P. Atk. +$s6. Wizard's Circlet: M. Atk. +$s6. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="ResistAbnormalByCategory">
+				<amount>3</amount>
+				<slot>DEBUFF</slot>
+			</effect>
+			<effect name="MaxHp">
+				<amount>3000</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AttackAttributeAdd">
+				<amount>20</amount>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>20</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>20</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>20</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>20</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>20</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>20</amount>
+				<attribute>DARK</attribute>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>WIT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>MEN</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>LUC</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>2</amount>
+				<stat>CHA</stat>
+			</effect>
+			<effect name="PhysicalSkillPower">
+				<amount>1</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalSkillPower">
+				<amount>1</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="CriticalDamage">
+				<amount>1</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicCriticalDamage">
+				<amount>1</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="SkillCriticalDamage">
+				<amount>1</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDamageBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDamageBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="DragonWeaponDefence">
+				<amount>-1</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29389" toLevel="1" name="Heir's Radiance Lv. 4">
 		<!-- When equipped, Debuff Resistance +$s1, Max HP +$s2, all stats +$s3, PvP Damage +$s4, damage from dragon's weapon -$s5. Enables the Heir's Radiance - PvP skill. <When used with Warrior's/ Wizard's/ Knight's Circlet>. Knight's Circlet: P./ M. Def. +$s6. Warrior's Circlet: P. Atk. +$s6. Wizard's Circlet: M. Atk. +$s6. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="ResistAbnormalByCategory">
+				<amount>5</amount>
+				<slot>DEBUFF</slot>
+			</effect>
+			<effect name="MaxHp">
+				<amount>4000</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AttackAttributeAdd">
+				<amount>30</amount>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>30</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>30</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>30</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>30</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>30</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>30</amount>
+				<attribute>DARK</attribute>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>WIT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>MEN</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>LUC</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>CHA</stat>
+			</effect>
+			<effect name="PhysicalSkillPower">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalSkillPower">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="CriticalDamage">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicCriticalDamage">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="SkillCriticalDamage">
+				<amount>2</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalAttackDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDamageBonus">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="DragonWeaponDefence">
+				<amount>-3</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29390" toLevel="5" name="Heir's Radiance - PvE">
 		<!-- For 1 h., P. Atk. +$s1, M. Atk. +$s2, P. Def. +$s3, M. Def. +$s4, Received PvE Damage -$s5. When the effect expires, the enhanced Heir's Radiance - PvE effect activates recovering 35,000 Vitality points. Consumes 1000 Spirit Ore. Note!. The effect disappears after logout and is not renewed after death. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
+		<operateType>A2</operateType>
+		<abnormalType>HEIR_PVE</abnormalType>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>5</abnormalTime>
+		<reuseDelay>
+			<value level="1">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
+		</reuseDelay>
+		<staticReuse>true</staticReuse>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<canBeDispelled>false</canBeDispelled>
+		<itemConsumeCount>1000</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<effects>
+			<effect name="PAtk">
+				<amount>
+					<value level="1">100</value>
+					<value level="2">200</value>
+					<value level="3">300</value>
+					<value level="4">400</value>
+					<value level="5">500</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>
+					<value level="1">100</value>
+					<value level="2">200</value>
+					<value level="3">300</value>
+					<value level="4">400</value>
+					<value level="5">500</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>
+					<value level="1">100</value>
+					<value level="2">200</value>
+					<value level="3">300</value>
+					<value level="4">500</value>
+					<value level="5">1000</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>
+					<value level="1">100</value>
+					<value level="2">200</value>
+					<value level="3">300</value>
+					<value level="4">400</value>
+					<value level="5">500</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PveMagicalSkillDefenceBonus">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">5</value>
+					<value level="3">7</value>
+					<value level="4">7</value>
+					<value level="5">10</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalAttackDefenceBonus">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">5</value>
+					<value level="3">7</value>
+					<value level="4">7</value>
+					<value level="5">10</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalSkillDefenceBonus">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">5</value>
+					<value level="3">7</value>
+					<value level="4">7</value>
+					<value level="5">10</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="VitalityPointUp">
+				<value>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">0</value>
+					<value level="4">0</value>
+					<value level="5">35000</value>
+				</value>
+			</effect>
+		</effects>
+		<endEffects>
+			<effect name="CallSkill">
+				<skillId>29390</skillId> <!-- Heir's Radiance - PvE -->
+				<skillLevel>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+				</skillLevel>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>29392</skillId> <!-- Vitality Recovery -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</endEffects>
 	</skill>
 	<skill id="29391" toLevel="5" name="Heir's Radiance - PvP">
 		<!-- For 1 h., P. Atk. +$s1, M. Atk. +$s2, P. Def. +$s3, M. Def. +$s4, Received PvP Damage -$s5, Recovery Potions' Effect +$s6. When the effect expires, the enhanced Heir's Radiance - PvP effect activates. Consumes 1000 Spirit Ore. Note!. The effect disappears after logout and is not renewed after death. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
+		<operateType>A2</operateType>
+		<abnormalType>HEIR_PVP</abnormalType>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>5</abnormalTime>
+		<reuseDelay>
+			<value level="1">21600000</value>
+			<value level="2">0</value>
+			<value level="3">0</value>
+			<value level="4">0</value>
+			<value level="5">0</value>
+		</reuseDelay>
+		<staticReuse>true</staticReuse>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<itemConsumeCount>1000</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<effects>
+			<effect name="PAtk">
+				<amount>
+					<value level="1">100</value>
+					<value level="2">200</value>
+					<value level="3">300</value>
+					<value level="4">400</value>
+					<value level="5">500</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>
+					<value level="1">100</value>
+					<value level="2">200</value>
+					<value level="3">300</value>
+					<value level="4">400</value>
+					<value level="5">500</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>
+					<value level="1">100</value>
+					<value level="2">200</value>
+					<value level="3">300</value>
+					<value level="4">500</value>
+					<value level="5">1000</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>
+					<value level="1">100</value>
+					<value level="2">200</value>
+					<value level="3">300</value>
+					<value level="4">400</value>
+					<value level="5">500</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">5</value>
+					<value level="3">7</value>
+					<value level="4">7</value>
+					<value level="5">10</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">5</value>
+					<value level="3">7</value>
+					<value level="4">7</value>
+					<value level="5">10</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">5</value>
+					<value level="3">7</value>
+					<value level="4">7</value>
+					<value level="5">10</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="AdditionalPotionCp">
+				<amount>
+					<value level="1">300</value>
+					<value level="2">400</value>
+					<value level="3">500</value>
+					<value level="4">600</value>
+					<value level="5">1000</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AdditionalPotionHp">
+				<amount>
+					<value level="1">300</value>
+					<value level="2">400</value>
+					<value level="3">500</value>
+					<value level="4">600</value>
+					<value level="5">1000</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AdditionalPotionMp">
+				<amount>
+					<value level="1">300</value>
+					<value level="2">400</value>
+					<value level="3">500</value>
+					<value level="4">600</value>
+					<value level="5">1000</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
+		<endEffects>
+			<effect name="CallSkill">
+				<skillId>29391</skillId> <!-- Heir's Radiance - PvP -->
+				<skillLevel>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">5</value>
+				</skillLevel>
+				<skillLevelScaleTo>5</skillLevelScaleTo>
+			</effect>
+		</endEffects>
 	</skill>
 	<skill id="29392" toLevel="1" name="Vitality Recovery">
-		<icon>icon.skill0000</icon>
+		<icon>BranchSys.br_rudolf_food_red_i00</icon>
 		<operateType>A1</operateType>
+		<effects>
+			<effect name="VitalityPointUp">
+				<value>35000</value>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29393" toLevel="3" name="Warrior's Heir">
 		<!-- P. Atk. +$s1. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="PAtk">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">7</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29394" toLevel="3" name="Wizard's Heir">
 		<!-- M. Atk. +$s1. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="MAtk">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">7</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29395" toLevel="3" name="Knight's Heir">
 		<!-- P./ M. Def. +$s1. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<icon>BranchIcon.icon.g_bm_ring_of_light</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="PhysicalDefence">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">7</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">3</value>
+					<value level="3">7</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29396" toLevel="1" name="Dragon Fighter">
 		<!-- You can feel the power of dragon weapon. -->
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/skills.xsd b/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/skills.xsd
index c943a15b63..6ca6ff496d 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/skills.xsd
@@ -1029,8 +1029,6 @@
 															</xs:element>
 															<xs:element name="pAccuracyMode" type="xs:string" />
 															<xs:element name="hpPercent" type="xs:unsignedByte" />
-															<xs:element name="mpPercent" type="xs:unsignedByte" />
-															<xs:element name="cpPercent" type="xs:unsignedByte" />
 															<xs:element name="attribute" type="xs:string" />
 															<xs:element name="attackerType" type="xs:string" />
 															<xs:element name="minAttackerLevel" type="xs:unsignedByte" />
@@ -1909,6 +1907,7 @@
 																</xs:complexType>
 															</xs:element>
 															<xs:element name="blockedActions" type="xs:byte" />
+															<xs:element name="disable" type="xs:string" />
 															<xs:element name="skillId1" type="xs:unsignedShort" />
 															<xs:element name="skillId3" type="xs:unsignedShort" />
 															<xs:element name="skillId2" type="xs:unsignedShort" />
@@ -1930,7 +1929,6 @@
 															</xs:element>
 															<xs:element name="fame" type="xs:unsignedInt" />
 															<xs:element name="affectScope" type="xs:string" />
-															<xs:element name="disable" type="xs:string" />
 															<xs:element name="AGGRESSION">
 																<xs:complexType mixed="true">
 																	<xs:sequence minOccurs="0">
@@ -1999,6 +1997,8 @@
 																	</xs:sequence>
 																</xs:complexType>
 															</xs:element>
+															<xs:element name="mpPercent" type="xs:unsignedByte" />
+															<xs:element name="cpPercent" type="xs:unsignedByte" />
 															<xs:element name="FIRE" type="xs:byte" />
 															<xs:element name="hp" type="xs:unsignedByte" />
 															<xs:element name="mp" type="xs:unsignedByte" />
@@ -2632,6 +2632,7 @@
 																</xs:sequence>
 															</xs:complexType>
 														</xs:element>
+														<xs:element minOccurs="0" name="skillLevelScaleTo" type="xs:unsignedByte" />
 													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
 													<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
index 1c05e205a2..e747b929b8 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -246,12 +246,14 @@ public enum AbnormalType
 	OLYMPIAD_SPEED(-1),
 	OLYMPIAD_ATTACK(-1),
 	FOCUS_ATTACK(-1),
-	SONG_WEAPON(-1), // TODO: need find proper name
-	HEAL_RESISTANCE(-1), // TODO: need find proper name
+	SONG_WEAPON(-1),
+	HEAL_RESISTANCE(-1),
 	TRIAD(-1),
 	TALISMAN_SPECIAL(-1),
 	EXP_HERB(-1),
 	AURA_DEBUFF(-1),
+	HEIR_PVE(-1),
+	HEIR_PVP(-1),
 	AB_HAWK_EYE(0),
 	ALL_ATTACK_DOWN(1),
 	ALL_ATTACK_UP(2),