diff --git a/trunk/dist/game/data/stats/items/17300-17399.xml b/trunk/dist/game/data/stats/items/17300-17399.xml
index 26eedc184b..13cedee213 100644
--- a/trunk/dist/game/data/stats/items/17300-17399.xml
+++ b/trunk/dist/game/data/stats/items/17300-17399.xml
@@ -228,7 +228,7 @@
 			<stat type="pDef">77</stat>
 		</stats>
 	</item>
-	<item id="17309" name="Immortal Shield" additionalName="Heavy Armor" type="Weapon">
+	<item id="17309" name="Immortal Shield" additionalName="Heavy Armor" type="Armor">
 		<!-- Bestows an attack or defense type set option. -->
 		<set name="icon" val="icon.weapon_sacon_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1073,7 +1073,7 @@
 			<stat type="pDef">85</stat>
 		</stats>
 	</item>
-	<item id="17343" name="Twilight Shield" additionalName="Heavy Armor" type="Weapon">
+	<item id="17343" name="Twilight Shield" additionalName="Heavy Armor" type="Armor">
 		<!-- Bestows an attack or defense type set option. -->
 		<set name="icon" val="icon.kratere_i00" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/17400-17499.xml b/trunk/dist/game/data/stats/items/17400-17499.xml
index 90da9ecbf1..6138d8a75d 100644
--- a/trunk/dist/game/data/stats/items/17400-17499.xml
+++ b/trunk/dist/game/data/stats/items/17400-17499.xml
@@ -19,7 +19,7 @@
 			<stat type="pDef">94</stat>
 		</stats>
 	</item>
-	<item id="17401" name="Seraph Shield" additionalName="Heavy Armor" type="Weapon">
+	<item id="17401" name="Seraph Shield" additionalName="Heavy Armor" type="Armor">
 		<!-- Bestows an attack or defense type set option. -->
 		<set name="icon" val="icon.beranka_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -863,7 +863,7 @@
 			<stat type="pDef">100</stat>
 		</stats>
 	</item>
-	<item id="17435" name="Eternal Shield" additionalName="Heavy Armor" type="Weapon">
+	<item id="17435" name="Eternal Shield" additionalName="Heavy Armor" type="Armor">
 		<!-- Bestows an attack or defense type set option. -->
 		<set name="icon" val="icon.weapon_akra_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1715,7 +1715,7 @@
 			<stat type="moveSpeed">30</stat>
 		</stats>
 	</item>
-	<item id="17469" name="Blessed Durandia Shield" additionalName="Heavy Armor" type="Weapon">
+	<item id="17469" name="Blessed Durandia Shield" additionalName="Heavy Armor" type="Armor">
 		<!-- Bestows an attack or defense type set option. -->
 		<set name="icon" val="icon.weapon_vesper_verteidiger_i01" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/17500-17599.xml b/trunk/dist/game/data/stats/items/17500-17599.xml
index 41038c1714..b9e4a070f4 100644
--- a/trunk/dist/game/data/stats/items/17500-17599.xml
+++ b/trunk/dist/game/data/stats/items/17500-17599.xml
@@ -1495,7 +1495,7 @@
 			<stat type="pDef">41</stat>
 		</stats>
 	</item>
-	<item id="17572" name="Test-Shield" type="Weapon">
+	<item id="17572" name="Test-Shield" type="Armor">
 		<set name="icon" val="icon.weapon_vesper_verteidiger_i01" />
 		<set name="default_action" val="EQUIP" />
 		<set name="bodypart" val="lhand" />
diff --git a/trunk/dist/game/data/stats/items/17800-17899.xml b/trunk/dist/game/data/stats/items/17800-17899.xml
index 1a0fb5ba55..df5480e286 100644
--- a/trunk/dist/game/data/stats/items/17800-17899.xml
+++ b/trunk/dist/game/data/stats/items/17800-17899.xml
@@ -984,7 +984,7 @@
 			<stat type="pDef">76</stat>
 		</stats>
 	</item>
-	<item id="17850" name="Bound Immortal Shield" additionalName="Heavy Armor" type="Weapon">
+	<item id="17850" name="Bound Immortal Shield" additionalName="Heavy Armor" type="Armor">
 		<!-- Bestows an attack or defense type set option. Can use an Unbind Scroll to change this item into a Standard item. -->
 		<set name="icon" val="icon.weapon_sacon_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1999,7 +1999,7 @@
 			<stat type="pDef">84</stat>
 		</stats>
 	</item>
