diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10300-10399.xml
index bc87b4e702..30a240b49b 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10300-10399.xml
@@ -1011,7 +1011,7 @@
 		<!-- Power of skills that consume Momentum increase by 10%. -->
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="OpCheckSkill">
 				<skillId>261</skillId> <!-- Triple Sonic Slash -->
 				<skillId>10258</skillId> <!-- Armor Destruction -->
@@ -1022,7 +1022,7 @@
 				<skillId>10318</skillId> <!-- Sonic Flash -->
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PhysicalSkillPower">
 				<amount>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19000-19099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19000-19099.xml
index b531d31c14..762d5c626d 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19000-19099.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19000-19099.xml
@@ -303,14 +303,14 @@
 		<!-- Increases P. Atk. and P. Def. when HP is below 30%. Applies after the lord stage. -->
 		<icon>icon.skill19011</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="CanUseInBattlefield" />
 			<condition name="RemainHpPer">
 				<amount>30</amount>
 				<percentType>LESS</percentType>
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PAtk">
 				<amount>30</amount>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/21300-21399.xml
index 2df0109060..5a47417ebe 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/21300-21399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/21300-21399.xml
@@ -1664,13 +1664,13 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
-		<conditions>
+		<passiveConditions>
 			<condition name="RemainHpPer">
 				<amount>90</amount>
 				<percentType>MORE</percentType>
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>20</amount>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/skills.xsd b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/skills.xsd
index b32b34062f..1954a5cae3 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/skills.xsd
@@ -7,6 +7,21 @@
 					<xs:complexType mixed="true">
 						<xs:sequence>
 							<xs:choice maxOccurs="unbounded">
+								<xs:element name="icon">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:string">
+															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+														</xs:extension>
+													</xs:simpleContent>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
 								<xs:element name="affectLimit">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -184,36 +199,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="hpConsume">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:unsignedShort">
-															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
-														</xs:extension>
-													</xs:simpleContent>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="icon">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:string">
-															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
-														</xs:extension>
-													</xs:simpleContent>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
 								<xs:element name="itemConsumeCount">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -244,6 +229,21 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
+								<xs:element name="hpConsume">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:unsignedShort">
+															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+														</xs:extension>
+													</xs:simpleContent>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
 								<xs:element name="isMagic">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -523,7 +523,7 @@
 															</xs:complexType>
 														</xs:element>
 														<xs:element minOccurs="0" name="classId" type="xs:string" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillLevel" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
@@ -1236,8 +1236,8 @@
 																						<xs:complexType>
 																							<xs:attribute name="id" type="xs:unsignedShort" use="required" />
 																							<xs:attribute name="count" type="xs:unsignedInt" use="required" />
-																							<xs:attribute name="minEnchant" type="xs:unsignedInt" />
-																							<xs:attribute name="maxEnchant" type="xs:unsignedInt" />
+																							<xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" />
+																							<xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" />
 																						</xs:complexType>
 																					</xs:element>
 																				</xs:sequence>
@@ -2182,9 +2182,10 @@
 											<xs:element maxOccurs="unbounded" name="condition">
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
+														<xs:element minOccurs="0" name="alignment" type="xs:string" />
 														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="percentType" type="xs:string" />
-														<xs:element minOccurs="0" name="alignment" type="xs:string" />
+														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="classIds">
 															<xs:complexType>
 																<xs:sequence>
@@ -2455,7 +2456,7 @@
 										<xs:sequence>
 											<xs:element maxOccurs="unbounded" name="effect">
 												<xs:complexType>
-													<xs:sequence>
+													<xs:sequence minOccurs="0">
 														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="skillLevel" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="fullLethal" type="xs:unsignedByte" />
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10300-10399.xml
index 02f57575f6..47a7e551ea 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10300-10399.xml
@@ -1039,7 +1039,7 @@
 		<!-- Power of skills that consume Momentum increase by $s1. -->
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="OpCheckSkill">
 				<skillId>261</skillId> <!-- Triple Sonic Slash -->
 				<skillId>10258</skillId> <!-- Armor Destruction -->
@@ -1050,7 +1050,7 @@
 				<skillId>10318</skillId> <!-- Sonic Flash -->
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PhysicalSkillPower">
 				<amount>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19000-19099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19000-19099.xml
