diff --git a/trunk/dist/game/data_classic/html/admin/enchant.htm b/trunk/dist/game/data_classic/html/admin/enchant.htm
index 7044a6a67f..a0319b077a 100644
--- a/trunk/dist/game/data_classic/html/admin/enchant.htm
+++ b/trunk/dist/game/data_classic/html/admin/enchant.htm
@@ -11,7 +11,7 @@
 <font color="LEVEL">Enchant Enhancement:</font><br>
 <table width=250>
 <tr>
-<td>Enchant Value 0-65535:</td>
+<td>Enchant Value 0-127:</td>
 <td><edit var="qbox" width=75 height=12></td>
 </tr>
 </table>
diff --git a/trunk/dist/game/data_classic/xsd/MapRegion.xsd b/trunk/dist/game/data_classic/xsd/MapRegion.xsd
index b169b69387..bbb8f31355 100644
--- a/trunk/dist/game/data_classic/xsd/MapRegion.xsd
+++ b/trunk/dist/game/data_classic/xsd/MapRegion.xsd
@@ -30,7 +30,6 @@
 												<xs:enumeration value="DWARF" />
 												<xs:enumeration value="ELF" />
 												<xs:enumeration value="HUMAN" />
-												<xs:enumeration value="KAMAEL" />
 												<xs:enumeration value="ORC" />
 											</xs:restriction>
 										</xs:simpleType>
diff --git a/trunk/dist/game/data_classic/xsd/armorSets.xsd b/trunk/dist/game/data_classic/xsd/armorSets.xsd
index d20d957f35..80a2a66d2e 100644
--- a/trunk/dist/game/data_classic/xsd/armorSets.xsd
+++ b/trunk/dist/game/data_classic/xsd/armorSets.xsd
@@ -55,6 +55,18 @@
 									<xs:attribute name="level" type="xs:positiveInteger" use="required" />
 								</xs:complexType>
 							</xs:element>
+							<xs:element name="enchant7skill" maxOccurs="1" minOccurs="0">
+								<xs:complexType>
+									<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+									<xs:attribute name="level" type="xs:positiveInteger" use="required" />
+								</xs:complexType>
+							</xs:element>
+							<xs:element name="enchant8skill" maxOccurs="1" minOccurs="0">
+								<xs:complexType>
+									<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+									<xs:attribute name="level" type="xs:positiveInteger" use="required" />
+								</xs:complexType>
+							</xs:element>
 							<xs:element name="int" maxOccurs="1" minOccurs="0">
 								<xs:complexType>
 									<xs:attribute name="val" type="xs:integer" use="required" />
diff --git a/trunk/dist/game/data_classic/xsd/hennaList.xsd b/trunk/dist/game/data_classic/xsd/hennaList.xsd
index e5c58dfa8f..22d001e162 100644
--- a/trunk/dist/game/data_classic/xsd/hennaList.xsd
+++ b/trunk/dist/game/data_classic/xsd/hennaList.xsd
@@ -6,28 +6,40 @@
 				<xs:element name="henna" minOccurs="1" maxOccurs="unbounded">
 					<xs:complexType>
 						<xs:sequence minOccurs="1" maxOccurs="1">
-							<xs:element name="stats" minOccurs="1" maxOccurs="1">
+							<xs:element name="stats" minOccurs="0" maxOccurs="1">
 								<xs:complexType>
-									<xs:attribute name="str" type="xs:integer" use="required" />
-									<xs:attribute name="con" type="xs:integer" use="required" />
-									<xs:attribute name="dex" type="xs:integer" use="required" />
-									<xs:attribute name="int" type="xs:integer" use="required" />
-									<xs:attribute name="men" type="xs:integer" use="required" />
-									<xs:attribute name="wit" type="xs:integer" use="required" />
-									<xs:attribute name="luc" type="xs:integer" use="required" />
-									<xs:attribute name="cha" type="xs:integer" use="required" />
+									<xs:attribute name="str" type="xs:integer" />
+									<xs:attribute name="con" type="xs:integer" />
+									<xs:attribute name="dex" type="xs:integer" />
+									<xs:attribute name="int" type="xs:integer" />
+									<xs:attribute name="men" type="xs:integer" />
+									<xs:attribute name="wit" type="xs:integer" />
+									<xs:attribute name="luc" type="xs:integer" />
+									<xs:attribute name="cha" type="xs:integer" />
 								</xs:complexType>
 							</xs:element>
 							<xs:element name="wear" minOccurs="1" maxOccurs="1">
 								<xs:complexType>
 									<xs:attribute name="count" type="xs:positiveInteger" use="required" />