-	<item id="17884" name="Bound Twilight Shield" additionalName="Heavy Armor" type="Weapon">
+	<item id="17884" name="Bound Twilight Shield" additionalName="Heavy Armor" type="Armor">
 		<!-- Bestows an attack or defense type set option. Can use an Unbind Scroll to change this item into a Standard item. -->
 		<set name="icon" val="icon.kratere_i00" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/17900-17999.xml b/trunk/dist/game/data/stats/items/17900-17999.xml
index abe096853e..94a642dfaf 100644
--- a/trunk/dist/game/data/stats/items/17900-17999.xml
+++ b/trunk/dist/game/data/stats/items/17900-17999.xml
@@ -606,7 +606,7 @@
 			<stat type="pDef">93</stat>
 		</stats>
 	</item>
-	<item id="17918" name="Bound Seraph Shield" additionalName="Heavy Armor" type="Weapon">
+	<item id="17918" name="Bound Seraph Shield" additionalName="Heavy Armor" type="Armor">
 		<!-- Bestows an attack or defense type set option. Can use an Unbind Scroll to change this item into a Standard item. -->
 		<set name="icon" val="icon.beranka_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1621,7 +1621,7 @@
 			<stat type="pDef">98</stat>
 		</stats>
 	</item>
-	<item id="17952" name="Bound Eternal Shield" additionalName="Heavy Armor" type="Weapon">
+	<item id="17952" name="Bound Eternal Shield" additionalName="Heavy Armor" type="Armor">
 		<!-- Bestows an attack or defense type set option. Can use an Unbind Scroll to change this item into a Standard item. -->
 		<set name="icon" val="icon.weapon_akra_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -2560,7 +2560,7 @@
 			<stat type="pDef">78</stat>
 		</stats>
 	</item>
-	<item id="17986" name="Blessed Immortal Shield" additionalName="Heavy Armor" type="Weapon">
+	<item id="17986" name="Blessed Immortal Shield" additionalName="Heavy Armor" type="Armor">
 		<!-- Bestows an attack or defense type set option. -->
 		<set name="icon" val="icon.weapon_sacon_i00" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/18000-18099.xml b/trunk/dist/game/data/stats/items/18000-18099.xml
index 4e5f57928b..e6340831d7 100644
--- a/trunk/dist/game/data/stats/items/18000-18099.xml
+++ b/trunk/dist/game/data/stats/items/18000-18099.xml
@@ -585,7 +585,7 @@
 			<stat type="pDef">87</stat>
 		</stats>
 	</item>
-	<item id="18020" name="Blessed Twilight Shield" additionalName="Heavy Armor" type="Weapon">
+	<item id="18020" name="Blessed Twilight Shield" additionalName="Heavy Armor" type="Armor">
 		<!-- Bestows an attack or defense type set option. -->
 		<set name="icon" val="icon.kratere_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1463,7 +1463,7 @@
 			<stat type="pDef">96</stat>
 		</stats>
 	</item>
-	<item id="18054" name="Blessed Seraph Shield" additionalName="Heavy Armor" type="Weapon">
+	<item id="18054" name="Blessed Seraph Shield" additionalName="Heavy Armor" type="Armor">
 		<!-- Bestows an attack or defense type set option. -->
 		<set name="icon" val="icon.beranka_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -2341,7 +2341,7 @@
 			<stat type="pDef">102</stat>
 		</stats>
 	</item>
-	<item id="18088" name="Blessed Eternal Shield" additionalName="Heavy Armor" type="Weapon">
+	<item id="18088" name="Blessed Eternal Shield" additionalName="Heavy Armor" type="Armor">
 		<!-- Bestows an attack or defense type set option. -->
 		<set name="icon" val="icon.weapon_akra_i00" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/19500-19599.xml b/trunk/dist/game/data/stats/items/19500-19599.xml
index e537d984f2..ea2ce3a74d 100644
--- a/trunk/dist/game/data/stats/items/19500-19599.xml
+++ b/trunk/dist/game/data/stats/items/19500-19599.xml
@@ -352,7 +352,7 @@
 			<stat type="pDef">77</stat>
 		</stats>
 	</item>