index cfd2c2aaae..b7d8f1c5f9 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19000-19099.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19000-19099.xml
@@ -303,14 +303,14 @@
 		<!-- Increases P. Atk. and P. Def. when HP is below 30%. Applies after the lord stage. -->
 		<icon>icon.skill19011</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="CanUseInBattlefield" />
 			<condition name="RemainHpPer">
 				<amount>30</amount>
 				<percentType>LESS</percentType>
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PAtk">
 				<amount>30</amount>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/21300-21399.xml
index 27ad1d8ec2..42edcabb7a 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/21300-21399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/21300-21399.xml
@@ -1664,13 +1664,13 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
-		<conditions>
+		<passiveConditions>
 			<condition name="RemainHpPer">
 				<amount>90</amount>
 				<percentType>MORE</percentType>
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>20</amount>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/skills.xsd b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/skills.xsd
index fe3b13627c..eb9569b38f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/skills.xsd
@@ -7,6 +7,21 @@
 					<xs:complexType mixed="true">
 						<xs:sequence>
 							<xs:choice maxOccurs="unbounded">
+								<xs:element name="icon">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:string">
+															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+														</xs:extension>
+													</xs:simpleContent>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
 								<xs:element name="affectLimit">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -188,36 +203,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="hpConsume">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:unsignedShort">
-															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
-														</xs:extension>
-													</xs:simpleContent>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="icon">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:string">
-															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
-														</xs:extension>
-													</xs:simpleContent>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
 								<xs:element name="itemConsumeCount">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -248,6 +233,21 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
+								<xs:element name="hpConsume">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:unsignedShort">
+															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+														</xs:extension>
+													</xs:simpleContent>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
 								<xs:element name="isMagic">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -527,7 +527,7 @@
 															</xs:complexType>
 														</xs:element>
 														<xs:element minOccurs="0" name="classId" type="xs:string" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillLevel" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
@@ -1240,8 +1240,8 @@
 																						<xs:complexType>
 																							<xs:attribute name="id" type="xs:unsignedShort" use="required" />
 																							<xs:attribute name="count" type="xs:unsignedInt" use="required" />
-																							<xs:attribute name="minEnchant" type="xs:unsignedInt" />
-																							<xs:attribute name="maxEnchant" type="xs:unsignedInt" />
+																							<xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" />
+																							<xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" />
 																						</xs:complexType>
 																					</xs:element>
 																				</xs:sequence>
@@ -2242,9 +2242,10 @@
 											<xs:element maxOccurs="unbounded" name="condition">
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
+														<xs:element minOccurs="0" name="alignment" type="xs:string" />
 														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="percentType" type="xs:string" />
-														<xs:element minOccurs="0" name="alignment" type="xs:string" />
+														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="classIds">
 															<xs:complexType>
 																<xs:sequence>
@@ -2550,7 +2551,7 @@
 										<xs:sequence>
 											<xs:element maxOccurs="unbounded" name="effect">
 												<xs:complexType>
-													<xs:sequence>
+													<xs:sequence minOccurs="0">
 														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="skillLevel" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="fullLethal" type="xs:unsignedByte" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10300-10399.xml
index 1cd2391108..3daaa5bd84 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10300-10399.xml
@@ -1040,7 +1040,7 @@
 		<!-- Power of skills that consume Momentum increase by $s1. -->
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="OpCheckSkill">
 				<skillId>261</skillId> <!-- Triple Sonic Slash -->
 				<skillId>10258</skillId> <!-- Armor Destruction -->
@@ -1051,7 +1051,7 @@
 				<skillId>10318</skillId> <!-- Sonic Flash -->
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PhysicalSkillPower">
 				<amount>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19000-19099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19000-19099.xml
index 415588651d..d314fa96ef 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19000-19099.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19000-19099.xml
@@ -303,14 +303,14 @@
 		<!-- Increases P. Atk. and P. Def. when HP is below 30%. Applies after the lord stage. -->
 		<icon>icon.skill19011</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="CanUseInBattlefield" />
 			<condition name="RemainHpPer">
 				<amount>30</amount>
 				<percentType>LESS</percentType>
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PAtk">
 				<amount>30</amount>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/21300-21399.xml
