diff --git a/source/item.ads b/source/item.ads
index db79a13..9425836 100644
--- a/source/item.ads
+++ b/source/item.ads
@@ -14,10 +14,113 @@ package item is
 	);
 
 	type enumeration is (
-		iron_chestplate,        iron_greaves,           iron_gauntlets,         iron_helmet,            iron_sword,
-		golden_necklace,        iron_shield,
-		grey_tunic,             white_tunic,            black_tunic,            red_tunic,              green_tunic,            blue_tunic,
-		yellow_tunic,           orange_tunic,           cyan_tunic,             lime_tunic,             pink_tunic,             purple_tunic
+		--~bone_chestplate,
+		--~bronze_chestplate,
+		--~chainmail_chestplate,
+		--~crystal_chestplate,
+		--~golden_chestplate,
+		--~iron_chestplate,
+		--~leather_chestplate,
+		--~mithril_chestplate,
+		--~steel_chestplate,
+		--~bone_greaves,
+		--~bronze_greaves,
+		--~chainmail_greaves,
+		--~crystal_greaves,
+		--~golden_greaves,
+		--~iron_greaves,
+		--~leather_greaves,
+		--~mithril_greaves,
+		--~steel_greaves,
+		black_tunic,
+		blue_tunic,
+		cyan_tunic,
+		green_tunic,
+		grey_tunic,
+		lime_tunic,
+		orange_tunic,
+		pink_tunic,
+		purple_tunic,
+		red_tunic,
+		white_tunic,
+		yellow_tunic
+		--~bone_gauntlets,
+		--~bronze_gauntlets,
+		--~chainmail_gauntlets,
+		--~crystal_gauntlets,
+		--~golden_gauntlets,
+		--~iron_gauntlets,
+		--~leather_gauntlets,
+		--~mithril_gauntlets,
+		--~steel_gauntlets,
+		--~bone_helmet,
+		--~bronze_helmet,
+		--~chainmail_helmet,
+		--~crystal_helmet,
+		--~golden_helmet,
+		--~iron_helmet,
+		--~leather_helmet,
+		--~mithril_helmet,
+		--~steel_helmet,
+		--~bone_axe,
+		--~bone_battleaxe,
+		--~bone_bow,
+		--~bone_mace,
+		--~bone_spear,
+		--~bone_sword,
+		--~bronze_axe,
+		--~bronze_greatsword,
+		--~bronze_mace,
+		--~bronze_spear,
+		--~bronze_sword,
+		--~club,
+		--~crystal_bow,
+		--~crystal_greatsword,
+		--~crystal_mace,
+		--~crystal_spear,
+		--~crystal_sword,
+		--~golden_axe,
+		--~golden_battleaxe,
+		--~golden_bow,
+		--~golden_greatsword,
+		--~golden_sword,
+		--~iron_axe,
+		--~iron_bow,
+		--~iron_mace,
+		--~iron_spear,
+		--~iron_sword,
+		--~jade_axe,
+		--~jade_battleaxe,
+		--~jade_greatsword,
+		--~jade_mace,
+		--~jade_spear,
+		--~jade_sword,
+		--~maul,
+		--~mithril_axe,
+		--~mithril_battleaxe,
+		--~mithril_bow,
+		--~mithril_mace,
+		--~mithril_spear,
+		--~sledge_hammer,
+		--~spiked_club,
+		--~spiked_staff,
+		--~staff,
+		--~steel_battleaxe,
+		--~steel_bow,
+		--~steel_greatsword,
+		--~steel_mace,
+		--~steel_sword,
+		--~wooden_bow,
+		--~wooden_greatsword,
+		--~wooden_sword,
+		--~golden_necklace,
+		--~bronze_shield,
+		--~crystal_shield,
+		--~golden_shield,
+		--~iron_shield,
+		--~mithril_shield,
+		--~steel_shield,
+		--~wooden_shield
 	);
 
                                              ------------------------------------------------------------------------------------------
@@ -35,13 +138,6 @@ package item is
 	count : constant natural := enumeration'pos (enumeration'last) + 1;
 
 	trait : constant array (enumeration) of information := (
-		("Iron Chestplate         ", chest,     (0, 3, 0, 0, 0, 0), faction.gnoll,   effect.none),
-		("Iron Greaves            ", feet,      (0, 1, 0, 0, 0, 0), faction.gnoll,   effect.none),
-		("Iron Gauntlets          ", hands,     (0, 1, 0, 0, 0, 0), faction.gnoll,   effect.none),
-		("Iron Helmet             ", head,      (0, 1, 0, 0, 0, 0), faction.gnoll,   effect.none),
-		("Iron Sword              ", main_hand, (1, 0, 0, 0, 1, 2), faction.gnoll,   effect.none),
-		("Golden Necklace         ", neck,      (0, 0, 0, 0, 0, 0), faction.fairy,   effect.none),
-		("Iron Shield             ", off_hand,  (0, 2, 0, 0, 0, 1), faction.gnoll,   effect.none),
 		("Grey Tunic              ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none),
 		("White Tunic             ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none),
 		("Black Tunic             ", full_body, (0, 1, 0, 1, 0, 0), faction.neutral, effect.none),
diff --git a/sprite/item/main_hand/warhammer.png b/sprite/item/main_hand/warhammer.png
deleted file mode 100644
index b1bccf8..0000000
Binary files a/sprite/item/main_hand/warhammer.png and /dev/null differ
diff --git a/sprite/unit/fairy/golden_earings.png b/sprite/unit/fairy/golden_earings.png
new file mode 100644
index 0000000..e1abba1
Binary files /dev/null and b/sprite/unit/fairy/golden_earings.png differ
diff --git a/sprite/unit/goblin/blood_paint.png b/sprite/unit/goblin/blood_paint.png
new file mode 100644
index 0000000..41efe21
Binary files /dev/null and b/sprite/unit/goblin/blood_paint.png differ
diff --git a/sprite/unit/goblin/eye_patch.png b/sprite/unit/goblin/eye_patch.png
new file mode 100644
index 0000000..62a14ed
Binary files /dev/null and b/sprite/unit/goblin/eye_patch.png differ
diff --git a/sprite/unit/goblin/golden_earings.png b/sprite/unit/goblin/golden_earings.png
new file mode 100644
index 0000000..e1abba1
Binary files /dev/null and b/sprite/unit/goblin/golden_earings.png differ