-	<item id="19527" name="Immortal Shield" additionalName="Attack Type / Heavy" type="Weapon">
+	<item id="19527" name="Immortal Shield" additionalName="Attack Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.weapon_sacon_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -669,7 +669,7 @@
 			<stat type="pDef">85</stat>
 		</stats>
 	</item>
-	<item id="19543" name="Twilight Shield" additionalName="Attack Type / Heavy" type="Weapon">
+	<item id="19543" name="Twilight Shield" additionalName="Attack Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.kratere_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -986,7 +986,7 @@
 			<stat type="pDef">94</stat>
 		</stats>
 	</item>
-	<item id="19559" name="Seraph Shield" additionalName="Attack Type / Heavy" type="Weapon">
+	<item id="19559" name="Seraph Shield" additionalName="Attack Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.beranka_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1303,7 +1303,7 @@
 			<stat type="pDef">100</stat>
 		</stats>
 	</item>
-	<item id="19575" name="Eternal Shield" additionalName="Attack Type / Heavy" type="Weapon">
+	<item id="19575" name="Eternal Shield" additionalName="Attack Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.weapon_akra_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1649,7 +1649,7 @@
 			<stat type="pDef">76</stat>
 		</stats>
 	</item>
-	<item id="19591" name="Bound Immortal Shield" additionalName="Attack Type / Heavy" type="Weapon">
+	<item id="19591" name="Bound Immortal Shield" additionalName="Attack Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. Can use an Unbind Scroll to change this item into a Standard item. -->
 		<set name="icon" val="icon.weapon_sacon_i00" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/19600-19699.xml b/trunk/dist/game/data/stats/items/19600-19699.xml
index 35ef63f6b2..4623af5ecd 100644
--- a/trunk/dist/game/data/stats/items/19600-19699.xml
+++ b/trunk/dist/game/data/stats/items/19600-19699.xml
@@ -173,7 +173,7 @@
 			<stat type="pDef">84</stat>
 		</stats>
 	</item>
-	<item id="19607" name="Bound Twilight Shield" additionalName="Attack Type / Heavy" type="Weapon">
+	<item id="19607" name="Bound Twilight Shield" additionalName="Attack Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. Can use an Unbind Scroll to change this item into a Standard item. -->
 		<set name="icon" val="icon.kratere_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -582,7 +582,7 @@
 			<stat type="pDef">93</stat>
 		</stats>
 	</item>
-	<item id="19623" name="Bound Seraph Shield" additionalName="Attack Type / Heavy" type="Weapon">
+	<item id="19623" name="Bound Seraph Shield" additionalName="Attack Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. Can use an Unbind Scroll to change this item into a Standard item. -->
 		<set name="icon" val="icon.beranka_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -991,7 +991,7 @@
 			<stat type="pDef">98</stat>
 		</stats>
 	</item>
-	<item id="19639" name="Bound Eternal Shield" additionalName="Attack Type / Heavy" type="Weapon">
+	<item id="19639" name="Bound Eternal Shield" additionalName="Attack Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. Can use an Unbind Scroll to change this item into a Standard item. -->
 		<set name="icon" val="icon.weapon_akra_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1376,7 +1376,7 @@
 			<stat type="pDef">78</stat>
 		</stats>
 	</item>
-	<item id="19655" name="Blessed Immortal Shield" additionalName="Attack Type / Heavy" type="Weapon">
+	<item id="19655" name="Blessed Immortal Shield" additionalName="Attack Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.weapon_sacon_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1709,7 +1709,7 @@
 			<stat type="pDef">87</stat>
 		</stats>
 	</item>
-	<item id="19671" name="Blessed Twilight Shield" additionalName="Attack Type / Heavy" type="Weapon">
+	<item id="19671" name="Blessed Twilight Shield" additionalName="Attack Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.kratere_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -2042,7 +2042,7 @@
 			<stat type="pDef">96</stat>
 		</stats>
 	</item>
-	<item id="19687" name="Blessed Seraph Shield" additionalName="Attack Type / Heavy" type="Weapon">
+	<item id="19687" name="Blessed Seraph Shield" additionalName="Attack Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.beranka_i00" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/19700-19799.xml b/trunk/dist/game/data/stats/items/19700-19799.xml
index 355c5c8dda..c639ec811c 100644
--- a/trunk/dist/game/data/stats/items/19700-19799.xml
+++ b/trunk/dist/game/data/stats/items/19700-19799.xml
@@ -58,7 +58,7 @@
 			<stat type="pDef">102</stat>
 		</stats>
 	</item>