index dd3a9721d7..086f192d6c 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/21300-21399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/21300-21399.xml
@@ -1664,13 +1664,13 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
-		<conditions>
+		<passiveConditions>
 			<condition name="RemainHpPer">
 				<amount>90</amount>
 				<percentType>MORE</percentType>
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>20</amount>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/skills.xsd b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/skills.xsd
index d66cb9b0c0..c7e3bcac9d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/skills.xsd
@@ -7,6 +7,21 @@
 					<xs:complexType mixed="true">
 						<xs:sequence>
 							<xs:choice maxOccurs="unbounded">
+								<xs:element name="icon">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:string">
+															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+														</xs:extension>
+													</xs:simpleContent>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
 								<xs:element name="affectLimit">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -188,36 +203,6 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="hpConsume">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:unsignedShort">
-															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
-														</xs:extension>
-													</xs:simpleContent>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-								<xs:element name="icon">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
-											<xs:element maxOccurs="unbounded" name="value">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:string">
-															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
-														</xs:extension>
-													</xs:simpleContent>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
 								<xs:element name="itemConsumeCount">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -248,6 +233,21 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
+								<xs:element name="hpConsume">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element maxOccurs="unbounded" name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:unsignedShort">
+															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+														</xs:extension>
+													</xs:simpleContent>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
 								<xs:element name="isMagic">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -527,7 +527,7 @@
 															</xs:complexType>
 														</xs:element>
 														<xs:element minOccurs="0" name="classId" type="xs:string" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillLevel" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
@@ -1272,8 +1272,8 @@
 																						<xs:complexType>
 																							<xs:attribute name="id" type="xs:unsignedShort" use="required" />
 																							<xs:attribute name="count" type="xs:unsignedInt" use="required" />
-																							<xs:attribute name="minEnchant" type="xs:unsignedInt" />
-																							<xs:attribute name="maxEnchant" type="xs:unsignedInt" />
+																							<xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" />
+																							<xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" />
 																						</xs:complexType>
 																					</xs:element>
 																				</xs:sequence>
@@ -2274,9 +2274,10 @@
 											<xs:element maxOccurs="unbounded" name="condition">
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
+														<xs:element minOccurs="0" name="alignment" type="xs:string" />
 														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="percentType" type="xs:string" />
-														<xs:element minOccurs="0" name="alignment" type="xs:string" />
+														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="classIds">
 															<xs:complexType>
 																<xs:sequence>
@@ -2582,7 +2583,7 @@
 										<xs:sequence>
 											<xs:element maxOccurs="unbounded" name="effect">
 												<xs:complexType>
-													<xs:sequence>
+													<xs:sequence minOccurs="0">
 														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="skillLevel" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="fullLethal" type="xs:unsignedByte" />
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10300-10399.xml
index 2d0a4e73bb..1279922569 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10300-10399.xml
@@ -1053,7 +1053,7 @@
 		<!-- Power of skills that consume Momentum increase by $s1. -->
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="OpCheckSkill">
 				<skillId>261</skillId> <!-- Triple Sonic Slash -->
 				<skillId>10258</skillId> <!-- Armor Destruction -->
@@ -1064,7 +1064,7 @@
 				<skillId>10318</skillId> <!-- Sonic Flash -->
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PhysicalSkillPower">
 				<amount>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19000-19099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19000-19099.xml
index 7c20a07519..0a72d1523f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19000-19099.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19000-19099.xml
@@ -303,14 +303,14 @@
 		<!-- Increases P. Atk. and P. Def. when HP is below 30%. Applies after the lord stage. -->
 		<icon>icon.skill19011</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="CanUseInBattlefield" />
 			<condition name="RemainHpPer">
 				<amount>30</amount>
 				<percentType>LESS</percentType>
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PAtk">
 				<amount>30</amount>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml
index 9221a613d7..1b04b2552c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml
@@ -1845,13 +1845,13 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
-		<conditions>
+		<passiveConditions>
 			<condition name="RemainHpPer">
 				<amount>90</amount>
 				<percentType>MORE</percentType>
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>20</amount>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/35100-35199.xml
index 38d0658ae9..41f208ea3e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/35100-35199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/35100-35199.xml
@@ -263,6 +263,29 @@
 				</amount>
 				<stat>CHA</stat>
 			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">5</value>
