diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/enums/AttributeType.java
index d5266c07ef..0a7375cd1b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/enums/AttributeType.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/enums/AttributeType.java
@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
  */
 public enum AttributeType
 {
-	NONE_ARMOR(-2),
-	NONE(-1),
+	NONE(-2),
 	FIRE(0),
 	WATER(1),
 	WIND(2),
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
index d787762401..fa0ce188b5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
 		_itemId = stone.getDisplayId();
 		_count = stone.getCount();
 		_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
-		if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR))
+		if (_atribute == AttributeType.NONE)
 		{
 			throw new IllegalArgumentException("Undefined Atribute item: " + stone);
 		}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/AttributeType.java
index d5266c07ef..0a7375cd1b 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/AttributeType.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/AttributeType.java
@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
  */
 public enum AttributeType
 {
-	NONE_ARMOR(-2),
-	NONE(-1),
+	NONE(-2),
 	FIRE(0),
 	WATER(1),
 	WIND(2),
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
index d787762401..fa0ce188b5 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
 		_itemId = stone.getDisplayId();
 		_count = stone.getCount();
 		_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
-		if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR))
+		if (_atribute == AttributeType.NONE)
 		{
 			throw new IllegalArgumentException("Undefined Atribute item: " + stone);
 		}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/enums/AttributeType.java
index d5266c07ef..0a7375cd1b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/enums/AttributeType.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/enums/AttributeType.java
@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
  */
 public enum AttributeType
 {
-	NONE_ARMOR(-2),
-	NONE(-1),
+	NONE(-2),
 	FIRE(0),
 	WATER(1),
 	WIND(2),
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
index d787762401..fa0ce188b5 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
 		_itemId = stone.getDisplayId();
 		_count = stone.getCount();
 		_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
-		if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR))
+		if (_atribute == AttributeType.NONE)
 		{
 			throw new IllegalArgumentException("Undefined Atribute item: " + stone);
 		}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/enums/AttributeType.java
index d5266c07ef..0a7375cd1b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/enums/AttributeType.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/enums/AttributeType.java
@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
  */
 public enum AttributeType
 {
-	NONE_ARMOR(-2),
-	NONE(-1),
+	NONE(-2),
 	FIRE(0),
 	WATER(1),
 	WIND(2),
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
index d787762401..fa0ce188b5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
 		_itemId = stone.getDisplayId();
 		_count = stone.getCount();
 		_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
-		if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR))
+		if (_atribute == AttributeType.NONE)
 		{
 			throw new IllegalArgumentException("Undefined Atribute item: " + stone);
 		}
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/enums/AttributeType.java
index d5266c07ef..0a7375cd1b 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/enums/AttributeType.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/enums/AttributeType.java
@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
  */
 public enum AttributeType
 {
-	NONE_ARMOR(-2),
-	NONE(-1),
+	NONE(-2),
 	FIRE(0),
 	WATER(1),
 	WIND(2),
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
index d787762401..fa0ce188b5 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
 		_itemId = stone.getDisplayId();
 		_count = stone.getCount();
 		_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
-		if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR))
+		if (_atribute == AttributeType.NONE)
 		{
 			throw new IllegalArgumentException("Undefined Atribute item: " + stone);
 		}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/enums/AttributeType.java
index d5266c07ef..0a7375cd1b 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/enums/AttributeType.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/enums/AttributeType.java
@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
  */
 public enum AttributeType
 {
-	NONE_ARMOR(-2),
-	NONE(-1),
+	NONE(-2),
 	FIRE(0),
 	WATER(1),
 	WIND(2),
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
index d787762401..fa0ce188b5 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
 		_itemId = stone.getDisplayId();
 		_count = stone.getCount();
 		_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
-		if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR))
+		if (_atribute == AttributeType.NONE)
 		{
 			throw new IllegalArgumentException("Undefined Atribute item: " + stone);
 		}
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/enums/AttributeType.java
index d5266c07ef..0a7375cd1b 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/enums/AttributeType.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/enums/AttributeType.java
@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
  */
 public enum AttributeType
 {
-	NONE_ARMOR(-2),
-	NONE(-1),
+	NONE(-2),
 	FIRE(0),
 	WATER(1),
 	WIND(2),
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
index d787762401..fa0ce188b5 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
 		_itemId = stone.getDisplayId();
 		_count = stone.getCount();
 		_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
-		if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR))
+		if (_atribute == AttributeType.NONE)
 		{
 			throw new IllegalArgumentException("Undefined Atribute item: " + stone);
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/enums/AttributeType.java
index d5266c07ef..0a7375cd1b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/enums/AttributeType.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/enums/AttributeType.java
@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
  */
 public enum AttributeType
 {
-	NONE_ARMOR(-2),
-	NONE(-1),
+	NONE(-2),
 	FIRE(0),
 	WATER(1),
 	WIND(2),
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
index d787762401..fa0ce188b5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
 		_itemId = stone.getDisplayId();
 		_count = stone.getCount();
 		_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
-		if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR))
+		if (_atribute == AttributeType.NONE)
 		{
 			throw new IllegalArgumentException("Undefined Atribute item: " + stone);
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/enums/AttributeType.java
index d5266c07ef..0a7375cd1b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/enums/AttributeType.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/enums/AttributeType.java
@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
  */
 public enum AttributeType
 {
-	NONE_ARMOR(-2),
-	NONE(-1),
+	NONE(-2),
 	FIRE(0),
 	WATER(1),
 	WIND(2),
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
index d787762401..fa0ce188b5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
 		_itemId = stone.getDisplayId();
 		_count = stone.getCount();
 		_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
-		if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR))
+		if (_atribute == AttributeType.NONE)
 		{
 			throw new IllegalArgumentException("Undefined Atribute item: " + stone);
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/enums/AttributeType.java
index d5266c07ef..0a7375cd1b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/enums/AttributeType.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/enums/AttributeType.java
@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
  */
 public enum AttributeType
 {
-	NONE_ARMOR(-2),
-	NONE(-1),
+	NONE(-2),
 	FIRE(0),
 	WATER(1),
 	WIND(2),
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
index d787762401..fa0ce188b5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
 		_itemId = stone.getDisplayId();
 		_count = stone.getCount();
 		_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
-		if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR))
+		if (_atribute == AttributeType.NONE)
 		{
 			throw new IllegalArgumentException("Undefined Atribute item: " + stone);
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/enums/AttributeType.java
index d5266c07ef..0a7375cd1b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/enums/AttributeType.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/enums/AttributeType.java
@@ -22,8 +22,7 @@ package com.l2jmobius.gameserver.enums;
  */
 public enum AttributeType
 {
-	NONE_ARMOR(-2),
-	NONE(-1),
+	NONE(-2),
 	FIRE(0),
 	WATER(1),
 	WIND(2),
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
index d787762401..fa0ce188b5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -42,7 +42,7 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket
 		_itemId = stone.getDisplayId();
 		_count = stone.getCount();
 		_atribute = AttributeType.findByClientId(Elementals.getItemElement(_itemId));
-		if ((_atribute == AttributeType.NONE) || (_atribute == AttributeType.NONE_ARMOR))
+		if (_atribute == AttributeType.NONE)
 		{
 			throw new IllegalArgumentException("Undefined Atribute item: " + stone);
 		}