-	<item id="19703" name="Blessed Eternal Shield" additionalName="Attack Type / Heavy" type="Weapon">
+	<item id="19703" name="Blessed Eternal Shield" additionalName="Attack Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.weapon_akra_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -394,7 +394,7 @@
 			<stat type="moveSpeed">30</stat>
 		</stats>
 	</item>
-	<item id="19719" name="Blessed Durandia Shield" additionalName="Attack Type / Heavy" type="Weapon">
+	<item id="19719" name="Blessed Durandia Shield" additionalName="Attack Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.weapon_vesper_verteidiger_i01" />
 		<set name="default_action" val="EQUIP" />
@@ -727,7 +727,7 @@
 			<stat type="pDef">77</stat>
 		</stats>
 	</item>
-	<item id="19735" name="Immortal Shield" additionalName="Defense Type / Heavy" type="Weapon">
+	<item id="19735" name="Immortal Shield" additionalName="Defense Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.weapon_sacon_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1044,7 +1044,7 @@
 			<stat type="pDef">85</stat>
 		</stats>
 	</item>
-	<item id="19751" name="Twilight Shield" additionalName="Defense Type / Heavy" type="Weapon">
+	<item id="19751" name="Twilight Shield" additionalName="Defense Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.kratere_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1361,7 +1361,7 @@
 			<stat type="pDef">94</stat>
 		</stats>
 	</item>
-	<item id="19767" name="Seraph Shield" additionalName="Defense Type / Heavy" type="Weapon">
+	<item id="19767" name="Seraph Shield" additionalName="Defense Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.beranka_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1678,7 +1678,7 @@
 			<stat type="pDef">100</stat>
 		</stats>
 	</item>
-	<item id="19783" name="Eternal Shield" additionalName="Defense Type / Heavy" type="Weapon">
+	<item id="19783" name="Eternal Shield" additionalName="Defense Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.weapon_akra_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -2024,7 +2024,7 @@
 			<stat type="pDef">76</stat>
 		</stats>
 	</item>
-	<item id="19799" name="Bound Immortal Shield" additionalName="Defense Type / Heavy" type="Weapon">
+	<item id="19799" name="Bound Immortal Shield" additionalName="Defense Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. Can use an Unbind Scroll to change this item into a Standard item. -->
 		<set name="icon" val="icon.weapon_sacon_i00" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/19800-19899.xml b/trunk/dist/game/data/stats/items/19800-19899.xml
index eeda705ee1..f17c721a7f 100644
--- a/trunk/dist/game/data/stats/items/19800-19899.xml
+++ b/trunk/dist/game/data/stats/items/19800-19899.xml
@@ -381,7 +381,7 @@
 			<stat type="pDef">84</stat>
 		</stats>
 	</item>
-	<item id="19815" name="Bound Twilight Shield" additionalName="Defense Type / Heavy" type="Weapon">
+	<item id="19815" name="Bound Twilight Shield" additionalName="Defense Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. Can use an Unbind Scroll to change this item into a Standard item. -->
 		<set name="icon" val="icon.kratere_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -790,7 +790,7 @@
 			<stat type="pDef">93</stat>
 		</stats>
 	</item>
-	<item id="19831" name="Bound Seraph Shield" additionalName="Defense Type / Heavy" type="Weapon">
+	<item id="19831" name="Bound Seraph Shield" additionalName="Defense Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. Can use an Unbind Scroll to change this item into a Standard item. -->
 		<set name="icon" val="icon.beranka_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1199,7 +1199,7 @@
 			<stat type="pDef">98</stat>
 		</stats>
 	</item>
-	<item id="19847" name="Bound Eternal Shield" additionalName="Defense Type / Heavy" type="Weapon">
+	<item id="19847" name="Bound Eternal Shield" additionalName="Defense Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. Can use an Unbind Scroll to change this item into a Standard item. -->
 		<set name="icon" val="icon.weapon_akra_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1584,7 +1584,7 @@
 			<stat type="pDef">78</stat>
 		</stats>
 	</item>
-	<item id="19863" name="Blessed Immortal Shield" additionalName="Defense Type / Heavy" type="Weapon">
+	<item id="19863" name="Blessed Immortal Shield" additionalName="Defense Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.weapon_sacon_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1917,7 +1917,7 @@
 			<stat type="pDef">87</stat>
 		</stats>
 	</item>