+					<value level="3">5</value>
+				</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="AttackAttributeAdd">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">50</value>
+					<value level="3">50</value>
+				</amount>
+			</effect>
+			<effect name="VitalityExpRate">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">10</value>
+					<value level="3">10</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="35109" toLevel="5" name="Circlet of Foresight Enchant Effect">
@@ -679,21 +702,21 @@
 		<effects>
 			<effect name="DefenceCriticalDamage">
 				<amount>
-					<value level="1">3</value>
-					<value level="2">5</value>
-					<value level="3">7</value>
-					<value level="4">10</value>
-					<value level="5">15</value>
+					<value level="1">-3</value>
+					<value level="2">-5</value>
+					<value level="3">-7</value>
+					<value level="4">-10</value>
+					<value level="5">-15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="DefenceMagicCriticalDamage">
 				<amount>
-					<value level="1">3</value>
-					<value level="2">5</value>
-					<value level="3">7</value>
-					<value level="4">10</value>
-					<value level="5">15</value>
+					<value level="1">-3</value>
+					<value level="2">-5</value>
+					<value level="3">-7</value>
+					<value level="4">-10</value>
+					<value level="5">-15</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
@@ -825,11 +848,47 @@
 		<!-- Damage to Immobilized Targets + $s1 -->
 		<icon>Icon.bm_mineral_circlet_hair_acc</icon>
 		<operateType>P</operateType>
+		<passiveConditions>
+			<condition name="OpCheckAbnormal">
+				<type>STUN</type>
+				<level>1</level>
+				<hasAbnormal>true</hasAbnormal>
+				<affectType>TARGET</affectType>
+			</condition>
+		</passiveConditions>
+		<effects>
+			<effect name="MAtk">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PAtk">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="35122" toLevel="1" name="Circlet Spirit Stone Augmentation Effect">
 		<!-- Received Damage When Immobilized - $s1 -->
 		<icon>Icon.bm_mineral_circlet_hair_acc</icon>
 		<operateType>P</operateType>
+		<passiveConditions>
+			<condition name="OpCheckAbnormal">
+				<type>STUN</type>
+				<level>1</level>
+				<hasAbnormal>true</hasAbnormal>
+				<affectType>CASTER</affectType>
+			</condition>
+		</passiveConditions>
+		<effects>
+			<effect name="PhysicalDefence">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="35123" toLevel="1" name="Circlet Spirit Stone Augmentation Effect">
 		<!-- P. Atk. + $s1 -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd
index ac31fac1b7..695e76fb41 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd
@@ -529,7 +529,7 @@
 															</xs:complexType>
 														</xs:element>
 														<xs:element minOccurs="0" name="classId" type="xs:string" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillLevel" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
@@ -658,8 +658,8 @@
 									</xs:complexType>
 								</xs:element>
 								<xs:element name="effects">
-									<xs:complexType mixed="true">
-										<xs:sequence minOccurs="0">
+									<xs:complexType>
+										<xs:sequence>
 											<xs:element minOccurs="0" name="dispel">
 												<xs:complexType>
 													<xs:sequence>
@@ -1122,7 +1122,6 @@
 																			</xs:complexType>
 																		</xs:element>
 																	</xs:sequence>
-																	<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
 																</xs:complexType>
 															</xs:element>
 															<xs:element name="accuracyAmount" type="xs:unsignedByte" />
@@ -1289,8 +1288,8 @@
 																						<xs:complexType>
 																							<xs:attribute name="id" type="xs:unsignedShort" use="required" />
 																							<xs:attribute name="count" type="xs:unsignedInt" use="required" />
-																							<xs:attribute name="minEnchant" type="xs:unsignedInt" />
-																							<xs:attribute name="maxEnchant" type="xs:unsignedInt" />
+																							<xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" />
+																							<xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" />
 																						</xs:complexType>
 																					</xs:element>
 																				</xs:sequence>