-									<xs:attribute name="fee" type="xs:positiveInteger" use="required" />
+									<xs:attribute name="fee" type="xs:integer" use="required" />
 								</xs:complexType>
 							</xs:element>
 							<xs:element name="cancel" minOccurs="1" maxOccurs="1">
 								<xs:complexType>
 									<xs:attribute name="count" type="xs:positiveInteger" use="required" />
-									<xs:attribute name="fee" type="xs:positiveInteger" use="required" />
+									<xs:attribute name="fee" type="xs:integer" use="required" />
+								</xs:complexType>
+							</xs:element>
+							<xs:element name="skills" minOccurs="0">
+								<xs:complexType>
+									<xs:sequence>
+										<xs:element name="skill">
+											<xs:complexType>
+												<xs:attribute type="xs:positiveInteger" name="id" use="required"/>
+												<xs:attribute type="xs:positiveInteger" name="level" use="required"/>
+											</xs:complexType>
+										</xs:element>
+									</xs:sequence>
 								</xs:complexType>
 							</xs:element>
 							<xs:element name="classId" minOccurs="0" maxOccurs="unbounded">
diff --git a/trunk/dist/game/data_classic/xsd/items.xsd b/trunk/dist/game/data_classic/xsd/items.xsd
index 4cf77235e7..20dc345f95 100644
--- a/trunk/dist/game/data_classic/xsd/items.xsd
+++ b/trunk/dist/game/data_classic/xsd/items.xsd
@@ -44,6 +44,7 @@
 					<xs:enumeration value="isAttackWeapon" />
 					<xs:enumeration value="isForceEquip" />
 					<xs:enumeration value="item_skill" />
+					<xs:enumeration value="equip_skill" />
 					<xs:enumeration value="allow_self_resurrection" />
 					<xs:enumeration value="material" />
 					<xs:enumeration value="mp_consume" />
@@ -103,7 +104,7 @@
 			<xs:simpleType>
 				<xs:restriction base="xs:positiveInteger">
 					<xs:minInclusive value="1" />
-					<xs:maxInclusive value="85" />
+					<xs:maxInclusive value="99" />
 				</xs:restriction>
 			</xs:simpleType>
 		</xs:attribute>
diff --git a/trunk/dist/game/data_classic/xsd/skillTrees.xsd b/trunk/dist/game/data_classic/xsd/skillTrees.xsd
index 35960bc279..f42eb91384 100644
--- a/trunk/dist/game/data_classic/xsd/skillTrees.xsd
+++ b/trunk/dist/game/data_classic/xsd/skillTrees.xsd
@@ -97,6 +97,14 @@
 											</xs:restriction>
 										</xs:simpleType>
 									</xs:attribute>
+									<xs:attribute name="getDualClassLevel">
+										<xs:simpleType>
+											<xs:restriction base="xs:positiveInteger">
+												<xs:minInclusive value="1" />
+												<xs:maxInclusive value="99" />
+											</xs:restriction>
+										</xs:simpleType>
+									</xs:attribute>
 									<xs:attribute name="learnedByFS" type="xs:boolean" />
 									<xs:attribute name="learnedByNpc" type="xs:boolean" />
 									<xs:attribute name="levelUpSp" type="xs:positiveInteger" />
diff --git a/trunk/dist/game/data_classic/xsd/skills.xsd b/trunk/dist/game/data_classic/xsd/skills.xsd
index 23d48ff143..1af15a95c3 100644
--- a/trunk/dist/game/data_classic/xsd/skills.xsd
+++ b/trunk/dist/game/data_classic/xsd/skills.xsd
@@ -112,6 +112,7 @@
 				<xs:attribute type="xs:string" name="race" use="optional" />
 				<xs:attribute type="xs:string" name="npcId" use="optional" />
 				<xs:attribute type="xs:string" name="npcType" use="optional" />