-	<item id="19879" name="Blessed Twilight Shield" additionalName="Defense Type / Heavy" type="Weapon">
+	<item id="19879" name="Blessed Twilight Shield" additionalName="Defense Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.kratere_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -2250,7 +2250,7 @@
 			<stat type="pDef">96</stat>
 		</stats>
 	</item>
-	<item id="19895" name="Blessed Seraph Shield" additionalName="Defense Type / Heavy" type="Weapon">
+	<item id="19895" name="Blessed Seraph Shield" additionalName="Defense Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.beranka_i00" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/19900-19999.xml b/trunk/dist/game/data/stats/items/19900-19999.xml
index 782d106d78..fb4291d829 100644
--- a/trunk/dist/game/data/stats/items/19900-19999.xml
+++ b/trunk/dist/game/data/stats/items/19900-19999.xml
@@ -223,7 +223,7 @@
 			<stat type="pDef">102</stat>
 		</stats>
 	</item>
-	<item id="19911" name="Blessed Eternal Shield" additionalName="Defense Type / Heavy" type="Weapon">
+	<item id="19911" name="Blessed Eternal Shield" additionalName="Defense Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.weapon_akra_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -559,7 +559,7 @@
 			<stat type="moveSpeed">30</stat>
 		</stats>
 	</item>
-	<item id="19927" name="Blessed Durandia Shield" additionalName="Defense Type / Heavy" type="Weapon">
+	<item id="19927" name="Blessed Durandia Shield" additionalName="Defense Type / Heavy" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.weapon_vesper_verteidiger_i01" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/32100-32199.xml b/trunk/dist/game/data/stats/items/32100-32199.xml
index fb4d70df04..70dd703679 100644
--- a/trunk/dist/game/data/stats/items/32100-32199.xml
+++ b/trunk/dist/game/data/stats/items/32100-32199.xml
@@ -1777,7 +1777,7 @@
 			<stat type="moveSpeed">15</stat>
 		</stats>
 	</item>
-	<item id="32199" name="Blessed Twilight Shield" additionalName="Attack Type" type="Weapon">
+	<item id="32199" name="Blessed Twilight Shield" additionalName="Attack Type" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.kratere_i00" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/32200-32299.xml b/trunk/dist/game/data/stats/items/32200-32299.xml
index e9bdf11a3d..68785986cd 100644
--- a/trunk/dist/game/data/stats/items/32200-32299.xml
+++ b/trunk/dist/game/data/stats/items/32200-32299.xml
@@ -322,7 +322,7 @@
 			<stat type="moveSpeed">15</stat>
 		</stats>
 	</item>
-	<item id="32215" name="Blessed Twilight Shield" additionalName="Defense Type" type="Weapon">
+	<item id="32215" name="Blessed Twilight Shield" additionalName="Defense Type" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.kratere_i00" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/33800-33899.xml b/trunk/dist/game/data/stats/items/33800-33899.xml
index 051b624adc..6d15e6b97d 100644
--- a/trunk/dist/game/data/stats/items/33800-33899.xml
+++ b/trunk/dist/game/data/stats/items/33800-33899.xml
@@ -2046,7 +2046,7 @@
 			<stat type="pDef">76</stat>
 		</stats>
 	</item>
-	<item id="33894" name="Immortal Shield" additionalName="Heavy (Event)" type="Weapon">
+	<item id="33894" name="Immortal Shield" additionalName="Heavy (Event)" type="Armor">
 		<!-- Bestows an attack or defense type set option. -->
 		<set name="icon" val="icon.weapon_sacon_i00" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/33900-33999.xml b/trunk/dist/game/data/stats/items/33900-33999.xml
index d0ca6dda04..1362c25836 100644
--- a/trunk/dist/game/data/stats/items/33900-33999.xml
+++ b/trunk/dist/game/data/stats/items/33900-33999.xml
@@ -1878,7 +1878,7 @@
 			<stat type="pDef">76</stat>
 		</stats>
 	</item>
-	<item id="33956" name="Immortal Shield" additionalName="Attack Type / Heavy (Event)" type="Weapon">
+	<item id="33956" name="Immortal Shield" additionalName="Attack Type / Heavy (Event)" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.weapon_sacon_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -2259,7 +2259,7 @@
 			<stat type="pDef">76</stat>
 		</stats>
 	</item>