@@ -2241,13 +2240,14 @@
 											<xs:element maxOccurs="unbounded" name="condition">
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
-														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
-														<xs:element minOccurs="0" name="percentType" type="xs:string" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
 														<xs:element minOccurs="0" name="level" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasAbnormal" type="xs:boolean" />
 														<xs:element minOccurs="0" name="L2Object" type="xs:string" />
 														<xs:element minOccurs="0" name="alignment" type="xs:string" />
+														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
+														<xs:element minOccurs="0" name="percentType" type="xs:string" />
+														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="classIds">
 															<xs:complexType>
 																<xs:sequence>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10300-10399.xml
index 99040f1e35..712a328a7f 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10300-10399.xml
@@ -1053,7 +1053,7 @@
 		<!-- Power of skills that consume Momentum increases by $s1. -->
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="OpCheckSkill">
 				<skillId>261</skillId> <!-- Triple Sonic Slash -->
 				<skillId>10258</skillId> <!-- Armor Destruction -->
@@ -1064,7 +1064,7 @@
 				<skillId>10318</skillId> <!-- Sonic Flash -->
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PhysicalSkillPower">
 				<amount>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19000-19099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19000-19099.xml
index a82e8f33b7..a247e2dab5 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19000-19099.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19000-19099.xml
@@ -310,14 +310,14 @@
 		<!-- Increases P. Atk. and P. Def. when HP is below 30%. Applies after the lord stage. -->
 		<icon>icon.skill19011</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="CanUseInBattlefield" />
 			<condition name="RemainHpPer">
 				<amount>30</amount>
 				<percentType>LESS</percentType>
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PAtk">
 				<amount>30</amount>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/21300-21399.xml
index 86d782f25f..1fbf44afee 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/21300-21399.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/21300-21399.xml
@@ -1845,13 +1845,13 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
-		<conditions>
+		<passiveConditions>
 			<condition name="RemainHpPer">
 				<amount>90</amount>
 				<percentType>MORE</percentType>
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>20</amount>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/35100-35199.xml
index 8ed86394e4..8da984a892 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/35100-35199.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/35100-35199.xml
@@ -848,14 +848,14 @@
 		<!-- Damage to Immobilized Targets +$s1. -->
 		<icon>Icon.bm_mineral_circlet_hair_acc</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="OpCheckAbnormal">
 				<type>STUN</type>
 				<level>1</level>
 				<hasAbnormal>true</hasAbnormal>
 				<affectType>TARGET</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="MAtk">
 				<amount>5</amount>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd
index 89dec2cd7d..581a24af54 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd
@@ -318,9 +318,7 @@
 												<xs:complexType>
 													<xs:simpleContent>
 														<xs:extension base="xs:string">
-															<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
 														</xs:extension>
 													</xs:simpleContent>
 												</xs:complexType>
@@ -529,7 +527,7 @@
 															</xs:complexType>
 														</xs:element>
 														<xs:element minOccurs="0" name="classId" type="xs:string" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillLevel" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
@@ -2242,13 +2240,16 @@
 											<xs:element maxOccurs="unbounded" name="condition">
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
-														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
-														<xs:element minOccurs="0" name="percentType" type="xs:string" />
+														<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
 														<xs:element minOccurs="0" name="level" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasAbnormal" type="xs:boolean" />
 														<xs:element minOccurs="0" name="L2Object" type="xs:string" />
 														<xs:element minOccurs="0" name="alignment" type="xs:string" />
+														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
+														<xs:element minOccurs="0" name="percentType" type="xs:string" />
+														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
 														<xs:element minOccurs="0" name="classIds">
 															<xs:complexType>
 																<xs:sequence>
@@ -2504,7 +2505,7 @@
 										<xs:sequence>
 											<xs:element maxOccurs="unbounded" name="effect">
 												<xs:complexType>
-													<xs:sequence>
+													<xs:sequence minOccurs="0">
 														<xs:element minOccurs="0" name="power">
 															<xs:complexType>
 																<xs:sequence>
@@ -2853,13 +2854,13 @@
 								<xs:element name="abnormalResists" type="xs:string" />
 								<xs:element name="isTriggeredSkill" type="xs:boolean" />
 								<xs:element name="deleteAbnormalOnLeave" type="xs:boolean" />