+				<xs:attribute type="xs:string" name="hp" use="optional" />
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
@@ -247,7 +248,7 @@
 				<xs:attribute type="xs:string" name="grade" use="optional" />
 				<xs:attribute type="xs:byte" name="VALAKAS" use="optional" />
 				<xs:attribute type="xs:string" name="isItem" use="optional" />
-				<xs:attribute type="xs:byte" name="skillLvl" use="optional" />
+				<xs:attribute type="xs:string" name="skillLvl" use="optional" />
 				<xs:attribute type="xs:byte" name="GUST" use="optional" />
 				<xs:attribute type="xs:byte" name="BOSS" use="optional" />
 				<xs:attribute type="xs:byte" name="PHYSICAL_BLOCKADE" use="optional" />
@@ -262,6 +263,14 @@
 				<xs:attribute type="xs:string" name="KNOCKDOWN" use="optional" />
 				<xs:attribute type="xs:integer" name="speed" use="optional" />
 				<xs:attribute type="xs:integer" name="distance" use="optional" />
+				<xs:attribute type="xs:integer" name="debuffId" use="optional" />
+				<xs:attribute type="xs:string" name="weaponTypeDec" use="optional" />
+				<xs:attribute type="xs:double" name="valueDec" use="optional" />
+				<xs:attribute type="xs:string" name="weaponTypeInc" use="optional" />
+				<xs:attribute type="xs:double" name="valueInc" use="optional" />
+				<xs:attribute type="xs:boolean" name="isLastAttack" use="optional" />
+				<xs:attribute type="xs:string" name="targetAbnormalType" use="optional" />
+				<xs:attribute type="xs:double" name="skillAddPower" use="optional" />
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
@@ -334,6 +343,8 @@
 			<xs:enumeration value="MEN" />
 			<xs:enumeration value="WIT" />
 			<xs:enumeration value="DEX" />
+			<xs:enumeration value="LUC" />
+			<xs:enumeration value="CHA" />
 			<xs:enumeration value="waterPower" />
 			<xs:enumeration value="windPower" />
 			<xs:enumeration value="firePower" />
@@ -389,6 +400,11 @@
 			<xs:enumeration value="magicSuccRes" />
 			<xs:enumeration value="reflectDamageRes" />
 			<xs:enumeration value="receivedDamageModifier" />
+			<xs:enumeration value="maxSkillDamage" />
+			<xs:enumeration value="weaponElementPower" />
+			<xs:enumeration value="hpRestoreOnKill" />
+			<xs:enumeration value="momentumSkillPower" />
+			<xs:enumeration value="maxPhysCritRate" />
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:complexType name="addType" mixed="true">
@@ -460,6 +476,7 @@
 			<xs:element name="enchant6" type="enchantType" />
 			<xs:element name="enchant7" type="enchantType" />
 			<xs:element name="enchant8" type="enchantType" />
+			<xs:element name="enchant9" type="enchantType" />
 			<xs:element name="cond" type="condType" />
 			<xs:element name="for" type="forType" />
 			<xs:element name="enchant1for" type="forType" />
@@ -473,6 +490,8 @@
 			<xs:element name="enchant4for" type="forType" />
 			<xs:element name="enchant5for" type="forType" />
 			<xs:element name="enchant6for" type="forType" />
+			<xs:element name="enchant8for" type="forType" />
+			<xs:element name="enchant9for" type="forType" />
 			<xs:element name="endEffects" type="effectsType" />
 			<xs:element name="selfEffects" type="effectsType" />
 			<xs:element name="enchant2selfEffects" type="effectsType" />
@@ -497,6 +516,7 @@
 		<xs:attribute type="xs:byte" name="enchantGroup6" use="optional" />
 		<xs:attribute type="xs:byte" name="enchantGroup7" use="optional" />
 		<xs:attribute type="xs:byte" name="enchantGroup8" use="optional" />
+		<xs:attribute type="xs:byte" name="enchantGroup9" use="optional" />
 	</xs:complexType>
 	<xs:element name="list">
 		<xs:complexType>