-	<item id="33972" name="Immortal Shield" additionalName="Defense Type / Heavy (Event)" type="Weapon">
+	<item id="33972" name="Immortal Shield" additionalName="Defense Type / Heavy (Event)" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.weapon_sacon_i00" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/37200-37299.xml b/trunk/dist/game/data/stats/items/37200-37299.xml
index 56d70d7284..37d4e7853f 100644
--- a/trunk/dist/game/data/stats/items/37200-37299.xml
+++ b/trunk/dist/game/data/stats/items/37200-37299.xml
@@ -234,7 +234,7 @@
 			<stat type="pDef">77</stat>
 		</stats>
 	</item>
-	<item id="37212" name="Steel Immortal Shield (30-day)" type="Weapon">
+	<item id="37212" name="Steel Immortal Shield (30-day)" type="Armor">
 		<!-- Immortal Shield with limited ability enhancement (enchantment, soul crystal enhancement and augmenting). 30-day. -->
 		<set name="icon" val="icon.weapon_sacon_i00" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/45600-45699.xml b/trunk/dist/game/data/stats/items/45600-45699.xml
index d2aa11060a..0dd34bf435 100644
--- a/trunk/dist/game/data/stats/items/45600-45699.xml
+++ b/trunk/dist/game/data/stats/items/45600-45699.xml
@@ -938,7 +938,7 @@
 			<stat type="pDef">92</stat>
 		</stats>
 	</item>
-	<item id="45662" name="Dynasty Shield of Fortune" additionalName="30-day" type="Weapon">
+	<item id="45662" name="Dynasty Shield of Fortune" additionalName="30-day" type="Armor">
 		<set name="icon" val="icon.shield_dynasty_shield_i00" />
 		<set name="default_action" val="EQUIP" />
 		<set name="crystal_type" val="S" />
@@ -1387,7 +1387,7 @@
 			<stat type="pDef">85</stat>
 		</stats>
 	</item>
-	<item id="45688" name="Twilight Shield" additionalName="14-day" type="Weapon">
+	<item id="45688" name="Twilight Shield" additionalName="14-day" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.kratere_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1501,7 +1501,7 @@
 			<stat type="pDef">85</stat>
 		</stats>
 	</item>
-	<item id="45694" name="Twilight Shield" additionalName="14-day" type="Weapon">
+	<item id="45694" name="Twilight Shield" additionalName="14-day" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.kratere_i00" />
 		<set name="default_action" val="EQUIP" />
diff --git a/trunk/dist/game/data/stats/items/45700-45799.xml b/trunk/dist/game/data/stats/items/45700-45799.xml
index a3c95cb89c..7aaf80bd81 100644
--- a/trunk/dist/game/data/stats/items/45700-45799.xml
+++ b/trunk/dist/game/data/stats/items/45700-45799.xml
@@ -492,7 +492,7 @@
 			<stat type="pDef">100</stat>
 		</stats>
 	</item>
-	<item id="45728" name="Eternal Shield" additionalName="Attack Type / Heavy (14-day)" type="Weapon">
+	<item id="45728" name="Eternal Shield" additionalName="Attack Type / Heavy (14-day)" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.weapon_akra_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -606,7 +606,7 @@
 			<stat type="pDef">100</stat>
 		</stats>
 	</item>
-	<item id="45734" name="Eternal Shield" additionalName="Defense Type / Heavy (14-day)" type="Weapon">
+	<item id="45734" name="Eternal Shield" additionalName="Defense Type / Heavy (14-day)" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.weapon_akra_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1222,7 +1222,7 @@
 			<stat type="pDef">94</stat>
 		</stats>
 	</item>
-	<item id="45768" name="Seraph Shield" additionalName="Attack Type / Heavy (14-day)" type="Weapon">
+	<item id="45768" name="Seraph Shield" additionalName="Attack Type / Heavy (14-day)" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.beranka_i00" />
 		<set name="default_action" val="EQUIP" />
@@ -1336,7 +1336,7 @@
 			<stat type="pDef">94</stat>
 		</stats>
 	</item>
-	<item id="45774" name="Seraph Shield" additionalName="Defense Type / Heavy (14-day)" type="Weapon">
+	<item id="45774" name="Seraph Shield" additionalName="Defense Type / Heavy (14-day)" type="Armor">
 		<!-- Additionally increases Shield Defense. -->
 		<set name="icon" val="icon.beranka_i00" />
 		<set name="default_action" val="EQUIP" />