+								<xs:element name="abnormalLevel" type="xs:unsignedByte" />
 								<xs:element name="reuseDelayType" type="xs:string" />
 								<xs:element name="withoutAction" type="xs:boolean" />
 								<xs:element name="isMentoring" type="xs:boolean" />
 								<xs:element name="handler" type="xs:string" />
 								<xs:element name="blockActionUseSkill" type="xs:boolean" />
 								<xs:element name="is_destroyable" type="xs:boolean" />
-								<xs:element name="abnormalLevel" type="xs:unsignedByte" />
 								<xs:element name="magicLevel">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -2917,10 +2918,10 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="clanRepConsume" type="xs:unsignedShort" />
 								<xs:element name="targetScope" type="xs:string" />
 								<xs:element name="chance" type="xs:unsignedByte" />
 								<xs:element name="famePointConsume" type="xs:unsignedShort" />
+								<xs:element name="clanRepConsume" type="xs:unsignedShort" />
 								<xs:element name="resetQuest" type="xs:string" />
 								<xs:element name="despawnDelay" type="xs:unsignedInt" />
 							</xs:choice>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10300-10399.xml
index 46d8c37c9c..6e35fd7230 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10300-10399.xml
@@ -1048,7 +1048,7 @@
 		<!-- Power of skills that consume Momentum +$s1. -->
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="OpCheckSkill">
 				<skillId>261</skillId> <!-- Triple Sonic Slash -->
 				<skillId>10258</skillId> <!-- Armor Destruction -->
@@ -1059,7 +1059,7 @@
 				<skillId>10318</skillId> <!-- Sonic Flash -->
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PhysicalSkillPower">
 				<amount>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19000-19099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19000-19099.xml
index 65dedcbc79..2d60d51bee 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19000-19099.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19000-19099.xml
@@ -310,14 +310,14 @@
 		<!-- Increases P. Atk. and P. Def. when HP is below 30%. Applies after the lord stage. -->
 		<icon>icon.skill19011</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="CanUseInBattlefield" />
 			<condition name="RemainHpPer">
 				<amount>30</amount>
 				<percentType>LESS</percentType>
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PAtk">
 				<amount>30</amount>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/21300-21399.xml
index 4cae46ac10..2ad3a30fd2 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/21300-21399.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/21300-21399.xml
@@ -1845,13 +1845,13 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
-		<conditions>
+		<passiveConditions>
 			<condition name="RemainHpPer">
 				<amount>90</amount>
 				<percentType>MORE</percentType>
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>20</amount>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35100-35199.xml
index 3be9c9d774..575517fe80 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35100-35199.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35100-35199.xml
@@ -848,14 +848,14 @@
 		<!-- Damage to Immobilized Targets +$s1. -->
 		<icon>Icon.bm_mineral_circlet_hair_acc</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="OpCheckAbnormal">
 				<type>STUN</type>
 				<level>1</level>
 				<hasAbnormal>true</hasAbnormal>
 				<affectType>TARGET</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="MAtk">
 				<amount>5</amount>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd
index 6a70660bda..581a24af54 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd
@@ -318,9 +318,7 @@
 												<xs:complexType>
 													<xs:simpleContent>
 														<xs:extension base="xs:string">
-															<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
 														</xs:extension>
 													</xs:simpleContent>
 												</xs:complexType>
@@ -529,7 +527,7 @@
 															</xs:complexType>
 														</xs:element>
 														<xs:element minOccurs="0" name="classId" type="xs:string" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillLevel" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
@@ -2242,13 +2240,16 @@
 											<xs:element maxOccurs="unbounded" name="condition">
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
-														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
-														<xs:element minOccurs="0" name="percentType" type="xs:string" />
+														<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
 														<xs:element minOccurs="0" name="level" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasAbnormal" type="xs:boolean" />
 														<xs:element minOccurs="0" name="L2Object" type="xs:string" />
 														<xs:element minOccurs="0" name="alignment" type="xs:string" />
+														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
+														<xs:element minOccurs="0" name="percentType" type="xs:string" />
+														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
 														<xs:element minOccurs="0" name="classIds">
 															<xs:complexType>
 																<xs:sequence>