diff --git a/trunk/dist/game/data_classic/xsd/transformations.xsd b/trunk/dist/game/data_classic/xsd/transformations.xsd
index bd62f2f230..bdeb6797f3 100644
--- a/trunk/dist/game/data_classic/xsd/transformations.xsd
+++ b/trunk/dist/game/data_classic/xsd/transformations.xsd
@@ -357,7 +357,7 @@
 							<xs:simpleType>
 								<xs:restriction base="xs:positiveInteger">
 									<xs:minInclusive value="1" />
-									<xs:maxInclusive value="20007" />
+									<xs:maxInclusive value="20020" />
 								</xs:restriction>
 							</xs:simpleType>
 						</xs:attribute>
@@ -365,7 +365,7 @@
 							<xs:simpleType>
 								<xs:restriction base="xs:positiveInteger">
 									<xs:minInclusive value="1" />
-									<xs:maxInclusive value="20007" />
+									<xs:maxInclusive value="20020" />
 								</xs:restriction>
 							</xs:simpleType>
 						</xs:attribute>
diff --git a/trunk/dist/game/data_classic/zones/clanhall_teleport.xml b/trunk/dist/game/data_classic/zones/clanhall_teleport.xml
index 79a2f8b201..9e830e31b1 100644
--- a/trunk/dist/game/data_classic/zones/clanhall_teleport.xml
+++ b/trunk/dist/game/data_classic/zones/clanhall_teleport.xml
@@ -15,7 +15,7 @@
 		<spawn X="81321" Y="-15448" Z="-1824" /> <!-- Battlefield spawn zone -->
 		<spawn X="81415" Y="-15084" Z="-1824" />
 	</zone>
-	<zone name="bandit_stronghold_restart_territory_2" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1245" maxZ="-1250">
+	<zone name="bandit_stronghold_restart_territory_2" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1250" maxZ="-1245">
 		<stat name="residenceId" val="35" />
 		<stat name="residenceZoneId" val="1" />
 		<node X="83536" Y="-18012" />
@@ -26,7 +26,7 @@
 		<spawn X="83526" Y="-17596" Z="-1824" />
 		<spawn X="83754" Y="-17722" Z="-1824" />
 	</zone>
-	<zone name="bandit_stronghold_restart_territory_3" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1245" maxZ="-1250">
+	<zone name="bandit_stronghold_restart_territory_3" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1250" maxZ="-1245">
 		<stat name="residenceId" val="35" />
 		<stat name="residenceZoneId" val="2" />
 		<node X="81492" Y="-17235" />
@@ -37,7 +37,7 @@
 		<spawn X="81807" Y="-17161" Z="-1816" />
 		<spawn X="82142" Y="-17288" Z="-1824" />
 	</zone>
-	<zone name="bandit_stronghold_restart_territory_4" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1245" maxZ="-1250">
+	<zone name="bandit_stronghold_restart_territory_4" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1250" maxZ="-1245">
 		<stat name="residenceId" val="35" />
 		<stat name="residenceZoneId" val="3" />
 		<node X="81638" Y="-14510" />
@@ -48,7 +48,7 @@
 		<spawn X="81944" Y="-15280" Z="-1840" />
 		<spawn X="82355" Y="-15265" Z="-1848" />
 	</zone>
-	<zone name="bandit_stronghold_restart_territory_5" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1245" maxZ="-1250">
+	<zone name="bandit_stronghold_restart_territory_5" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1250" maxZ="-1245">
 		<stat name="residenceId" val="35" />
 		<stat name="residenceZoneId" val="4" />
 		<node X="83463" Y="-14772" />
@@ -59,7 +59,7 @@
 		<spawn X="83425" Y="-15055" Z="-1824" />
 		<spawn X="83712" Y="-15106" Z="-1816" />
 	</zone>
-	<zone name="bandit_stronghold_restart_territory_6" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1245" maxZ="-1250">
+	<zone name="bandit_stronghold_restart_territory_6" type="ResidenceHallTeleportZone" shape="NPoly" minZ="-1250" maxZ="-1245">
 		<stat name="residenceId" val="35" />
 		<stat name="residenceZoneId" val="5" />
 		<node X="84997" Y="-15613" />