@@ -2265,12 +2266,9 @@
 														</xs:element>
 														<xs:element minOccurs="0" name="minLevel" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="maxLevel" type="xs:unsignedByte" />
-														<xs:element minOccurs="0" name="includeMe" type="xs:boolean" />
-														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
-														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
-														<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="affectType" type="xs:string" />
 														<xs:element minOccurs="0" name="isWithin" type="xs:boolean" />
+														<xs:element minOccurs="0" name="includeMe" type="xs:boolean" />
 														<xs:element minOccurs="0" name="weaponType">
 															<xs:complexType>
 																<xs:sequence>
@@ -2507,7 +2505,7 @@
 										<xs:sequence>
 											<xs:element maxOccurs="unbounded" name="effect">
 												<xs:complexType>
-													<xs:sequence>
+													<xs:sequence minOccurs="0">
 														<xs:element minOccurs="0" name="power">
 															<xs:complexType>
 																<xs:sequence>
@@ -2856,13 +2854,13 @@
 								<xs:element name="abnormalResists" type="xs:string" />
 								<xs:element name="isTriggeredSkill" type="xs:boolean" />
 								<xs:element name="deleteAbnormalOnLeave" type="xs:boolean" />
+								<xs:element name="abnormalLevel" type="xs:unsignedByte" />
 								<xs:element name="reuseDelayType" type="xs:string" />
 								<xs:element name="withoutAction" type="xs:boolean" />
 								<xs:element name="isMentoring" type="xs:boolean" />
 								<xs:element name="handler" type="xs:string" />
 								<xs:element name="blockActionUseSkill" type="xs:boolean" />
 								<xs:element name="is_destroyable" type="xs:boolean" />
-								<xs:element name="abnormalLevel" type="xs:unsignedByte" />
 								<xs:element name="magicLevel">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -2920,10 +2918,10 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="clanRepConsume" type="xs:unsignedShort" />
 								<xs:element name="targetScope" type="xs:string" />
 								<xs:element name="chance" type="xs:unsignedByte" />
 								<xs:element name="famePointConsume" type="xs:unsignedShort" />
+								<xs:element name="clanRepConsume" type="xs:unsignedShort" />
 								<xs:element name="resetQuest" type="xs:string" />
 								<xs:element name="despawnDelay" type="xs:unsignedInt" />
 							</xs:choice>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10300-10399.xml
index 6b2f20828e..c4e8ae30a3 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10300-10399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10300-10399.xml
@@ -1075,7 +1075,7 @@
 		<!-- Power of skills that consume Momentum +$s1. -->
 		<icon>icon.skill10324</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="OpCheckSkill">
 				<skillId>261</skillId> <!-- Triple Sonic Slash -->
 				<skillId>10258</skillId> <!-- Armor Destruction -->
@@ -1086,7 +1086,7 @@
 				<skillId>10318</skillId> <!-- Sonic Flash -->
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PhysicalSkillPower">
 				<amount>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19000-19099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19000-19099.xml
index 31db66a0c2..caa453f197 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19000-19099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19000-19099.xml
@@ -310,14 +310,14 @@
 		<!-- Increases P. Atk. and P. Def. when HP is below 30%. Applies after the lord stage. -->
 		<icon>icon.skill19011</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="CanUseInBattlefield" />
 			<condition name="RemainHpPer">
 				<amount>30</amount>
 				<percentType>LESS</percentType>
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PAtk">
 				<amount>30</amount>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/21300-21399.xml
index 88692617df..3cdbcb3586 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/21300-21399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/21300-21399.xml
@@ -1845,13 +1845,13 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
-		<conditions>
+		<passiveConditions>
 			<condition name="RemainHpPer">
 				<amount>90</amount>
 				<percentType>MORE</percentType>
 				<affectType>CASTER</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>20</amount>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml
index 5c52cd7ca9..15820cc74f 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml
@@ -897,14 +897,14 @@
 		<!-- Damage to Immobilized Targets +5%. -->
 		<icon>Icon.bm_mineral_circlet_hair_acc</icon>
 		<operateType>P</operateType>
-		<conditions>
+		<passiveConditions>
 			<condition name="OpCheckAbnormal">
 				<type>STUN</type>
 				<level>1</level>
 				<hasAbnormal>true</hasAbnormal>
 				<affectType>TARGET</affectType>
 			</condition>
-		</conditions>
+		</passiveConditions>
 		<effects>
 			<effect name="MAtk">
 				<amount>5</amount>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
index 6a70660bda..581a24af54 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
@@ -318,9 +318,7 @@
 												<xs:complexType>
 													<xs:simpleContent>
 														<xs:extension base="xs:string">
-															<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-															<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
 														</xs:extension>
 													</xs:simpleContent>
 												</xs:complexType>
@@ -529,7 +527,7 @@
 															</xs:complexType>
 														</xs:element>
 														<xs:element minOccurs="0" name="classId" type="xs:string" />
-														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillLevel" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
@@ -2242,13 +2240,16 @@
 											<xs:element maxOccurs="unbounded" name="condition">
 												<xs:complexType>
 													<xs:sequence minOccurs="0">
-														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
-														<xs:element minOccurs="0" name="percentType" type="xs:string" />
+														<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="type" type="xs:string" />
 														<xs:element minOccurs="0" name="level" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="hasAbnormal" type="xs:boolean" />
 														<xs:element minOccurs="0" name="L2Object" type="xs:string" />
 														<xs:element minOccurs="0" name="alignment" type="xs:string" />
+														<xs:element minOccurs="0" name="amount" type="xs:unsignedByte" />
+														<xs:element minOccurs="0" name="percentType" type="xs:string" />
+														<xs:element minOccurs="0" maxOccurs="unbounded" name="skillId" type="xs:unsignedShort" />
+														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
 														<xs:element minOccurs="0" name="classIds">
 															<xs:complexType>
 																<xs:sequence>
@@ -2265,12 +2266,9 @@
 														</xs:element>
 														<xs:element minOccurs="0" name="minLevel" type="xs:unsignedByte" />
 														<xs:element minOccurs="0" name="maxLevel" type="xs:unsignedByte" />
-														<xs:element minOccurs="0" name="includeMe" type="xs:boolean" />
-														<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
-														<xs:element minOccurs="0" name="hasLearned" type="xs:boolean" />
-														<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
 														<xs:element minOccurs="0" name="affectType" type="xs:string" />
 														<xs:element minOccurs="0" name="isWithin" type="xs:boolean" />
+														<xs:element minOccurs="0" name="includeMe" type="xs:boolean" />
 														<xs:element minOccurs="0" name="weaponType">
 															<xs:complexType>
 																<xs:sequence>
@@ -2507,7 +2505,7 @@
 										<xs:sequence>
 											<xs:element maxOccurs="unbounded" name="effect">
 												<xs:complexType>
-													<xs:sequence>
+													<xs:sequence minOccurs="0">
 														<xs:element minOccurs="0" name="power">
 															<xs:complexType>
 																<xs:sequence>
@@ -2856,13 +2854,13 @@
 								<xs:element name="abnormalResists" type="xs:string" />
 								<xs:element name="isTriggeredSkill" type="xs:boolean" />
 								<xs:element name="deleteAbnormalOnLeave" type="xs:boolean" />
+								<xs:element name="abnormalLevel" type="xs:unsignedByte" />
 								<xs:element name="reuseDelayType" type="xs:string" />
 								<xs:element name="withoutAction" type="xs:boolean" />
 								<xs:element name="isMentoring" type="xs:boolean" />
 								<xs:element name="handler" type="xs:string" />
 								<xs:element name="blockActionUseSkill" type="xs:boolean" />
 								<xs:element name="is_destroyable" type="xs:boolean" />
-								<xs:element name="abnormalLevel" type="xs:unsignedByte" />
 								<xs:element name="magicLevel">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
@@ -2920,10 +2918,10 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="clanRepConsume" type="xs:unsignedShort" />
 								<xs:element name="targetScope" type="xs:string" />
 								<xs:element name="chance" type="xs:unsignedByte" />
 								<xs:element name="famePointConsume" type="xs:unsignedShort" />
+								<xs:element name="clanRepConsume" type="xs:unsignedShort" />
 								<xs:element name="resetQuest" type="xs:string" />
 								<xs:element name="despawnDelay" type="xs:unsignedInt" />
 							</xs:choice>