diff --git a/zelda-totk/assets/icons/armors/Armor_001_Head.png b/zelda-totk/assets/item_icons/armors/Armor_001_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_001_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_001_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_001_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_001_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_001_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_001_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_001_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_001_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_001_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_001_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_005_Head.png b/zelda-totk/assets/item_icons/armors/Armor_005_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_005_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_005_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_005_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_005_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_005_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_005_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_005_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_005_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_005_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_005_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_006_Head.png b/zelda-totk/assets/item_icons/armors/Armor_006_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_006_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_006_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_006_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_006_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_006_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_006_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_006_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_006_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_006_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_006_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_008_Head.png b/zelda-totk/assets/item_icons/armors/Armor_008_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_008_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_008_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_008_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_008_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_008_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_008_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_008_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_008_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_008_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_008_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_009_Head.png b/zelda-totk/assets/item_icons/armors/Armor_009_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_009_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_009_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_009_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_009_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_009_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_009_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_009_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_009_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_009_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_009_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_011_Head.png b/zelda-totk/assets/item_icons/armors/Armor_011_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_011_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_011_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_011_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_011_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_011_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_011_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_011_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_011_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_011_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_011_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_012_Head.png b/zelda-totk/assets/item_icons/armors/Armor_012_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_012_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_012_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_012_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_012_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_012_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_012_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_012_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_012_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_012_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_012_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_014_Head.png b/zelda-totk/assets/item_icons/armors/Armor_014_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_014_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_014_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_014_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_014_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_014_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_014_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_014_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_014_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_014_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_014_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_017_Head.png b/zelda-totk/assets/item_icons/armors/Armor_017_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_017_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_017_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_017_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_017_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_017_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_017_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_017_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_017_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_017_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_017_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_020_Head.png b/zelda-totk/assets/item_icons/armors/Armor_020_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_020_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_020_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_020_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_020_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_020_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_020_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_020_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_020_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_020_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_020_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_022_Head.png b/zelda-totk/assets/item_icons/armors/Armor_022_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_022_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_022_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_024_Head.png b/zelda-totk/assets/item_icons/armors/Armor_024_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_024_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_024_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_025_Head.png b/zelda-totk/assets/item_icons/armors/Armor_025_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_025_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_025_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_026_Head.png b/zelda-totk/assets/item_icons/armors/Armor_026_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_026_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_026_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_027_Head.png b/zelda-totk/assets/item_icons/armors/Armor_027_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_027_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_027_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_028_Head.png b/zelda-totk/assets/item_icons/armors/Armor_028_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_028_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_028_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_029_Head.png b/zelda-totk/assets/item_icons/armors/Armor_029_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_029_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_029_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_045_Head.png b/zelda-totk/assets/item_icons/armors/Armor_045_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_045_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_045_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_046_Head.png b/zelda-totk/assets/item_icons/armors/Armor_046_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_046_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_046_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_046_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_046_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_046_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_046_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_046_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_046_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_046_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_046_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_048_Head.png b/zelda-totk/assets/item_icons/armors/Armor_048_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_048_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_048_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_048_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_048_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_048_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_048_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_048_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_048_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_048_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_048_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_049_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_049_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_049_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_049_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_055_Head.png b/zelda-totk/assets/item_icons/armors/Armor_055_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_055_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_055_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_056_Head.png b/zelda-totk/assets/item_icons/armors/Armor_056_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_056_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_056_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1006_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1006_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1006_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1006_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1006_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_1006_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1006_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_1006_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1006_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1006_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1006_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1006_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1036_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1036_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1036_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1036_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1036_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_1036_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1036_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_1036_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1036_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1036_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1036_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1036_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1043_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_1043_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1043_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_1043_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1043_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1043_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1043_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1043_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1044_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_1044_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1044_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_1044_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1046_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1046_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1046_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1046_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1046_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_1046_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1046_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_1046_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1046_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1046_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1046_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1046_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1051_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1051_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1051_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1051_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1051_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_1051_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1051_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_1051_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1051_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1051_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1051_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1051_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1061_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1061_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1061_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1061_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1061_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_1061_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1061_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_1061_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1061_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1061_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1061_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1061_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1066_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1066_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1066_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1066_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1066_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_1066_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1066_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_1066_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1066_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1066_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1066_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1066_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1071_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1071_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1071_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1071_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1071_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_1071_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1071_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_1071_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1071_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1071_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1071_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1071_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1076_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1076_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1076_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1076_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1086_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1086_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1086_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1086_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1086_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_1086_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1086_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_1086_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1086_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1086_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1086_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1086_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1091_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1091_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1091_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1091_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1091_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_1091_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1091_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_1091_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1091_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1091_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1091_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1091_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1096_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1096_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1096_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1096_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1096_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_1096_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1096_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_1096_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1096_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1096_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1096_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1096_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1106_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1106_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1106_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1106_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1125_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1125_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1125_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1125_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1141_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1141_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1141_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1141_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1141_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_1141_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1141_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_1141_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1141_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1141_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1141_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1141_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1150_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1150_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1150_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1150_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1151_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1151_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1151_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1151_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1152_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1152_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1152_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1152_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_115_Head.png b/zelda-totk/assets/item_icons/armors/Armor_115_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_115_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_115_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_116_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_116_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_116_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_116_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1300_Head.png b/zelda-totk/assets/item_icons/armors/Armor_1300_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1300_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_1300_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1300_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_1300_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1300_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_1300_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_1300_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_1300_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_1300_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_1300_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_141_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_141_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_141_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_141_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_160_Head.png b/zelda-totk/assets/item_icons/armors/Armor_160_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_160_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_160_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_160_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_160_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_160_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_160_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_160_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_160_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_160_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_160_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_171_Head.png b/zelda-totk/assets/item_icons/armors/Armor_171_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_171_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_171_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_171_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_171_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_171_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_171_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_171_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_171_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_171_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_171_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_172_Head.png b/zelda-totk/assets/item_icons/armors/Armor_172_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_172_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_172_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_173_Head.png b/zelda-totk/assets/item_icons/armors/Armor_173_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_173_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_173_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_174_Head.png b/zelda-totk/assets/item_icons/armors/Armor_174_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_174_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_174_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_174_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_174_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_174_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_174_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_174_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_174_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_174_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_174_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_175_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_175_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_175_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_175_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_176_Head.png b/zelda-totk/assets/item_icons/armors/Armor_176_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_176_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_176_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_177_Head.png b/zelda-totk/assets/item_icons/armors/Armor_177_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_177_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_177_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_178_Head.png b/zelda-totk/assets/item_icons/armors/Armor_178_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_178_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_178_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_179_Head.png b/zelda-totk/assets/item_icons/armors/Armor_179_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_179_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_179_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_179_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_179_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_179_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_179_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_179_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_179_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_179_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_179_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_180_Head.png b/zelda-totk/assets/item_icons/armors/Armor_180_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_180_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_180_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_180_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_180_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_180_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_180_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_180_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_180_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_180_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_180_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_181_Head.png b/zelda-totk/assets/item_icons/armors/Armor_181_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_181_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_181_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_182_Head.png b/zelda-totk/assets/item_icons/armors/Armor_182_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_182_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_182_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_183_Head.png b/zelda-totk/assets/item_icons/armors/Armor_183_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_183_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_183_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_184_Head.png b/zelda-totk/assets/item_icons/armors/Armor_184_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_184_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_184_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_200_Head.png b/zelda-totk/assets/item_icons/armors/Armor_200_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_200_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_200_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_200_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_200_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_200_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_200_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_200_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_200_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_200_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_200_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_205_Head.png b/zelda-totk/assets/item_icons/armors/Armor_205_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_205_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_205_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_205_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_205_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_205_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_205_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_205_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_205_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_205_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_205_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_210_Head.png b/zelda-totk/assets/item_icons/armors/Armor_210_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_210_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_210_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_210_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_210_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_210_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_210_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_210_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_210_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_210_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_210_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_215_Head.png b/zelda-totk/assets/item_icons/armors/Armor_215_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_215_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_215_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_215_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_215_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_215_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_215_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_215_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_215_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_215_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_215_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_220_Head.png b/zelda-totk/assets/item_icons/armors/Armor_220_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_220_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_220_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_225_Head.png b/zelda-totk/assets/item_icons/armors/Armor_225_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_225_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_225_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_225_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_225_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_225_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_225_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_225_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_225_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_225_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_225_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_230_Head.png b/zelda-totk/assets/item_icons/armors/Armor_230_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_230_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_230_Head.png
diff --git a/zelda-totk/assets/icons/armors/Armor_230_Lower.png b/zelda-totk/assets/item_icons/armors/Armor_230_Lower.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_230_Lower.png
rename to zelda-totk/assets/item_icons/armors/Armor_230_Lower.png
diff --git a/zelda-totk/assets/icons/armors/Armor_230_Upper.png b/zelda-totk/assets/item_icons/armors/Armor_230_Upper.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_230_Upper.png
rename to zelda-totk/assets/item_icons/armors/Armor_230_Upper.png
diff --git a/zelda-totk/assets/icons/armors/Armor_999_Head.png b/zelda-totk/assets/item_icons/armors/Armor_999_Head.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/Armor_999_Head.png
rename to zelda-totk/assets/item_icons/armors/Armor_999_Head.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_001_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_001_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_005_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_005_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_006_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_006_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_008_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_008_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_009_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_009_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_011_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_011_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_012_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_012_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_014_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_014_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_017_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_017_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_020_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_020_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_046_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_046_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_048_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_048_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_049_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_049_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1006_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1006_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1043_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1043_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1044_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1044_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1046_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1046_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1051_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1051_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1061_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1061_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1066_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1066_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1071_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1071_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1086_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1086_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1091_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1091_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1141_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1141_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1152_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1152_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_1300_Upper_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_1300_Upper_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_141_Lower_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_141_Lower_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_181_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_181_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_181_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_182_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_182_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_182_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_183_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_183_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_183_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_Black.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Black.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_Black.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Black.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_Blue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Blue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_Blue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Blue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_Brown.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Brown.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_Brown.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Brown.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_Crimson.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Crimson.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_Crimson.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Crimson.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_Gray.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Gray.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_Gray.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Gray.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_Green.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Green.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_Green.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Green.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_LightBlue.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_LightBlue.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_LightBlue.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_LightBlue.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_LightYellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_LightYellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_LightYellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_LightYellow.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_Navy.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Navy.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_Navy.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Navy.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_Orange.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Orange.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_Orange.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Orange.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_Pink.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Pink.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_Pink.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Pink.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_Purple.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Purple.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_Purple.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Purple.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_Red.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Red.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_Red.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Red.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_White.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_White.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_White.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_White.png
diff --git a/zelda-totk/assets/icons/armors/dye/Armor_184_Head_Yellow.png b/zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Yellow.png
similarity index 100%
rename from zelda-totk/assets/icons/armors/dye/Armor_184_Head_Yellow.png
rename to zelda-totk/assets/item_icons/armors/dye/Armor_184_Head_Yellow.png
diff --git a/zelda-totk/assets/icons/arrows/NormalArrow.png b/zelda-totk/assets/item_icons/arrows/NormalArrow.png
similarity index 100%
rename from zelda-totk/assets/icons/arrows/NormalArrow.png
rename to zelda-totk/assets/item_icons/arrows/NormalArrow.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_001.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_001.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_001.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_001.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_002.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_002.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_002.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_002.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_003.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_003.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_003.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_003.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_004.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_004.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_004.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_004.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_006.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_006.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_006.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_006.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_009.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_009.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_009.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_009.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_011.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_011.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_011.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_011.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_013.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_013.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_013.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_013.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_014.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_014.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_014.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_014.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_015.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_015.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_015.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_015.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_016.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_016.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_016.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_016.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_017.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_017.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_017.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_017.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_026.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_026.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_026.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_026.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_027.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_027.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_027.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_027.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_028.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_028.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_028.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_028.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_029.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_029.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_029.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_029.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_030.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_030.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_030.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_030.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_032.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_032.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_032.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_032.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_033.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_033.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_033.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_033.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_035.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_035.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_035.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_035.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_036.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_036.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_036.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_036.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_038.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_038.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_038.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_038.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_040.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_040.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_040.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_040.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_072.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_072.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_072.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_072.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_101.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_101.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_101.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_101.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_104.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_104.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_104.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_104.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_105.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_105.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_105.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_105.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_106.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_106.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_106.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_106.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_107.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_107.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_107.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_107.png
diff --git a/zelda-totk/assets/icons/bows/Weapon_Bow_166.png b/zelda-totk/assets/item_icons/bows/Weapon_Bow_166.png
similarity index 100%
rename from zelda-totk/assets/icons/bows/Weapon_Bow_166.png
rename to zelda-totk/assets/item_icons/bows/Weapon_Bow_166.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_BalloonEnvelope_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_BalloonEnvelope_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_BalloonEnvelope_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_BalloonEnvelope_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_BalloonEnvelope_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_BalloonEnvelope_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_BalloonEnvelope_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_BalloonEnvelope_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_Beamos_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_Beamos_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_Beamos_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_Beamos_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_Beamos_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_Beamos_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_Beamos_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_Beamos_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_Cannon_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_Cannon_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_Cannon_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_Cannon_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_Cannon_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_Cannon_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_Cannon_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_Cannon_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_Cart_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_Cart_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_Cart_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_Cart_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_Cart_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_Cart_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_Cart_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_Cart_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_Chaser_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_Chaser_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_Chaser_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_Chaser_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_Chaser_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_Chaser_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_Chaser_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_Chaser_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_ControlStick_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_ControlStick_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_ControlStick_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_ControlStick_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_ControlStick_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_ControlStick_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_ControlStick_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_ControlStick_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_CookSetOnFire_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_CookSetOnFire_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_CookSetOnFire_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_CookSetOnFire_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_CookSet_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_CookSet_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_CookSet_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_CookSet_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_ElectricBoxGenerator.png b/zelda-totk/assets/item_icons/devices/SpObj_ElectricBoxGenerator.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_ElectricBoxGenerator.png
rename to zelda-totk/assets/item_icons/devices/SpObj_ElectricBoxGenerator.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_ElectricBoxGenerator_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_ElectricBoxGenerator_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_ElectricBoxGenerator_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_ElectricBoxGenerator_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_EnergyBank_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_EnergyBank_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_EnergyBank_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_EnergyBank_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_EnergyBank_A_02.png b/zelda-totk/assets/item_icons/devices/SpObj_EnergyBank_A_02.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_EnergyBank_A_02.png
rename to zelda-totk/assets/item_icons/devices/SpObj_EnergyBank_A_02.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_EnergyBank_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_EnergyBank_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_EnergyBank_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_EnergyBank_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_EnergyBank_Capsule_A_02.png b/zelda-totk/assets/item_icons/devices/SpObj_EnergyBank_Capsule_A_02.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_EnergyBank_Capsule_A_02.png
rename to zelda-totk/assets/item_icons/devices/SpObj_EnergyBank_Capsule_A_02.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_FastWheel_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_FastWheel_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_FastWheel_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_FastWheel_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_FastWheel_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_FastWheel_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_FastWheel_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_FastWheel_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_FastWheel_Capsule_B_01.png b/zelda-totk/assets/item_icons/devices/SpObj_FastWheel_Capsule_B_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_FastWheel_Capsule_B_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_FastWheel_Capsule_B_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_FlameThrower_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_FlameThrower_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_FlameThrower_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_FlameThrower_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_FlameThrower_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_FlameThrower_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_FlameThrower_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_FlameThrower_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_FlashLight_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_FlashLight_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_FlashLight_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_FlashLight_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_FlashLight_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_FlashLight_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_FlashLight_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_FlashLight_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_FloatingStone_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_FloatingStone_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_FloatingStone_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_FloatingStone_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_FloatingStone_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_FloatingStone_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_FloatingStone_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_FloatingStone_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_GolemHead_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_GolemHead_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_GolemHead_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_GolemHead_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_GolemHead_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_GolemHead_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_GolemHead_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_GolemHead_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_LiftGeneratorWing_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_LiftGeneratorWing_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_LiftGeneratorWing_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_LiftGeneratorWing_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_LiftGeneratorWing_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_LiftGeneratorWing_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_LiftGeneratorWing_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_LiftGeneratorWing_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_LiftableWaterPump_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_LiftableWaterPump_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_LiftableWaterPump_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_LiftableWaterPump_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_LightMirror_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_LightMirror_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_LightMirror_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_LightMirror_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_LightMirror_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_LightMirror_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_LightMirror_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_LightMirror_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_Pile_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_Pile_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_Pile_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_Pile_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_Pile_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_Pile_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_Pile_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_Pile_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_Rocket_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_Rocket_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_Rocket_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_Rocket_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_Rocket_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_Rocket_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_Rocket_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_Rocket_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_SlipBoard_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_SlipBoard_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_SlipBoard_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_SlipBoard_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_SlipBoard_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_SlipBoard_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_SlipBoard_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_SlipBoard_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_SnowMachine_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_SnowMachine_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_SnowMachine_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_SnowMachine_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_SnowMachine_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_SnowMachine_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_SnowMachine_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_SnowMachine_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_SpringPiston_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_SpringPiston_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_SpringPiston_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_SpringPiston_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_SpringPiston_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_SpringPiston_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_SpringPiston_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_SpringPiston_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_SwitchWheel_B_01.png b/zelda-totk/assets/item_icons/devices/SpObj_SwitchWheel_B_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_SwitchWheel_B_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_SwitchWheel_B_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_TiltingDoll_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_TiltingDoll_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_TiltingDoll_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_TiltingDoll_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_TiltingDoll_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_TiltingDoll_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_TiltingDoll_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_TiltingDoll_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_TimerBomb_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_TimerBomb_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_TimerBomb_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_TimerBomb_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_TimerBomb_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_TimerBomb_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_TimerBomb_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_TimerBomb_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_WaterPump_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_WaterPump_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_WaterPump_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_WaterPump_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_WindGenerator_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_WindGenerator_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_WindGenerator_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_WindGenerator_A_01.png
diff --git a/zelda-totk/assets/icons/devices/SpObj_WindGenerator_Capsule_A_01.png b/zelda-totk/assets/item_icons/devices/SpObj_WindGenerator_Capsule_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/devices/SpObj_WindGenerator_Capsule_A_01.png
rename to zelda-totk/assets/item_icons/devices/SpObj_WindGenerator_Capsule_A_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Boiled_01.png b/zelda-totk/assets/item_icons/food/Item_Boiled_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Boiled_01.png
rename to zelda-totk/assets/item_icons/food/Item_Boiled_01.png
diff --git a/zelda-totk/assets/icons/food/Item_ChilledFish_01.png b/zelda-totk/assets/item_icons/food/Item_ChilledFish_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_ChilledFish_01.png
rename to zelda-totk/assets/item_icons/food/Item_ChilledFish_01.png
diff --git a/zelda-totk/assets/icons/food/Item_ChilledFish_02.png b/zelda-totk/assets/item_icons/food/Item_ChilledFish_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_ChilledFish_02.png
rename to zelda-totk/assets/item_icons/food/Item_ChilledFish_02.png
diff --git a/zelda-totk/assets/icons/food/Item_ChilledFish_03.png b/zelda-totk/assets/item_icons/food/Item_ChilledFish_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_ChilledFish_03.png
rename to zelda-totk/assets/item_icons/food/Item_ChilledFish_03.png
diff --git a/zelda-totk/assets/icons/food/Item_ChilledFish_04.png b/zelda-totk/assets/item_icons/food/Item_ChilledFish_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_ChilledFish_04.png
rename to zelda-totk/assets/item_icons/food/Item_ChilledFish_04.png
diff --git a/zelda-totk/assets/icons/food/Item_ChilledFish_05.png b/zelda-totk/assets/item_icons/food/Item_ChilledFish_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_ChilledFish_05.png
rename to zelda-totk/assets/item_icons/food/Item_ChilledFish_05.png
diff --git a/zelda-totk/assets/icons/food/Item_ChilledFish_06.png b/zelda-totk/assets/item_icons/food/Item_ChilledFish_06.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_ChilledFish_06.png
rename to zelda-totk/assets/item_icons/food/Item_ChilledFish_06.png
diff --git a/zelda-totk/assets/icons/food/Item_ChilledFish_07.png b/zelda-totk/assets/item_icons/food/Item_ChilledFish_07.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_ChilledFish_07.png
rename to zelda-totk/assets/item_icons/food/Item_ChilledFish_07.png
diff --git a/zelda-totk/assets/icons/food/Item_ChilledFish_08.png b/zelda-totk/assets/item_icons/food/Item_ChilledFish_08.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_ChilledFish_08.png
rename to zelda-totk/assets/item_icons/food/Item_ChilledFish_08.png
diff --git a/zelda-totk/assets/icons/food/Item_ChilledFish_16.png b/zelda-totk/assets/item_icons/food/Item_ChilledFish_16.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_ChilledFish_16.png
rename to zelda-totk/assets/item_icons/food/Item_ChilledFish_16.png
diff --git a/zelda-totk/assets/icons/food/Item_ChilledFish_18.png b/zelda-totk/assets/item_icons/food/Item_ChilledFish_18.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_ChilledFish_18.png
rename to zelda-totk/assets/item_icons/food/Item_ChilledFish_18.png
diff --git a/zelda-totk/assets/icons/food/Item_Chilled_01.png b/zelda-totk/assets/item_icons/food/Item_Chilled_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Chilled_01.png
rename to zelda-totk/assets/item_icons/food/Item_Chilled_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Chilled_02.png b/zelda-totk/assets/item_icons/food/Item_Chilled_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Chilled_02.png
rename to zelda-totk/assets/item_icons/food/Item_Chilled_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Chilled_03.png b/zelda-totk/assets/item_icons/food/Item_Chilled_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Chilled_03.png
rename to zelda-totk/assets/item_icons/food/Item_Chilled_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Chilled_04.png b/zelda-totk/assets/item_icons/food/Item_Chilled_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Chilled_04.png
rename to zelda-totk/assets/item_icons/food/Item_Chilled_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Chilled_05.png b/zelda-totk/assets/item_icons/food/Item_Chilled_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Chilled_05.png
rename to zelda-totk/assets/item_icons/food/Item_Chilled_05.png
diff --git a/zelda-totk/assets/icons/food/Item_Chilled_06.png b/zelda-totk/assets/item_icons/food/Item_Chilled_06.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Chilled_06.png
rename to zelda-totk/assets/item_icons/food/Item_Chilled_06.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_A_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_A_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_A_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_A_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_A_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_A_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_A_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_A_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_A_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_A_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_A_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_A_04.png b/zelda-totk/assets/item_icons/food/Item_Cook_A_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_A_04.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_A_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_A_05.png b/zelda-totk/assets/item_icons/food/Item_Cook_A_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_A_05.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_A_05.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_A_07.png b/zelda-totk/assets/item_icons/food/Item_Cook_A_07.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_A_07.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_A_07.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_A_08.png b/zelda-totk/assets/item_icons/food/Item_Cook_A_08.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_A_08.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_A_08.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_A_09.png b/zelda-totk/assets/item_icons/food/Item_Cook_A_09.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_A_09.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_A_09.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_A_10.png b/zelda-totk/assets/item_icons/food/Item_Cook_A_10.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_A_10.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_A_10.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_A_11.png b/zelda-totk/assets/item_icons/food/Item_Cook_A_11.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_A_11.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_A_11.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_A_12.png b/zelda-totk/assets/item_icons/food/Item_Cook_A_12.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_A_12.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_A_12.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_A_13.png b/zelda-totk/assets/item_icons/food/Item_Cook_A_13.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_A_13.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_A_13.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_A_14.png b/zelda-totk/assets/item_icons/food/Item_Cook_A_14.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_A_14.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_A_14.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_05.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_05.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_05.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_06.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_06.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_06.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_06.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_11.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_11.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_11.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_11.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_12.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_12.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_12.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_12.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_13.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_13.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_13.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_13.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_15.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_15.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_15.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_15.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_16.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_16.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_16.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_16.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_17.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_17.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_17.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_17.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_18.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_18.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_18.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_18.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_19.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_19.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_19.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_19.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_20.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_20.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_20.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_20.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_21.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_21.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_21.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_21.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_22.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_22.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_22.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_22.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_B_23.png b/zelda-totk/assets/item_icons/food/Item_Cook_B_23.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_B_23.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_B_23.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_16.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_16.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_16.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_16.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_17.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_17.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_17.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_17.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_17_AllSpeed.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_17_AllSpeed.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_17_AllSpeed.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_17_AllSpeed.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_17_AttackUp.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_17_AttackUp.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_17_AttackUp.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_17_AttackUp.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_17_DefenseUp.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_17_DefenseUp.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_17_DefenseUp.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_17_DefenseUp.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_17_ExStaminaMaxUp.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_17_ExStaminaMaxUp.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_17_ExStaminaMaxUp.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_17_ExStaminaMaxUp.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_17_LifeMaxUp.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_17_LifeMaxUp.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_17_LifeMaxUp.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_17_LifeMaxUp.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_17_LightEmission.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_17_LightEmission.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_17_LightEmission.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_17_LightEmission.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_17_NotSlippy.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_17_NotSlippy.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_17_NotSlippy.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_17_NotSlippy.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_17_QuietnessUp.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_17_QuietnessUp.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_17_QuietnessUp.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_17_QuietnessUp.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_17_ResistBurn.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_17_ResistBurn.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_17_ResistBurn.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_17_ResistBurn.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_17_ResistCold.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_17_ResistCold.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_17_ResistCold.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_17_ResistCold.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_17_ResistElectric.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_17_ResistElectric.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_17_ResistElectric.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_17_ResistElectric.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_17_ResistHot.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_17_ResistHot.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_17_ResistHot.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_17_ResistHot.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_C_17_StaminaRecover.png b/zelda-totk/assets/item_icons/food/Item_Cook_C_17_StaminaRecover.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_C_17_StaminaRecover.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_C_17_StaminaRecover.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_D_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_D_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_D_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_D_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_D_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_D_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_D_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_D_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_D_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_D_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_D_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_D_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_D_04.png b/zelda-totk/assets/item_icons/food/Item_Cook_D_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_D_04.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_D_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_D_05.png b/zelda-totk/assets/item_icons/food/Item_Cook_D_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_D_05.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_D_05.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_D_06.png b/zelda-totk/assets/item_icons/food/Item_Cook_D_06.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_D_06.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_D_06.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_D_07.png b/zelda-totk/assets/item_icons/food/Item_Cook_D_07.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_D_07.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_D_07.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_D_08.png b/zelda-totk/assets/item_icons/food/Item_Cook_D_08.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_D_08.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_D_08.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_D_09.png b/zelda-totk/assets/item_icons/food/Item_Cook_D_09.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_D_09.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_D_09.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_D_10.png b/zelda-totk/assets/item_icons/food/Item_Cook_D_10.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_D_10.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_D_10.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_E_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_E_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_E_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_E_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_E_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_E_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_E_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_E_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_E_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_E_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_E_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_E_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_E_04.png b/zelda-totk/assets/item_icons/food/Item_Cook_E_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_E_04.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_E_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_F_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_F_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_F_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_F_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_F_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_F_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_F_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_F_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_F_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_F_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_F_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_F_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_F_04.png b/zelda-totk/assets/item_icons/food/Item_Cook_F_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_F_04.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_F_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_G_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_G_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_G_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_G_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_G_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_G_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_G_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_G_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_G_04.png b/zelda-totk/assets/item_icons/food/Item_Cook_G_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_G_04.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_G_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_G_05.png b/zelda-totk/assets/item_icons/food/Item_Cook_G_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_G_05.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_G_05.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_G_06.png b/zelda-totk/assets/item_icons/food/Item_Cook_G_06.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_G_06.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_G_06.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_G_09.png b/zelda-totk/assets/item_icons/food/Item_Cook_G_09.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_G_09.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_G_09.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_G_10.png b/zelda-totk/assets/item_icons/food/Item_Cook_G_10.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_G_10.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_G_10.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_G_11.png b/zelda-totk/assets/item_icons/food/Item_Cook_G_11.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_G_11.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_G_11.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_G_12.png b/zelda-totk/assets/item_icons/food/Item_Cook_G_12.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_G_12.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_G_12.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_G_13.png b/zelda-totk/assets/item_icons/food/Item_Cook_G_13.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_G_13.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_G_13.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_G_14.png b/zelda-totk/assets/item_icons/food/Item_Cook_G_14.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_G_14.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_G_14.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_G_15.png b/zelda-totk/assets/item_icons/food/Item_Cook_G_15.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_G_15.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_G_15.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_G_16.png b/zelda-totk/assets/item_icons/food/Item_Cook_G_16.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_G_16.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_G_16.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_G_17.png b/zelda-totk/assets/item_icons/food/Item_Cook_G_17.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_G_17.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_G_17.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_H_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_H_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_H_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_H_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_H_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_H_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_H_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_H_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_H_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_H_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_H_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_H_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_04.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_04.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_05.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_05.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_05.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_06.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_06.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_06.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_06.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_07.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_07.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_07.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_07.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_08.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_08.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_08.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_08.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_09.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_09.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_09.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_09.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_10.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_10.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_10.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_10.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_11.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_11.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_11.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_11.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_12.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_12.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_12.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_12.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_13.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_13.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_13.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_13.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_14.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_14.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_14.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_14.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_15.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_15.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_15.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_15.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_16.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_16.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_16.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_16.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_I_17.png b/zelda-totk/assets/item_icons/food/Item_Cook_I_17.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_I_17.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_I_17.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_J_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_J_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_J_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_J_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_J_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_J_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_J_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_J_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_J_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_J_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_J_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_J_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_J_04.png b/zelda-totk/assets/item_icons/food/Item_Cook_J_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_J_04.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_J_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_J_05.png b/zelda-totk/assets/item_icons/food/Item_Cook_J_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_J_05.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_J_05.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_J_06.png b/zelda-totk/assets/item_icons/food/Item_Cook_J_06.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_J_06.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_J_06.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_J_07.png b/zelda-totk/assets/item_icons/food/Item_Cook_J_07.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_J_07.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_J_07.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_J_08.png b/zelda-totk/assets/item_icons/food/Item_Cook_J_08.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_J_08.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_J_08.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_J_09.png b/zelda-totk/assets/item_icons/food/Item_Cook_J_09.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_J_09.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_J_09.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_K_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_K_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_K_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_K_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_K_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_K_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_K_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_K_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_K_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_K_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_K_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_K_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_K_04.png b/zelda-totk/assets/item_icons/food/Item_Cook_K_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_K_04.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_K_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_K_05.png b/zelda-totk/assets/item_icons/food/Item_Cook_K_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_K_05.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_K_05.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_K_06.png b/zelda-totk/assets/item_icons/food/Item_Cook_K_06.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_K_06.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_K_06.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_K_07.png b/zelda-totk/assets/item_icons/food/Item_Cook_K_07.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_K_07.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_K_07.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_K_08.png b/zelda-totk/assets/item_icons/food/Item_Cook_K_08.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_K_08.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_K_08.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_K_09.png b/zelda-totk/assets/item_icons/food/Item_Cook_K_09.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_K_09.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_K_09.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_L_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_L_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_L_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_L_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_L_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_L_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_L_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_L_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_L_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_L_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_L_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_L_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_L_04.png b/zelda-totk/assets/item_icons/food/Item_Cook_L_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_L_04.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_L_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_L_05.png b/zelda-totk/assets/item_icons/food/Item_Cook_L_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_L_05.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_L_05.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_M_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_M_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_M_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_M_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_N_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_N_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_N_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_N_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_N_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_N_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_N_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_N_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_N_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_N_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_N_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_N_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_N_04.png b/zelda-totk/assets/item_icons/food/Item_Cook_N_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_N_04.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_N_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_O_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_O_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_O_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_O_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_O_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_O_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_O_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_O_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_P_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_P_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_P_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_P_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_P_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_P_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_P_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_P_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_P_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_P_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_P_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_P_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_P_04.png b/zelda-totk/assets/item_icons/food/Item_Cook_P_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_P_04.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_P_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_P_05.png b/zelda-totk/assets/item_icons/food/Item_Cook_P_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_P_05.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_P_05.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_Q_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_Q_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_Q_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_Q_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_Q_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_Q_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_Q_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_Q_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_Q_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_Q_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_Q_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_Q_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_Q_04.png b/zelda-totk/assets/item_icons/food/Item_Cook_Q_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_Q_04.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_Q_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_Q_05.png b/zelda-totk/assets/item_icons/food/Item_Cook_Q_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_Q_05.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_Q_05.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_Q_06.png b/zelda-totk/assets/item_icons/food/Item_Cook_Q_06.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_Q_06.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_Q_06.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_Q_07.png b/zelda-totk/assets/item_icons/food/Item_Cook_Q_07.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_Q_07.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_Q_07.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_Q_08.png b/zelda-totk/assets/item_icons/food/Item_Cook_Q_08.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_Q_08.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_Q_08.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_Q_09.png b/zelda-totk/assets/item_icons/food/Item_Cook_Q_09.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_Q_09.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_Q_09.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_Q_10.png b/zelda-totk/assets/item_icons/food/Item_Cook_Q_10.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_Q_10.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_Q_10.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_R_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_R_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_R_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_R_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_R_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_R_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_R_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_R_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_R_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_R_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_R_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_R_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_R_04.png b/zelda-totk/assets/item_icons/food/Item_Cook_R_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_R_04.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_R_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_R_05.png b/zelda-totk/assets/item_icons/food/Item_Cook_R_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_R_05.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_R_05.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_R_06.png b/zelda-totk/assets/item_icons/food/Item_Cook_R_06.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_R_06.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_R_06.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_R_07.png b/zelda-totk/assets/item_icons/food/Item_Cook_R_07.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_R_07.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_R_07.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_R_08.png b/zelda-totk/assets/item_icons/food/Item_Cook_R_08.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_R_08.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_R_08.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_R_09.png b/zelda-totk/assets/item_icons/food/Item_Cook_R_09.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_R_09.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_R_09.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_R_10.png b/zelda-totk/assets/item_icons/food/Item_Cook_R_10.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_R_10.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_R_10.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_S_01.png b/zelda-totk/assets/item_icons/food/Item_Cook_S_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_S_01.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_S_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_S_02.png b/zelda-totk/assets/item_icons/food/Item_Cook_S_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_S_02.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_S_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_S_03.png b/zelda-totk/assets/item_icons/food/Item_Cook_S_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_S_03.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_S_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_S_04.png b/zelda-totk/assets/item_icons/food/Item_Cook_S_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_S_04.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_S_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_S_05.png b/zelda-totk/assets/item_icons/food/Item_Cook_S_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_S_05.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_S_05.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_S_06.png b/zelda-totk/assets/item_icons/food/Item_Cook_S_06.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_S_06.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_S_06.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_S_07.png b/zelda-totk/assets/item_icons/food/Item_Cook_S_07.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_S_07.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_S_07.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_S_08.png b/zelda-totk/assets/item_icons/food/Item_Cook_S_08.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_S_08.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_S_08.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_S_09.png b/zelda-totk/assets/item_icons/food/Item_Cook_S_09.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_S_09.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_S_09.png
diff --git a/zelda-totk/assets/icons/food/Item_Cook_S_10.png b/zelda-totk/assets/item_icons/food/Item_Cook_S_10.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Cook_S_10.png
rename to zelda-totk/assets/item_icons/food/Item_Cook_S_10.png
diff --git a/zelda-totk/assets/icons/food/Item_RoastFish_01.png b/zelda-totk/assets/item_icons/food/Item_RoastFish_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_RoastFish_01.png
rename to zelda-totk/assets/item_icons/food/Item_RoastFish_01.png
diff --git a/zelda-totk/assets/icons/food/Item_RoastFish_02.png b/zelda-totk/assets/item_icons/food/Item_RoastFish_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_RoastFish_02.png
rename to zelda-totk/assets/item_icons/food/Item_RoastFish_02.png
diff --git a/zelda-totk/assets/icons/food/Item_RoastFish_03.png b/zelda-totk/assets/item_icons/food/Item_RoastFish_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_RoastFish_03.png
rename to zelda-totk/assets/item_icons/food/Item_RoastFish_03.png
diff --git a/zelda-totk/assets/icons/food/Item_RoastFish_04.png b/zelda-totk/assets/item_icons/food/Item_RoastFish_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_RoastFish_04.png
rename to zelda-totk/assets/item_icons/food/Item_RoastFish_04.png
diff --git a/zelda-totk/assets/icons/food/Item_RoastFish_07.png b/zelda-totk/assets/item_icons/food/Item_RoastFish_07.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_RoastFish_07.png
rename to zelda-totk/assets/item_icons/food/Item_RoastFish_07.png
diff --git a/zelda-totk/assets/icons/food/Item_RoastFish_09.png b/zelda-totk/assets/item_icons/food/Item_RoastFish_09.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_RoastFish_09.png
rename to zelda-totk/assets/item_icons/food/Item_RoastFish_09.png
diff --git a/zelda-totk/assets/icons/food/Item_RoastFish_13.png b/zelda-totk/assets/item_icons/food/Item_RoastFish_13.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_RoastFish_13.png
rename to zelda-totk/assets/item_icons/food/Item_RoastFish_13.png
diff --git a/zelda-totk/assets/icons/food/Item_RoastFish_15.png b/zelda-totk/assets/item_icons/food/Item_RoastFish_15.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_RoastFish_15.png
rename to zelda-totk/assets/item_icons/food/Item_RoastFish_15.png
diff --git a/zelda-totk/assets/icons/food/Item_RoastFish_16.png b/zelda-totk/assets/item_icons/food/Item_RoastFish_16.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_RoastFish_16.png
rename to zelda-totk/assets/item_icons/food/Item_RoastFish_16.png
diff --git a/zelda-totk/assets/icons/food/Item_RoastFish_18.png b/zelda-totk/assets/item_icons/food/Item_RoastFish_18.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_RoastFish_18.png
rename to zelda-totk/assets/item_icons/food/Item_RoastFish_18.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_01.png b/zelda-totk/assets/item_icons/food/Item_Roast_01.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_01.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_01.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_02.png b/zelda-totk/assets/item_icons/food/Item_Roast_02.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_02.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_02.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_03.png b/zelda-totk/assets/item_icons/food/Item_Roast_03.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_03.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_03.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_04.png b/zelda-totk/assets/item_icons/food/Item_Roast_04.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_04.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_04.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_05.png b/zelda-totk/assets/item_icons/food/Item_Roast_05.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_05.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_05.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_06.png b/zelda-totk/assets/item_icons/food/Item_Roast_06.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_06.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_06.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_07.png b/zelda-totk/assets/item_icons/food/Item_Roast_07.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_07.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_07.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_08.png b/zelda-totk/assets/item_icons/food/Item_Roast_08.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_08.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_08.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_10.png b/zelda-totk/assets/item_icons/food/Item_Roast_10.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_10.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_10.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_11.png b/zelda-totk/assets/item_icons/food/Item_Roast_11.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_11.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_11.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_12.png b/zelda-totk/assets/item_icons/food/Item_Roast_12.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_12.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_12.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_13.png b/zelda-totk/assets/item_icons/food/Item_Roast_13.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_13.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_13.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_15.png b/zelda-totk/assets/item_icons/food/Item_Roast_15.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_15.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_15.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_16.png b/zelda-totk/assets/item_icons/food/Item_Roast_16.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_16.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_16.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_18.png b/zelda-totk/assets/item_icons/food/Item_Roast_18.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_18.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_18.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_19.png b/zelda-totk/assets/item_icons/food/Item_Roast_19.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_19.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_19.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_24.png b/zelda-totk/assets/item_icons/food/Item_Roast_24.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_24.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_24.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_27.png b/zelda-totk/assets/item_icons/food/Item_Roast_27.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_27.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_27.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_28.png b/zelda-totk/assets/item_icons/food/Item_Roast_28.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_28.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_28.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_31.png b/zelda-totk/assets/item_icons/food/Item_Roast_31.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_31.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_31.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_32.png b/zelda-totk/assets/item_icons/food/Item_Roast_32.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_32.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_32.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_33.png b/zelda-totk/assets/item_icons/food/Item_Roast_33.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_33.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_33.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_36.png b/zelda-totk/assets/item_icons/food/Item_Roast_36.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_36.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_36.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_37.png b/zelda-totk/assets/item_icons/food/Item_Roast_37.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_37.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_37.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_38.png b/zelda-totk/assets/item_icons/food/Item_Roast_38.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_38.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_38.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_39.png b/zelda-totk/assets/item_icons/food/Item_Roast_39.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_39.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_39.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_40.png b/zelda-totk/assets/item_icons/food/Item_Roast_40.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_40.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_40.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_41.png b/zelda-totk/assets/item_icons/food/Item_Roast_41.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_41.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_41.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_45.png b/zelda-totk/assets/item_icons/food/Item_Roast_45.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_45.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_45.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_46.png b/zelda-totk/assets/item_icons/food/Item_Roast_46.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_46.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_46.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_48.png b/zelda-totk/assets/item_icons/food/Item_Roast_48.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_48.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_48.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_49.png b/zelda-totk/assets/item_icons/food/Item_Roast_49.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_49.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_49.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_50.png b/zelda-totk/assets/item_icons/food/Item_Roast_50.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_50.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_50.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_51.png b/zelda-totk/assets/item_icons/food/Item_Roast_51.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_51.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_51.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_52.png b/zelda-totk/assets/item_icons/food/Item_Roast_52.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_52.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_52.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_53.png b/zelda-totk/assets/item_icons/food/Item_Roast_53.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_53.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_53.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_54.png b/zelda-totk/assets/item_icons/food/Item_Roast_54.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_54.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_54.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_55.png b/zelda-totk/assets/item_icons/food/Item_Roast_55.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_55.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_55.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_56.png b/zelda-totk/assets/item_icons/food/Item_Roast_56.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_56.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_56.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_58.png b/zelda-totk/assets/item_icons/food/Item_Roast_58.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_58.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_58.png
diff --git a/zelda-totk/assets/icons/food/Item_Roast_59.png b/zelda-totk/assets/item_icons/food/Item_Roast_59.png
similarity index 100%
rename from zelda-totk/assets/icons/food/Item_Roast_59.png
rename to zelda-totk/assets/item_icons/food/Item_Roast_59.png
diff --git a/zelda-totk/assets/icons/horses/GameRomHorse00L.png b/zelda-totk/assets/item_icons/horses/GameRomHorse00L.png
similarity index 100%
rename from zelda-totk/assets/icons/horses/GameRomHorse00L.png
rename to zelda-totk/assets/item_icons/horses/GameRomHorse00L.png
diff --git a/zelda-totk/assets/icons/horses/GameRomHorse01L.png b/zelda-totk/assets/item_icons/horses/GameRomHorse01L.png
similarity index 100%
rename from zelda-totk/assets/icons/horses/GameRomHorse01L.png
rename to zelda-totk/assets/item_icons/horses/GameRomHorse01L.png
diff --git a/zelda-totk/assets/icons/horses/Horse_Link_Mane.png b/zelda-totk/assets/item_icons/horses/Horse_Link_Mane.png
similarity index 100%
rename from zelda-totk/assets/icons/horses/Horse_Link_Mane.png
rename to zelda-totk/assets/item_icons/horses/Horse_Link_Mane.png
diff --git a/zelda-totk/assets/icons/horses/Horse_Link_Mane_01.png b/zelda-totk/assets/item_icons/horses/Horse_Link_Mane_01.png
similarity index 100%
rename from zelda-totk/assets/icons/horses/Horse_Link_Mane_01.png
rename to zelda-totk/assets/item_icons/horses/Horse_Link_Mane_01.png
diff --git a/zelda-totk/assets/icons/horses/Horse_Link_Mane_02.png b/zelda-totk/assets/item_icons/horses/Horse_Link_Mane_02.png
similarity index 100%
rename from zelda-totk/assets/icons/horses/Horse_Link_Mane_02.png
rename to zelda-totk/assets/item_icons/horses/Horse_Link_Mane_02.png
diff --git a/zelda-totk/assets/icons/horses/Horse_Link_Mane_03.png b/zelda-totk/assets/item_icons/horses/Horse_Link_Mane_03.png
similarity index 100%
rename from zelda-totk/assets/icons/horses/Horse_Link_Mane_03.png
rename to zelda-totk/assets/item_icons/horses/Horse_Link_Mane_03.png
diff --git a/zelda-totk/assets/icons/horses/Horse_Link_Mane_04.png b/zelda-totk/assets/item_icons/horses/Horse_Link_Mane_04.png
similarity index 100%
rename from zelda-totk/assets/icons/horses/Horse_Link_Mane_04.png
rename to zelda-totk/assets/item_icons/horses/Horse_Link_Mane_04.png
diff --git a/zelda-totk/assets/icons/horses/Horse_Link_Mane_05.png b/zelda-totk/assets/item_icons/horses/Horse_Link_Mane_05.png
similarity index 100%
rename from zelda-totk/assets/icons/horses/Horse_Link_Mane_05.png
rename to zelda-totk/assets/item_icons/horses/Horse_Link_Mane_05.png
diff --git a/zelda-totk/assets/icons/horses/Horse_Link_Mane_06.png b/zelda-totk/assets/item_icons/horses/Horse_Link_Mane_06.png
similarity index 100%
rename from zelda-totk/assets/icons/horses/Horse_Link_Mane_06.png
rename to zelda-totk/assets/item_icons/horses/Horse_Link_Mane_06.png
diff --git a/zelda-totk/assets/icons/horses/Horse_Link_Mane_07.png b/zelda-totk/assets/item_icons/horses/Horse_Link_Mane_07.png
similarity index 100%
rename from zelda-totk/assets/icons/horses/Horse_Link_Mane_07.png
rename to zelda-totk/assets/item_icons/horses/Horse_Link_Mane_07.png
diff --git a/zelda-totk/assets/icons/horses/Horse_Link_Mane_08.png b/zelda-totk/assets/item_icons/horses/Horse_Link_Mane_08.png
similarity index 100%
rename from zelda-totk/assets/icons/horses/Horse_Link_Mane_08.png
rename to zelda-totk/assets/item_icons/horses/Horse_Link_Mane_08.png
diff --git a/zelda-totk/assets/icons/horses/Horse_Link_Mane_09.png b/zelda-totk/assets/item_icons/horses/Horse_Link_Mane_09.png
similarity index 100%
rename from zelda-totk/assets/icons/horses/Horse_Link_Mane_09.png
rename to zelda-totk/assets/item_icons/horses/Horse_Link_Mane_09.png
diff --git a/zelda-totk/assets/icons/key/CaveMasterMedal.png b/zelda-totk/assets/item_icons/key/CaveMasterMedal.png
similarity index 100%
rename from zelda-totk/assets/icons/key/CaveMasterMedal.png
rename to zelda-totk/assets/item_icons/key/CaveMasterMedal.png
diff --git a/zelda-totk/assets/icons/key/Energy_Material_01.png b/zelda-totk/assets/item_icons/key/Energy_Material_01.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Energy_Material_01.png
rename to zelda-totk/assets/item_icons/key/Energy_Material_01.png
diff --git a/zelda-totk/assets/icons/key/Energy_Material_03.png b/zelda-totk/assets/item_icons/key/Energy_Material_03.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Energy_Material_03.png
rename to zelda-totk/assets/item_icons/key/Energy_Material_03.png
diff --git a/zelda-totk/assets/icons/key/Energy_Material_04.png b/zelda-totk/assets/item_icons/key/Energy_Material_04.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Energy_Material_04.png
rename to zelda-totk/assets/item_icons/key/Energy_Material_04.png
diff --git a/zelda-totk/assets/icons/key/GameRomHorseReins_00.png b/zelda-totk/assets/item_icons/key/GameRomHorseReins_00.png
similarity index 100%
rename from zelda-totk/assets/icons/key/GameRomHorseReins_00.png
rename to zelda-totk/assets/item_icons/key/GameRomHorseReins_00.png
diff --git a/zelda-totk/assets/icons/key/GameRomHorseReins_01.png b/zelda-totk/assets/item_icons/key/GameRomHorseReins_01.png
similarity index 100%
rename from zelda-totk/assets/icons/key/GameRomHorseReins_01.png
rename to zelda-totk/assets/item_icons/key/GameRomHorseReins_01.png
diff --git a/zelda-totk/assets/icons/key/GameRomHorseReins_02.png b/zelda-totk/assets/item_icons/key/GameRomHorseReins_02.png
similarity index 100%
rename from zelda-totk/assets/icons/key/GameRomHorseReins_02.png
rename to zelda-totk/assets/item_icons/key/GameRomHorseReins_02.png
diff --git a/zelda-totk/assets/icons/key/GameRomHorseReins_03.png b/zelda-totk/assets/item_icons/key/GameRomHorseReins_03.png
similarity index 100%
rename from zelda-totk/assets/icons/key/GameRomHorseReins_03.png
rename to zelda-totk/assets/item_icons/key/GameRomHorseReins_03.png
diff --git a/zelda-totk/assets/icons/key/GameRomHorseReins_04.png b/zelda-totk/assets/item_icons/key/GameRomHorseReins_04.png
similarity index 100%
rename from zelda-totk/assets/icons/key/GameRomHorseReins_04.png
rename to zelda-totk/assets/item_icons/key/GameRomHorseReins_04.png
diff --git a/zelda-totk/assets/icons/key/GameRomHorseReins_05.png b/zelda-totk/assets/item_icons/key/GameRomHorseReins_05.png
similarity index 100%
rename from zelda-totk/assets/icons/key/GameRomHorseReins_05.png
rename to zelda-totk/assets/item_icons/key/GameRomHorseReins_05.png
diff --git a/zelda-totk/assets/icons/key/GameRomHorseSaddle_00.png b/zelda-totk/assets/item_icons/key/GameRomHorseSaddle_00.png
similarity index 100%
rename from zelda-totk/assets/icons/key/GameRomHorseSaddle_00.png
rename to zelda-totk/assets/item_icons/key/GameRomHorseSaddle_00.png
diff --git a/zelda-totk/assets/icons/key/GameRomHorseSaddle_01.png b/zelda-totk/assets/item_icons/key/GameRomHorseSaddle_01.png
similarity index 100%
rename from zelda-totk/assets/icons/key/GameRomHorseSaddle_01.png
rename to zelda-totk/assets/item_icons/key/GameRomHorseSaddle_01.png
diff --git a/zelda-totk/assets/icons/key/GameRomHorseSaddle_02.png b/zelda-totk/assets/item_icons/key/GameRomHorseSaddle_02.png
similarity index 100%
rename from zelda-totk/assets/icons/key/GameRomHorseSaddle_02.png
rename to zelda-totk/assets/item_icons/key/GameRomHorseSaddle_02.png
diff --git a/zelda-totk/assets/icons/key/GameRomHorseSaddle_03.png b/zelda-totk/assets/item_icons/key/GameRomHorseSaddle_03.png
similarity index 100%
rename from zelda-totk/assets/icons/key/GameRomHorseSaddle_03.png
rename to zelda-totk/assets/item_icons/key/GameRomHorseSaddle_03.png
diff --git a/zelda-totk/assets/icons/key/GameRomHorseSaddle_04.png b/zelda-totk/assets/item_icons/key/GameRomHorseSaddle_04.png
similarity index 100%
rename from zelda-totk/assets/icons/key/GameRomHorseSaddle_04.png
rename to zelda-totk/assets/item_icons/key/GameRomHorseSaddle_04.png
diff --git a/zelda-totk/assets/icons/key/GameRomHorseSaddle_05.png b/zelda-totk/assets/item_icons/key/GameRomHorseSaddle_05.png
similarity index 100%
rename from zelda-totk/assets/icons/key/GameRomHorseSaddle_05.png
rename to zelda-totk/assets/item_icons/key/GameRomHorseSaddle_05.png
diff --git a/zelda-totk/assets/icons/key/GameRomHorseSaddle_06.png b/zelda-totk/assets/item_icons/key/GameRomHorseSaddle_06.png
similarity index 100%
rename from zelda-totk/assets/icons/key/GameRomHorseSaddle_06.png
rename to zelda-totk/assets/item_icons/key/GameRomHorseSaddle_06.png
diff --git a/zelda-totk/assets/icons/key/GameRomHorseSaddle_07.png b/zelda-totk/assets/item_icons/key/GameRomHorseSaddle_07.png
similarity index 100%
rename from zelda-totk/assets/icons/key/GameRomHorseSaddle_07.png
rename to zelda-totk/assets/item_icons/key/GameRomHorseSaddle_07.png
diff --git a/zelda-totk/assets/icons/key/Item_StableHostelAccommodationCoupon_A.png b/zelda-totk/assets/item_icons/key/Item_StableHostelAccommodationCoupon_A.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Item_StableHostelAccommodationCoupon_A.png
rename to zelda-totk/assets/item_icons/key/Item_StableHostelAccommodationCoupon_A.png
diff --git a/zelda-totk/assets/icons/key/MinusRupee_00.png b/zelda-totk/assets/item_icons/key/MinusRupee_00.png
similarity index 100%
rename from zelda-totk/assets/icons/key/MinusRupee_00.png
rename to zelda-totk/assets/item_icons/key/MinusRupee_00.png
diff --git a/zelda-totk/assets/icons/key/MinusRupee_01.png b/zelda-totk/assets/item_icons/key/MinusRupee_01.png
similarity index 100%
rename from zelda-totk/assets/icons/key/MinusRupee_01.png
rename to zelda-totk/assets/item_icons/key/MinusRupee_01.png
diff --git a/zelda-totk/assets/icons/key/MinusRupee_02.png b/zelda-totk/assets/item_icons/key/MinusRupee_02.png
similarity index 100%
rename from zelda-totk/assets/icons/key/MinusRupee_02.png
rename to zelda-totk/assets/item_icons/key/MinusRupee_02.png
diff --git a/zelda-totk/assets/icons/key/Obj_AutoBuilderDraftAssassin_00.png b/zelda-totk/assets/item_icons/key/Obj_AutoBuilderDraftAssassin_00.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_AutoBuilderDraftAssassin_00.png
rename to zelda-totk/assets/item_icons/key/Obj_AutoBuilderDraftAssassin_00.png
diff --git a/zelda-totk/assets/icons/key/Obj_AutoBuilderDraft_00.png b/zelda-totk/assets/item_icons/key/Obj_AutoBuilderDraft_00.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_AutoBuilderDraft_00.png
rename to zelda-totk/assets/item_icons/key/Obj_AutoBuilderDraft_00.png
diff --git a/zelda-totk/assets/icons/key/Obj_Battery_Get.png b/zelda-totk/assets/item_icons/key/Obj_Battery_Get.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_Battery_Get.png
rename to zelda-totk/assets/item_icons/key/Obj_Battery_Get.png
diff --git a/zelda-totk/assets/icons/key/Obj_Camera.png b/zelda-totk/assets/item_icons/key/Obj_Camera.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_Camera.png
rename to zelda-totk/assets/item_icons/key/Obj_Camera.png
diff --git a/zelda-totk/assets/icons/key/Obj_CaveWellHonor_00.png b/zelda-totk/assets/item_icons/key/Obj_CaveWellHonor_00.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_CaveWellHonor_00.png
rename to zelda-totk/assets/item_icons/key/Obj_CaveWellHonor_00.png
diff --git a/zelda-totk/assets/icons/key/Obj_CheckPointHonor_00.png b/zelda-totk/assets/item_icons/key/Obj_CheckPointHonor_00.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_CheckPointHonor_00.png
rename to zelda-totk/assets/item_icons/key/Obj_CheckPointHonor_00.png
diff --git a/zelda-totk/assets/icons/key/Obj_DRStone_Get.png b/zelda-totk/assets/item_icons/key/Obj_DRStone_Get.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_DRStone_Get.png
rename to zelda-totk/assets/item_icons/key/Obj_DRStone_Get.png
diff --git a/zelda-totk/assets/icons/key/Obj_DefeatHonor_00.png b/zelda-totk/assets/item_icons/key/Obj_DefeatHonor_00.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_DefeatHonor_00.png
rename to zelda-totk/assets/item_icons/key/Obj_DefeatHonor_00.png
diff --git a/zelda-totk/assets/icons/key/Obj_DefeatHonor_01.png b/zelda-totk/assets/item_icons/key/Obj_DefeatHonor_01.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_DefeatHonor_01.png
rename to zelda-totk/assets/item_icons/key/Obj_DefeatHonor_01.png
diff --git a/zelda-totk/assets/icons/key/Obj_DefeatHonor_02.png b/zelda-totk/assets/item_icons/key/Obj_DefeatHonor_02.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_DefeatHonor_02.png
rename to zelda-totk/assets/item_icons/key/Obj_DefeatHonor_02.png
diff --git a/zelda-totk/assets/icons/key/Obj_DefeatHonor_03.png b/zelda-totk/assets/item_icons/key/Obj_DefeatHonor_03.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_DefeatHonor_03.png
rename to zelda-totk/assets/item_icons/key/Obj_DefeatHonor_03.png
diff --git a/zelda-totk/assets/icons/key/Obj_DefeatHonor_04.png b/zelda-totk/assets/item_icons/key/Obj_DefeatHonor_04.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_DefeatHonor_04.png
rename to zelda-totk/assets/item_icons/key/Obj_DefeatHonor_04.png
diff --git a/zelda-totk/assets/icons/key/Obj_DefeatHonor_05.png b/zelda-totk/assets/item_icons/key/Obj_DefeatHonor_05.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_DefeatHonor_05.png
rename to zelda-totk/assets/item_icons/key/Obj_DefeatHonor_05.png
diff --git a/zelda-totk/assets/icons/key/Obj_DungeonClearSeal.png b/zelda-totk/assets/item_icons/key/Obj_DungeonClearSeal.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_DungeonClearSeal.png
rename to zelda-totk/assets/item_icons/key/Obj_DungeonClearSeal.png
diff --git a/zelda-totk/assets/icons/key/Obj_EnergyUtuwa_A_01.png b/zelda-totk/assets/item_icons/key/Obj_EnergyUtuwa_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_EnergyUtuwa_A_01.png
rename to zelda-totk/assets/item_icons/key/Obj_EnergyUtuwa_A_01.png
diff --git a/zelda-totk/assets/icons/key/Obj_HiddenScroll_00.png b/zelda-totk/assets/item_icons/key/Obj_HiddenScroll_00.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_HiddenScroll_00.png
rename to zelda-totk/assets/item_icons/key/Obj_HiddenScroll_00.png
diff --git a/zelda-totk/assets/icons/key/Obj_KorokNuts.png b/zelda-totk/assets/item_icons/key/Obj_KorokNuts.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_KorokNuts.png
rename to zelda-totk/assets/item_icons/key/Obj_KorokNuts.png
diff --git a/zelda-totk/assets/icons/key/Obj_ProofKorok.png b/zelda-totk/assets/item_icons/key/Obj_ProofKorok.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_ProofKorok.png
rename to zelda-totk/assets/item_icons/key/Obj_ProofKorok.png
diff --git a/zelda-totk/assets/icons/key/Obj_SageSoulPlus_Gerudo.png b/zelda-totk/assets/item_icons/key/Obj_SageSoulPlus_Gerudo.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SageSoulPlus_Gerudo.png
rename to zelda-totk/assets/item_icons/key/Obj_SageSoulPlus_Gerudo.png
diff --git a/zelda-totk/assets/icons/key/Obj_SageSoulPlus_Goron.png b/zelda-totk/assets/item_icons/key/Obj_SageSoulPlus_Goron.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SageSoulPlus_Goron.png
rename to zelda-totk/assets/item_icons/key/Obj_SageSoulPlus_Goron.png
diff --git a/zelda-totk/assets/icons/key/Obj_SageSoulPlus_Rito.png b/zelda-totk/assets/item_icons/key/Obj_SageSoulPlus_Rito.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SageSoulPlus_Rito.png
rename to zelda-totk/assets/item_icons/key/Obj_SageSoulPlus_Rito.png
diff --git a/zelda-totk/assets/icons/key/Obj_SageSoulPlus_Zonau.png b/zelda-totk/assets/item_icons/key/Obj_SageSoulPlus_Zonau.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SageSoulPlus_Zonau.png
rename to zelda-totk/assets/item_icons/key/Obj_SageSoulPlus_Zonau.png
diff --git a/zelda-totk/assets/icons/key/Obj_SageSoulPlus_Zora.png b/zelda-totk/assets/item_icons/key/Obj_SageSoulPlus_Zora.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SageSoulPlus_Zora.png
rename to zelda-totk/assets/item_icons/key/Obj_SageSoulPlus_Zora.png
diff --git a/zelda-totk/assets/icons/key/Obj_SageSoul_Gerudo.png b/zelda-totk/assets/item_icons/key/Obj_SageSoul_Gerudo.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SageSoul_Gerudo.png
rename to zelda-totk/assets/item_icons/key/Obj_SageSoul_Gerudo.png
diff --git a/zelda-totk/assets/icons/key/Obj_SageSoul_Goron.png b/zelda-totk/assets/item_icons/key/Obj_SageSoul_Goron.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SageSoul_Goron.png
rename to zelda-totk/assets/item_icons/key/Obj_SageSoul_Goron.png
diff --git a/zelda-totk/assets/icons/key/Obj_SageSoul_Rito.png b/zelda-totk/assets/item_icons/key/Obj_SageSoul_Rito.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SageSoul_Rito.png
rename to zelda-totk/assets/item_icons/key/Obj_SageSoul_Rito.png
diff --git a/zelda-totk/assets/icons/key/Obj_SageSoul_Zonau.png b/zelda-totk/assets/item_icons/key/Obj_SageSoul_Zonau.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SageSoul_Zonau.png
rename to zelda-totk/assets/item_icons/key/Obj_SageSoul_Zonau.png
diff --git a/zelda-totk/assets/icons/key/Obj_SageSoul_Zora.png b/zelda-totk/assets/item_icons/key/Obj_SageSoul_Zora.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SageSoul_Zora.png
rename to zelda-totk/assets/item_icons/key/Obj_SageSoul_Zora.png
diff --git a/zelda-totk/assets/icons/key/Obj_SageWill.png b/zelda-totk/assets/item_icons/key/Obj_SageWill.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SageWill.png
rename to zelda-totk/assets/item_icons/key/Obj_SageWill.png
diff --git a/zelda-totk/assets/icons/key/Obj_StableHostlePointCard.png b/zelda-totk/assets/item_icons/key/Obj_StableHostlePointCard.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_StableHostlePointCard.png
rename to zelda-totk/assets/item_icons/key/Obj_StableHostlePointCard.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_00.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_00.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_00.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_00.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_01.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_01.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_01.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_01.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_02.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_02.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_02.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_02.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_03.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_03.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_03.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_03.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_04.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_04.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_04.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_04.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_05.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_05.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_05.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_05.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_06.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_06.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_06.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_06.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_07.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_07.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_07.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_07.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_08.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_08.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_08.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_08.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_09.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_09.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_09.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_09.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_10.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_10.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_10.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_10.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_11.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_11.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_11.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_11.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_12.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_12.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_12.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_12.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_13.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_13.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_13.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_13.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_14.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_14.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_14.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_14.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_15.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_15.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_15.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_15.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_16.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_16.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_16.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_16.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_17.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_17.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_17.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_17.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_18.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_18.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_18.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_18.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_19.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_19.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_19.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_19.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_20.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_20.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_20.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_20.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_21.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_21.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_21.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_21.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_22.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_22.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_22.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_22.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_23.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_23.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_23.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_23.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_24.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_24.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_24.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_24.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_25.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_25.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_25.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_25.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_26.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_26.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_26.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_26.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_27.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_27.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_27.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_27.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_28.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_28.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_28.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_28.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_29.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_29.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_29.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_29.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_30.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_30.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_30.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_30.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_31.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_31.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_31.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_31.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_32.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_32.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_32.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_32.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_33.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_33.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_33.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_33.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_34.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_34.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_34.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_34.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_35.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_35.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_35.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_35.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_36.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_36.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_36.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_36.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_37.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_37.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_37.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_37.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_38.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_38.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_38.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_38.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_39.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_39.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_39.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_39.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_40.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_40.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_40.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_40.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_41.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_41.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_41.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_41.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_43.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_43.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_43.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_43.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_45.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_45.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_45.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_45.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_46.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_46.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_46.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_46.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_48.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_48.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_48.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_48.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_49.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_49.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_49.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_49.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_51.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_51.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_51.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_51.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_52.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_52.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_52.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_52.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_53.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_53.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_53.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_53.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_55.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_55.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_55.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_55.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_56.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_56.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_56.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_56.png
diff --git a/zelda-totk/assets/icons/key/Obj_SubstituteCloth_Default.png b/zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_Default.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_SubstituteCloth_Default.png
rename to zelda-totk/assets/item_icons/key/Obj_SubstituteCloth_Default.png
diff --git a/zelda-totk/assets/icons/key/Obj_TreasureMap_00.png b/zelda-totk/assets/item_icons/key/Obj_TreasureMap_00.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_TreasureMap_00.png
rename to zelda-totk/assets/item_icons/key/Obj_TreasureMap_00.png
diff --git a/zelda-totk/assets/icons/key/Obj_WarpDLC.png b/zelda-totk/assets/item_icons/key/Obj_WarpDLC.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_WarpDLC.png
rename to zelda-totk/assets/item_icons/key/Obj_WarpDLC.png
diff --git a/zelda-totk/assets/icons/key/Obj_WarpDLC_Prototype.png b/zelda-totk/assets/item_icons/key/Obj_WarpDLC_Prototype.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Obj_WarpDLC_Prototype.png
rename to zelda-totk/assets/item_icons/key/Obj_WarpDLC_Prototype.png
diff --git a/zelda-totk/assets/icons/key/Parasail.png b/zelda-totk/assets/item_icons/key/Parasail.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail.png
rename to zelda-totk/assets/item_icons/key/Parasail.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern00.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern00.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern00.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern00.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern01.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern01.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern01.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern01.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern02.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern02.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern02.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern02.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern03.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern03.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern03.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern03.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern04.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern04.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern04.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern04.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern05.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern05.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern05.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern05.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern06.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern06.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern06.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern06.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern07.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern07.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern07.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern07.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern08.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern08.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern08.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern08.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern09.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern09.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern09.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern09.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern10.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern10.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern10.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern10.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern11.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern11.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern11.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern11.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern12.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern12.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern12.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern12.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern13.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern13.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern13.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern13.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern14.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern14.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern14.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern14.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern15.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern15.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern15.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern15.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern16.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern16.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern16.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern16.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern17.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern17.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern17.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern17.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern18.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern18.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern18.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern18.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern19.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern19.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern19.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern19.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern20.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern20.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern20.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern20.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern21.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern21.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern21.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern21.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern22.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern22.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern22.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern22.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern23.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern23.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern23.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern23.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern24.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern24.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern24.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern24.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern25.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern25.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern25.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern25.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern26.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern26.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern26.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern26.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern27.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern27.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern27.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern27.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern28.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern28.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern28.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern28.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern29.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern29.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern29.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern29.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern30.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern30.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern30.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern30.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern31.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern31.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern31.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern31.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern32.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern32.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern32.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern32.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern33.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern33.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern33.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern33.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern34.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern34.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern34.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern34.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern35.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern35.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern35.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern35.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern36.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern36.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern36.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern36.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern37.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern37.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern37.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern37.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern38.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern38.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern38.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern38.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern39.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern39.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern39.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern39.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern40.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern40.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern40.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern40.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern41.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern41.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern41.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern41.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern43.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern43.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern43.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern43.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern45.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern45.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern45.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern45.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern46.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern46.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern46.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern46.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern48.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern48.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern48.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern48.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern49.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern49.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern49.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern49.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern51.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern51.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern51.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern51.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern52.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern52.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern52.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern52.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern53.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern53.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern53.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern53.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern55.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern55.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern55.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern55.png
diff --git a/zelda-totk/assets/icons/key/Parasail_Pattern56.png b/zelda-totk/assets/item_icons/key/Parasail_Pattern56.png
similarity index 100%
rename from zelda-totk/assets/icons/key/Parasail_Pattern56.png
rename to zelda-totk/assets/item_icons/key/Parasail_Pattern56.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_A.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_A.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_A.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_A.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_AA.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_AA.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_AA.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_AA.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_AB.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_AB.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_AB.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_AB.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_AG.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_AG.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_AG.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_AG.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_AH.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_AH.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_AH.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_AH.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_AI.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_AI.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_AI.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_AI.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_B.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_B.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_B.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_B.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_C.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_C.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_C.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_C.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_E.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_E.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_E.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_E.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_F.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_F.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_F.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_F.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_G.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_G.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_G.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_G.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_H.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_H.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_H.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_H.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_I.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_I.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_I.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_I.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_M.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_M.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_M.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_M.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_N.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_N.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_N.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_N.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_P.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_P.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_P.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_P.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_Q.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_Q.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_Q.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_Q.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_R.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_R.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_R.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_R.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_S.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_S.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_S.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_S.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_T.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_T.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_T.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_T.png
diff --git a/zelda-totk/assets/icons/materials/Animal_Insect_X.png b/zelda-totk/assets/item_icons/materials/Animal_Insect_X.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Animal_Insect_X.png
rename to zelda-totk/assets/item_icons/materials/Animal_Insect_X.png
diff --git a/zelda-totk/assets/icons/materials/BeeHome.png b/zelda-totk/assets/item_icons/materials/BeeHome.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/BeeHome.png
rename to zelda-totk/assets/item_icons/materials/BeeHome.png
diff --git a/zelda-totk/assets/icons/materials/BombFruit.png b/zelda-totk/assets/item_icons/materials/BombFruit.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/BombFruit.png
rename to zelda-totk/assets/item_icons/materials/BombFruit.png
diff --git a/zelda-totk/assets/icons/materials/ConfusionFruit.png b/zelda-totk/assets/item_icons/materials/ConfusionFruit.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/ConfusionFruit.png
rename to zelda-totk/assets/item_icons/materials/ConfusionFruit.png
diff --git a/zelda-totk/assets/icons/materials/ElectricalFruit.png b/zelda-totk/assets/item_icons/materials/ElectricalFruit.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/ElectricalFruit.png
rename to zelda-totk/assets/item_icons/materials/ElectricalFruit.png
diff --git a/zelda-totk/assets/icons/materials/FireFruit.png b/zelda-totk/assets/item_icons/materials/FireFruit.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/FireFruit.png
rename to zelda-totk/assets/item_icons/materials/FireFruit.png
diff --git a/zelda-totk/assets/icons/materials/FldObj_Pinecone_A_01.png b/zelda-totk/assets/item_icons/materials/FldObj_Pinecone_A_01.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/FldObj_Pinecone_A_01.png
rename to zelda-totk/assets/item_icons/materials/FldObj_Pinecone_A_01.png
diff --git a/zelda-totk/assets/icons/materials/IceFruit.png b/zelda-totk/assets/item_icons/materials/IceFruit.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/IceFruit.png
rename to zelda-totk/assets/item_icons/materials/IceFruit.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_01.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_01.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_01.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_01.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_02.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_02.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_02.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_02.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_04.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_04.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_04.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_04.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_05.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_05.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_05.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_05.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_07.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_07.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_07.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_07.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_08.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_08.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_08.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_08.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_100.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_100.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_100.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_100.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_101.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_101.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_101.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_101.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_102.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_102.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_102.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_102.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_103.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_103.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_103.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_103.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_104.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_104.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_104.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_104.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_105.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_105.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_105.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_105.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_106.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_106.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_106.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_106.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_107.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_107.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_107.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_107.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_108.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_108.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_108.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_108.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_109.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_109.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_109.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_109.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_114.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_114.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_114.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_114.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_115.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_115.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_115.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_115.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_116.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_116.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_116.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_116.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_117.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_117.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_117.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_117.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_118.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_118.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_118.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_118.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_119.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_119.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_119.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_119.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_121.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_121.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_121.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_121.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_123.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_123.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_123.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_123.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_124.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_124.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_124.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_124.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_13.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_13.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_13.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_13.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_130.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_130.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_130.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_130.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_131.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_131.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_131.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_131.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_132.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_132.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_132.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_132.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_133.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_133.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_133.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_133.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_134.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_134.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_134.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_134.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_135.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_135.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_135.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_135.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_136.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_136.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_136.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_136.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_14.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_14.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_14.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_14.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_142.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_142.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_142.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_142.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_143.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_143.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_143.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_143.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_144.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_144.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_144.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_144.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_148.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_148.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_148.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_148.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_149.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_149.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_149.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_149.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_15.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_15.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_15.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_15.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_150.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_150.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_150.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_150.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_151.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_151.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_151.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_151.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_153.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_153.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_153.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_153.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_154.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_154.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_154.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_154.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_155.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_155.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_155.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_155.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_156.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_156.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_156.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_156.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_157.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_157.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_157.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_157.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_158.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_158.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_158.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_158.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_159.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_159.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_159.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_159.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_16.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_16.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_16.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_16.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_160.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_160.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_160.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_160.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_166.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_166.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_166.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_166.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_167.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_167.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_167.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_167.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_168.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_168.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_168.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_168.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_169.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_169.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_169.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_169.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_17.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_17.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_17.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_17.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_18.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_18.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_18.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_18.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_181.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_181.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_181.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_181.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_182.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_182.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_182.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_182.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_183.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_183.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_183.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_183.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_184.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_184.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_184.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_184.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_186.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_186.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_186.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_186.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_187.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_187.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_187.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_187.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_188.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_188.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_188.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_188.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_189.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_189.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_189.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_189.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_19.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_19.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_19.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_19.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_190.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_190.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_190.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_190.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_191.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_191.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_191.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_191.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_192.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_192.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_192.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_192.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_193.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_193.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_193.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_193.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_20.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_20.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_20.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_20.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_208.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_208.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_208.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_208.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_21.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_21.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_21.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_21.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_210.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_210.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_210.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_210.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_211.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_211.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_211.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_211.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_212.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_212.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_212.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_212.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_213.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_213.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_213.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_213.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_214.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_214.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_214.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_214.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_215.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_215.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_215.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_215.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_216.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_216.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_216.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_216.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_217.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_217.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_217.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_217.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_218.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_218.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_218.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_218.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_228.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_228.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_228.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_228.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_229.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_229.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_229.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_229.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_230.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_230.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_230.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_230.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_231.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_231.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_231.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_231.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_24.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_24.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_24.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_24.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_25.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_25.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_25.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_25.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_32.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_32.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_32.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_32.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_33.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_33.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_33.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_33.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_34.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_34.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_34.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_34.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_38.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_38.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_38.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_38.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_39.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_39.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_39.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_39.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_40.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_40.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_40.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_40.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_41.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_41.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_41.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_41.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_42.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_42.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_42.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_42.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_43.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_43.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_43.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_43.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_44.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_44.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_44.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_44.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_45.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_45.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_45.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_45.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_46.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_46.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_46.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_46.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_47.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_47.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_47.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_47.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_49.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_49.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_49.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_49.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_50.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_50.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_50.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_50.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_51.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_51.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_51.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_51.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_53.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_53.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_53.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_53.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_54.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_54.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_54.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_54.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_55.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_55.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_55.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_55.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_57.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_57.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_57.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_57.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_58.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_58.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_58.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_58.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_59.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_59.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_59.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_59.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_60.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_60.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_60.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_60.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_64.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_64.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_64.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_64.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_66.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_66.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_66.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_66.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_67.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_67.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_67.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_67.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_69.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_69.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_69.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_69.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_77.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_77.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_77.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_77.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_78.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_78.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_78.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_78.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_79.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_79.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_79.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_79.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_80.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_80.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_80.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_80.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_89.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_89.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_89.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_89.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_90.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_90.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_90.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_90.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_91.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_91.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_91.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_91.png
diff --git a/zelda-totk/assets/icons/materials/Item_Enemy_92.png b/zelda-totk/assets/item_icons/materials/Item_Enemy_92.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Enemy_92.png
rename to zelda-totk/assets/item_icons/materials/Item_Enemy_92.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_A.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_A.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_A.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_A.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_AA.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_AA.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_AA.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_AA.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_AC.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_AC.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_AC.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_AC.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_B.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_B.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_B.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_B.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_C.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_C.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_C.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_C.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_D.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_D.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_D.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_D.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_E.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_E.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_E.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_E.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_F.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_F.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_F.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_F.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_G.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_G.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_G.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_G.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_H.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_H.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_H.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_H.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_I.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_I.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_I.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_I.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_J.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_J.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_J.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_J.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_L.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_L.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_L.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_L.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_M.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_M.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_M.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_M.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_X.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_X.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_X.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_X.png
diff --git a/zelda-totk/assets/icons/materials/Item_FishGet_Z.png b/zelda-totk/assets/item_icons/materials/Item_FishGet_Z.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_FishGet_Z.png
rename to zelda-totk/assets/item_icons/materials/Item_FishGet_Z.png
diff --git a/zelda-totk/assets/icons/materials/Item_Fruit_A.png b/zelda-totk/assets/item_icons/materials/Item_Fruit_A.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Fruit_A.png
rename to zelda-totk/assets/item_icons/materials/Item_Fruit_A.png
diff --git a/zelda-totk/assets/icons/materials/Item_Fruit_B.png b/zelda-totk/assets/item_icons/materials/Item_Fruit_B.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Fruit_B.png
rename to zelda-totk/assets/item_icons/materials/Item_Fruit_B.png
diff --git a/zelda-totk/assets/icons/materials/Item_Fruit_C.png b/zelda-totk/assets/item_icons/materials/Item_Fruit_C.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Fruit_C.png
rename to zelda-totk/assets/item_icons/materials/Item_Fruit_C.png
diff --git a/zelda-totk/assets/icons/materials/Item_Fruit_E.png b/zelda-totk/assets/item_icons/materials/Item_Fruit_E.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Fruit_E.png
rename to zelda-totk/assets/item_icons/materials/Item_Fruit_E.png
diff --git a/zelda-totk/assets/icons/materials/Item_Fruit_F.png b/zelda-totk/assets/item_icons/materials/Item_Fruit_F.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Fruit_F.png
rename to zelda-totk/assets/item_icons/materials/Item_Fruit_F.png
diff --git a/zelda-totk/assets/icons/materials/Item_Fruit_G.png b/zelda-totk/assets/item_icons/materials/Item_Fruit_G.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Fruit_G.png
rename to zelda-totk/assets/item_icons/materials/Item_Fruit_G.png
diff --git a/zelda-totk/assets/icons/materials/Item_Fruit_H.png b/zelda-totk/assets/item_icons/materials/Item_Fruit_H.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Fruit_H.png
rename to zelda-totk/assets/item_icons/materials/Item_Fruit_H.png
diff --git a/zelda-totk/assets/icons/materials/Item_Fruit_I.png b/zelda-totk/assets/item_icons/materials/Item_Fruit_I.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Fruit_I.png
rename to zelda-totk/assets/item_icons/materials/Item_Fruit_I.png
diff --git a/zelda-totk/assets/icons/materials/Item_Fruit_J.png b/zelda-totk/assets/item_icons/materials/Item_Fruit_J.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Fruit_J.png
rename to zelda-totk/assets/item_icons/materials/Item_Fruit_J.png
diff --git a/zelda-totk/assets/icons/materials/Item_Fruit_K.png b/zelda-totk/assets/item_icons/materials/Item_Fruit_K.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Fruit_K.png
rename to zelda-totk/assets/item_icons/materials/Item_Fruit_K.png
diff --git a/zelda-totk/assets/icons/materials/Item_Fruit_L.png b/zelda-totk/assets/item_icons/materials/Item_Fruit_L.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Fruit_L.png
rename to zelda-totk/assets/item_icons/materials/Item_Fruit_L.png
diff --git a/zelda-totk/assets/icons/materials/Item_Fruit_M.png b/zelda-totk/assets/item_icons/materials/Item_Fruit_M.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Fruit_M.png
rename to zelda-totk/assets/item_icons/materials/Item_Fruit_M.png
diff --git a/zelda-totk/assets/icons/materials/Item_Fruit_N.png b/zelda-totk/assets/item_icons/materials/Item_Fruit_N.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Fruit_N.png
rename to zelda-totk/assets/item_icons/materials/Item_Fruit_N.png
diff --git a/zelda-totk/assets/icons/materials/Item_Fruit_P.png b/zelda-totk/assets/item_icons/materials/Item_Fruit_P.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Fruit_P.png
rename to zelda-totk/assets/item_icons/materials/Item_Fruit_P.png
diff --git a/zelda-totk/assets/icons/materials/Item_InsectGet_K.png b/zelda-totk/assets/item_icons/materials/Item_InsectGet_K.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_InsectGet_K.png
rename to zelda-totk/assets/item_icons/materials/Item_InsectGet_K.png
diff --git a/zelda-totk/assets/icons/materials/Item_InsectGet_O.png b/zelda-totk/assets/item_icons/materials/Item_InsectGet_O.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_InsectGet_O.png
rename to zelda-totk/assets/item_icons/materials/Item_InsectGet_O.png
diff --git a/zelda-totk/assets/icons/materials/Item_InsectGet_Z.png b/zelda-totk/assets/item_icons/materials/Item_InsectGet_Z.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_InsectGet_Z.png
rename to zelda-totk/assets/item_icons/materials/Item_InsectGet_Z.png
diff --git a/zelda-totk/assets/icons/materials/Item_KingScale.png b/zelda-totk/assets/item_icons/materials/Item_KingScale.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_KingScale.png
rename to zelda-totk/assets/item_icons/materials/Item_KingScale.png
diff --git a/zelda-totk/assets/icons/materials/Item_Material_01.png b/zelda-totk/assets/item_icons/materials/Item_Material_01.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Material_01.png
rename to zelda-totk/assets/item_icons/materials/Item_Material_01.png
diff --git a/zelda-totk/assets/icons/materials/Item_Material_02.png b/zelda-totk/assets/item_icons/materials/Item_Material_02.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Material_02.png
rename to zelda-totk/assets/item_icons/materials/Item_Material_02.png
diff --git a/zelda-totk/assets/icons/materials/Item_Material_03.png b/zelda-totk/assets/item_icons/materials/Item_Material_03.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Material_03.png
rename to zelda-totk/assets/item_icons/materials/Item_Material_03.png
diff --git a/zelda-totk/assets/icons/materials/Item_Material_04.png b/zelda-totk/assets/item_icons/materials/Item_Material_04.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Material_04.png
rename to zelda-totk/assets/item_icons/materials/Item_Material_04.png
diff --git a/zelda-totk/assets/icons/materials/Item_Material_05.png b/zelda-totk/assets/item_icons/materials/Item_Material_05.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Material_05.png
rename to zelda-totk/assets/item_icons/materials/Item_Material_05.png
diff --git a/zelda-totk/assets/icons/materials/Item_Material_06.png b/zelda-totk/assets/item_icons/materials/Item_Material_06.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Material_06.png
rename to zelda-totk/assets/item_icons/materials/Item_Material_06.png
diff --git a/zelda-totk/assets/icons/materials/Item_Material_07.png b/zelda-totk/assets/item_icons/materials/Item_Material_07.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Material_07.png
rename to zelda-totk/assets/item_icons/materials/Item_Material_07.png
diff --git a/zelda-totk/assets/icons/materials/Item_Material_08.png b/zelda-totk/assets/item_icons/materials/Item_Material_08.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Material_08.png
rename to zelda-totk/assets/item_icons/materials/Item_Material_08.png
diff --git a/zelda-totk/assets/icons/materials/Item_Material_09.png b/zelda-totk/assets/item_icons/materials/Item_Material_09.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Material_09.png
rename to zelda-totk/assets/item_icons/materials/Item_Material_09.png
diff --git a/zelda-totk/assets/icons/materials/Item_Material_10.png b/zelda-totk/assets/item_icons/materials/Item_Material_10.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Material_10.png
rename to zelda-totk/assets/item_icons/materials/Item_Material_10.png
diff --git a/zelda-totk/assets/icons/materials/Item_Material_11.png b/zelda-totk/assets/item_icons/materials/Item_Material_11.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Material_11.png
rename to zelda-totk/assets/item_icons/materials/Item_Material_11.png
diff --git a/zelda-totk/assets/icons/materials/Item_Meat_01.png b/zelda-totk/assets/item_icons/materials/Item_Meat_01.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Meat_01.png
rename to zelda-totk/assets/item_icons/materials/Item_Meat_01.png
diff --git a/zelda-totk/assets/icons/materials/Item_Meat_02.png b/zelda-totk/assets/item_icons/materials/Item_Meat_02.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Meat_02.png
rename to zelda-totk/assets/item_icons/materials/Item_Meat_02.png
diff --git a/zelda-totk/assets/icons/materials/Item_Meat_06.png b/zelda-totk/assets/item_icons/materials/Item_Meat_06.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Meat_06.png
rename to zelda-totk/assets/item_icons/materials/Item_Meat_06.png
diff --git a/zelda-totk/assets/icons/materials/Item_Meat_07.png b/zelda-totk/assets/item_icons/materials/Item_Meat_07.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Meat_07.png
rename to zelda-totk/assets/item_icons/materials/Item_Meat_07.png
diff --git a/zelda-totk/assets/icons/materials/Item_Meat_11.png b/zelda-totk/assets/item_icons/materials/Item_Meat_11.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Meat_11.png
rename to zelda-totk/assets/item_icons/materials/Item_Meat_11.png
diff --git a/zelda-totk/assets/icons/materials/Item_Meat_12.png b/zelda-totk/assets/item_icons/materials/Item_Meat_12.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Meat_12.png
rename to zelda-totk/assets/item_icons/materials/Item_Meat_12.png
diff --git a/zelda-totk/assets/icons/materials/Item_MushroomGet_D.png b/zelda-totk/assets/item_icons/materials/Item_MushroomGet_D.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_MushroomGet_D.png
rename to zelda-totk/assets/item_icons/materials/Item_MushroomGet_D.png
diff --git a/zelda-totk/assets/icons/materials/Item_MushroomGet_K.png b/zelda-totk/assets/item_icons/materials/Item_MushroomGet_K.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_MushroomGet_K.png
rename to zelda-totk/assets/item_icons/materials/Item_MushroomGet_K.png
diff --git a/zelda-totk/assets/icons/materials/Item_Mushroom_A.png b/zelda-totk/assets/item_icons/materials/Item_Mushroom_A.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Mushroom_A.png
rename to zelda-totk/assets/item_icons/materials/Item_Mushroom_A.png
diff --git a/zelda-totk/assets/icons/materials/Item_Mushroom_B.png b/zelda-totk/assets/item_icons/materials/Item_Mushroom_B.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Mushroom_B.png
rename to zelda-totk/assets/item_icons/materials/Item_Mushroom_B.png
diff --git a/zelda-totk/assets/icons/materials/Item_Mushroom_C.png b/zelda-totk/assets/item_icons/materials/Item_Mushroom_C.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Mushroom_C.png
rename to zelda-totk/assets/item_icons/materials/Item_Mushroom_C.png
diff --git a/zelda-totk/assets/icons/materials/Item_Mushroom_E.png b/zelda-totk/assets/item_icons/materials/Item_Mushroom_E.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Mushroom_E.png
rename to zelda-totk/assets/item_icons/materials/Item_Mushroom_E.png
diff --git a/zelda-totk/assets/icons/materials/Item_Mushroom_F.png b/zelda-totk/assets/item_icons/materials/Item_Mushroom_F.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Mushroom_F.png
rename to zelda-totk/assets/item_icons/materials/Item_Mushroom_F.png
diff --git a/zelda-totk/assets/icons/materials/Item_Mushroom_H.png b/zelda-totk/assets/item_icons/materials/Item_Mushroom_H.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Mushroom_H.png
rename to zelda-totk/assets/item_icons/materials/Item_Mushroom_H.png
diff --git a/zelda-totk/assets/icons/materials/Item_Mushroom_J.png b/zelda-totk/assets/item_icons/materials/Item_Mushroom_J.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Mushroom_J.png
rename to zelda-totk/assets/item_icons/materials/Item_Mushroom_J.png
diff --git a/zelda-totk/assets/icons/materials/Item_Mushroom_L.png b/zelda-totk/assets/item_icons/materials/Item_Mushroom_L.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Mushroom_L.png
rename to zelda-totk/assets/item_icons/materials/Item_Mushroom_L.png
diff --git a/zelda-totk/assets/icons/materials/Item_Mushroom_M.png b/zelda-totk/assets/item_icons/materials/Item_Mushroom_M.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Mushroom_M.png
rename to zelda-totk/assets/item_icons/materials/Item_Mushroom_M.png
diff --git a/zelda-totk/assets/icons/materials/Item_Mushroom_N.png b/zelda-totk/assets/item_icons/materials/Item_Mushroom_N.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Mushroom_N.png
rename to zelda-totk/assets/item_icons/materials/Item_Mushroom_N.png
diff --git a/zelda-totk/assets/icons/materials/Item_Mushroom_O.png b/zelda-totk/assets/item_icons/materials/Item_Mushroom_O.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Mushroom_O.png
rename to zelda-totk/assets/item_icons/materials/Item_Mushroom_O.png
diff --git a/zelda-totk/assets/icons/materials/Item_Mushroom_P.png b/zelda-totk/assets/item_icons/materials/Item_Mushroom_P.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Mushroom_P.png
rename to zelda-totk/assets/item_icons/materials/Item_Mushroom_P.png
diff --git a/zelda-totk/assets/icons/materials/Item_Ore_A.png b/zelda-totk/assets/item_icons/materials/Item_Ore_A.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Ore_A.png
rename to zelda-totk/assets/item_icons/materials/Item_Ore_A.png
diff --git a/zelda-totk/assets/icons/materials/Item_Ore_B.png b/zelda-totk/assets/item_icons/materials/Item_Ore_B.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Ore_B.png
rename to zelda-totk/assets/item_icons/materials/Item_Ore_B.png
diff --git a/zelda-totk/assets/icons/materials/Item_Ore_C.png b/zelda-totk/assets/item_icons/materials/Item_Ore_C.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Ore_C.png
rename to zelda-totk/assets/item_icons/materials/Item_Ore_C.png
diff --git a/zelda-totk/assets/icons/materials/Item_Ore_D.png b/zelda-totk/assets/item_icons/materials/Item_Ore_D.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Ore_D.png
rename to zelda-totk/assets/item_icons/materials/Item_Ore_D.png
diff --git a/zelda-totk/assets/icons/materials/Item_Ore_E.png b/zelda-totk/assets/item_icons/materials/Item_Ore_E.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Ore_E.png
rename to zelda-totk/assets/item_icons/materials/Item_Ore_E.png
diff --git a/zelda-totk/assets/icons/materials/Item_Ore_F.png b/zelda-totk/assets/item_icons/materials/Item_Ore_F.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Ore_F.png
rename to zelda-totk/assets/item_icons/materials/Item_Ore_F.png
diff --git a/zelda-totk/assets/icons/materials/Item_Ore_G.png b/zelda-totk/assets/item_icons/materials/Item_Ore_G.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Ore_G.png
rename to zelda-totk/assets/item_icons/materials/Item_Ore_G.png
diff --git a/zelda-totk/assets/icons/materials/Item_Ore_H.png b/zelda-totk/assets/item_icons/materials/Item_Ore_H.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Ore_H.png
rename to zelda-totk/assets/item_icons/materials/Item_Ore_H.png
diff --git a/zelda-totk/assets/icons/materials/Item_Ore_I.png b/zelda-totk/assets/item_icons/materials/Item_Ore_I.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Ore_I.png
rename to zelda-totk/assets/item_icons/materials/Item_Ore_I.png
diff --git a/zelda-totk/assets/icons/materials/Item_Ore_J.png b/zelda-totk/assets/item_icons/materials/Item_Ore_J.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Ore_J.png
rename to zelda-totk/assets/item_icons/materials/Item_Ore_J.png
diff --git a/zelda-totk/assets/icons/materials/Item_Ore_L.png b/zelda-totk/assets/item_icons/materials/Item_Ore_L.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Ore_L.png
rename to zelda-totk/assets/item_icons/materials/Item_Ore_L.png
diff --git a/zelda-totk/assets/icons/materials/Item_Ore_M.png b/zelda-totk/assets/item_icons/materials/Item_Ore_M.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Ore_M.png
rename to zelda-totk/assets/item_icons/materials/Item_Ore_M.png
diff --git a/zelda-totk/assets/icons/materials/Item_Ore_N.png b/zelda-totk/assets/item_icons/materials/Item_Ore_N.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Ore_N.png
rename to zelda-totk/assets/item_icons/materials/Item_Ore_N.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_A.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_A.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_A.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_A.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_B.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_B.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_B.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_B.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_C.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_C.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_C.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_C.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_E.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_E.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_E.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_E.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_F.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_F.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_F.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_F.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_G.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_G.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_G.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_G.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_H.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_H.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_H.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_H.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_I.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_I.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_I.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_I.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_J.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_J.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_J.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_J.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_L.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_L.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_L.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_L.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_M.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_M.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_M.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_M.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_O.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_O.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_O.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_O.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_Q.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_Q.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_Q.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_Q.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_R.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_R.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_R.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_R.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_S.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_S.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_S.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_S.png
diff --git a/zelda-totk/assets/icons/materials/Item_PlantGet_U.png b/zelda-totk/assets/item_icons/materials/Item_PlantGet_U.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_PlantGet_U.png
rename to zelda-totk/assets/item_icons/materials/Item_PlantGet_U.png
diff --git a/zelda-totk/assets/icons/materials/Item_Weapon_01.png b/zelda-totk/assets/item_icons/materials/Item_Weapon_01.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Item_Weapon_01.png
rename to zelda-totk/assets/item_icons/materials/Item_Weapon_01.png
diff --git a/zelda-totk/assets/icons/materials/LightBall_Large.png b/zelda-totk/assets/item_icons/materials/LightBall_Large.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/LightBall_Large.png
rename to zelda-totk/assets/item_icons/materials/LightBall_Large.png
diff --git a/zelda-totk/assets/icons/materials/LightBall_Small.png b/zelda-totk/assets/item_icons/materials/LightBall_Small.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/LightBall_Small.png
rename to zelda-totk/assets/item_icons/materials/LightBall_Small.png
diff --git a/zelda-totk/assets/icons/materials/LightFruit.png b/zelda-totk/assets/item_icons/materials/LightFruit.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/LightFruit.png
rename to zelda-totk/assets/item_icons/materials/LightFruit.png
diff --git a/zelda-totk/assets/icons/materials/Obj_FireWoodBundle.png b/zelda-totk/assets/item_icons/materials/Obj_FireWoodBundle.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/Obj_FireWoodBundle.png
rename to zelda-totk/assets/item_icons/materials/Obj_FireWoodBundle.png
diff --git a/zelda-totk/assets/icons/materials/SmokeFruit.png b/zelda-totk/assets/item_icons/materials/SmokeFruit.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/SmokeFruit.png
rename to zelda-totk/assets/item_icons/materials/SmokeFruit.png
diff --git a/zelda-totk/assets/icons/materials/WaterFruit.png b/zelda-totk/assets/item_icons/materials/WaterFruit.png
similarity index 100%
rename from zelda-totk/assets/icons/materials/WaterFruit.png
rename to zelda-totk/assets/item_icons/materials/WaterFruit.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_001.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_001.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_001.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_001.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_002.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_002.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_002.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_002.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_003.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_003.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_003.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_003.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_004.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_004.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_004.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_004.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_005.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_005.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_005.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_005.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_006.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_006.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_006.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_006.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_007.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_007.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_007.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_007.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_008.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_008.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_008.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_008.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_009.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_009.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_009.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_009.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_016.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_016.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_016.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_016.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_017.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_017.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_017.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_017.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_018.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_018.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_018.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_018.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_021.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_021.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_021.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_021.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_022.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_022.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_022.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_022.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_023.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_023.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_023.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_023.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_025.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_025.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_025.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_025.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_026.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_026.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_026.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_026.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_030.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_030.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_030.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_030.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_031.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_031.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_031.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_031.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_032.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_032.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_032.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_032.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_033.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_033.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_033.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_033.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_034.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_034.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_034.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_034.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_035.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_035.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_035.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_035.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_036.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_036.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_036.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_036.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_037.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_037.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_037.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_037.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_040.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_040.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_040.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_040.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_041.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_041.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_041.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_041.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_042.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_042.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_042.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_042.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_057.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_057.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_057.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_057.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_101.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_101.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_101.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_101.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_102.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_102.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_102.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_102.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_103.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_103.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_103.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_103.png
diff --git a/zelda-totk/assets/icons/shields/Weapon_Shield_107.png b/zelda-totk/assets/item_icons/shields/Weapon_Shield_107.png
similarity index 100%
rename from zelda-totk/assets/icons/shields/Weapon_Shield_107.png
rename to zelda-totk/assets/item_icons/shields/Weapon_Shield_107.png
diff --git a/zelda-totk/assets/_blank.png b/zelda-totk/assets/item_icons/unknown.png
similarity index 100%
rename from zelda-totk/assets/_blank.png
rename to zelda-totk/assets/item_icons/unknown.png
diff --git a/zelda-totk/assets/icons/weapons/Npc_Zelda_Torch.png b/zelda-totk/assets/item_icons/weapons/Npc_Zelda_Torch.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Npc_Zelda_Torch.png
rename to zelda-totk/assets/item_icons/weapons/Npc_Zelda_Torch.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_001.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_001.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_001.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_001.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_002.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_002.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_002.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_002.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_003.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_003.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_003.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_003.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_019.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_019.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_019.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_019.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_020.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_020.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_020.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_020.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_024.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_024.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_024.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_024.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_027.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_027.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_027.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_027.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_029.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_029.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_029.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_029.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_036.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_036.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_036.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_036.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_038.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_038.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_038.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_038.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_041.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_041.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_041.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_041.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_045.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_045.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_045.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_045.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_047.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_047.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_047.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_047.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_051.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_051.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_051.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_051.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_054.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_054.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_054.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_054.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_057.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_057.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_057.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_057.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_059.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_059.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_059.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_059.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_060.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_060.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_060.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_060.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_101.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_101.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_101.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_101.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_103.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_103.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_103.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_103.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_106.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_106.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_106.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_106.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_108.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_108.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_108.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_108.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_109.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_109.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_109.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_109.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_112.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_112.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_112.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_112.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_113.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_113.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_113.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_113.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_114.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_114.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_114.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_114.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_124.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_124.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_124.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_124.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_127.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_127.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_127.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_127.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_129.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_129.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_129.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_129.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_136.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_136.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_136.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_136.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_147.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_147.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_147.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_147.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_161.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_161.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_161.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_161.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_163.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_163.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_163.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_163.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_164.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_164.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_164.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_164.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_166.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_166.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_166.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_166.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_168.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_168.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_168.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_168.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Lsword_174.png b/zelda-totk/assets/item_icons/weapons/Weapon_Lsword_174.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Lsword_174.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Lsword_174.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_001.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_001.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_001.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_001.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_002.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_002.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_002.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_002.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_003.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_003.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_003.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_003.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_021.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_021.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_021.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_021.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_022.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_022.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_022.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_022.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_024.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_024.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_024.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_024.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_025.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_025.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_025.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_025.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_027.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_027.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_027.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_027.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_029.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_029.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_029.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_029.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_030.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_030.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_030.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_030.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_032.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_032.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_032.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_032.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_036.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_036.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_036.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_036.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_038.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_038.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_038.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_038.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_047.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_047.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_047.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_047.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_050.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_050.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_050.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_050.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_101.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_101.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_101.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_101.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_103.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_103.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_103.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_103.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_106.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_106.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_106.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_106.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_108.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_108.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_108.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_108.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_109.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_109.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_109.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_109.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_112.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_112.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_112.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_112.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_113.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_113.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_113.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_113.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_124.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_124.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_124.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_124.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_125.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_125.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_125.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_125.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_127.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_127.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_127.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_127.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_129.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_129.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_129.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_129.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_132.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_132.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_132.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_132.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_147.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_147.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_147.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_147.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_161.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_161.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_161.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_161.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_163.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_163.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_163.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_163.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_164.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_164.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_164.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_164.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_166.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_166.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_166.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_166.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_168.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_168.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_168.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_168.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Spear_173.png b/zelda-totk/assets/item_icons/weapons/Weapon_Spear_173.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Spear_173.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Spear_173.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_001.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_001.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_001.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_001.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_002.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_002.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_002.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_002.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_003.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_003.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_003.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_003.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_019.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_019.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_019.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_019.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_020.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_020.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_020.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_020.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_021.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_021.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_021.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_021.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_022.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_022.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_022.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_022.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_024.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_024.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_024.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_024.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_025.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_025.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_025.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_025.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_027.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_027.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_027.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_027.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_029.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_029.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_029.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_029.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_031.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_031.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_031.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_031.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_041.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_041.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_041.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_041.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_043.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_043.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_043.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_043.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_044.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_044.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_044.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_044.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_047.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_047.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_047.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_047.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_051.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_051.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_051.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_051.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_052.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_052.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_052.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_052.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_057.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_057.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_057.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_057.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_058.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_058.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_058.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_058.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_059.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_059.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_059.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_059.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_070.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_070.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_070.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_070.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_070_Attached.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_070_Attached.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_070_Attached.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_070_Attached.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_070_Broken.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_070_Broken.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_070_Broken.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_070_Broken.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_070_TrueForm.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_070_TrueForm.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_070_TrueForm.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_070_TrueForm.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_070_TrueForm_Attached.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_070_TrueForm_Attached.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_070_TrueForm_Attached.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_070_TrueForm_Attached.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_077.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_077.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_077.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_077.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_101.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_101.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_101.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_101.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_103.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_103.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_103.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_103.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_105.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_105.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_105.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_105.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_106.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_106.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_106.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_106.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_107.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_107.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_107.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_107.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_108.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_108.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_108.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_108.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_109.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_109.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_109.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_109.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_112.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_112.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_112.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_112.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_113.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_113.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_113.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_113.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_114.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_114.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_114.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_114.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_124.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_124.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_124.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_124.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_125.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_125.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_125.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_125.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_127.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_127.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_127.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_127.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_129.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_129.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_129.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_129.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_131.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_131.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_131.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_131.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_147.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_147.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_147.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_147.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_161.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_161.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_161.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_161.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_163.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_163.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_163.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_163.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_164.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_164.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_164.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_164.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_166.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_166.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_166.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_166.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_167.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_167.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_167.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_167.png
diff --git a/zelda-totk/assets/icons/weapons/Weapon_Sword_168.png b/zelda-totk/assets/item_icons/weapons/Weapon_Sword_168.png
similarity index 100%
rename from zelda-totk/assets/icons/weapons/Weapon_Sword_168.png
rename to zelda-totk/assets/item_icons/weapons/Weapon_Sword_168.png
diff --git a/zelda-totk/assets/octicons/octicon_infinity.svg b/zelda-totk/assets/octicons/octicon_infinity.svg
new file mode 100644
index 0000000..64f81ee
--- /dev/null
+++ b/zelda-totk/assets/octicons/octicon_infinity.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path d="M8 6.984c.59-.533 1.204-1.066 1.825-1.493.797-.548 1.7-.991 2.675-.991C14.414 4.5 16 6.086 16 8s-1.586 3.5-3.5 3.5c-.975 0-1.878-.444-2.675-.991-.621-.427-1.235-.96-1.825-1.493-.59.533-1.204 1.066-1.825 1.493-.797.547-1.7.991-2.675.991C1.586 11.5 0 9.914 0 8s1.586-3.5 3.5-3.5c.975 0 1.878.443 2.675.991.621.427 1.235.96 1.825 1.493ZM9.114 8c.536.483 1.052.922 1.56 1.273.704.483 1.3.727 1.826.727 1.086 0 2-.914 2-2 0-1.086-.914-2-2-2-.525 0-1.122.244-1.825.727-.51.35-1.025.79-1.561 1.273ZM3.5 6c-1.086 0-2 .914-2 2 0 1.086.914 2 2 2 .525 0 1.122-.244 1.825-.727.51-.35 1.025-.79 1.561-1.273-.536-.483-1.052-.922-1.56-1.273C4.621 6.244 4.025 6 3.5 6Z"></path></svg>
\ No newline at end of file
diff --git a/zelda-totk/assets/octicons/octicon_trash_danger.svg b/zelda-totk/assets/octicons/octicon_trash_danger.svg
deleted file mode 100644
index 04ec6b6..0000000
--- a/zelda-totk/assets/octicons/octicon_trash_danger.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill="#b72319" d="M11 1.75V3h2.25a.75.75 0 0 1 0 1.5H2.75a.75.75 0 0 1 0-1.5H5V1.75C5 .784 5.784 0 6.75 0h2.5C10.216 0 11 .784 11 1.75ZM4.496 6.675l.66 6.6a.25.25 0 0 0 .249.225h5.19a.25.25 0 0 0 .249-.225l.66-6.6a.75.75 0 0 1 1.492.149l-.66 6.6A1.748 1.748 0 0 1 10.595 15h-5.19a1.75 1.75 0 0 1-1.741-1.575l-.66-6.6a.75.75 0 1 1 1.492-.15ZM6.5 1.75V3h3V1.75a.25.25 0 0 0-.25-.25h-2.5a.25.25 0 0 0-.25.25Z"></path></svg>
\ No newline at end of file
diff --git a/zelda-totk/assets/tabs.png b/zelda-totk/assets/tabs.png
index 5b3f20d..3b929ad 100644
Binary files a/zelda-totk/assets/tabs.png and b/zelda-totk/assets/tabs.png differ
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_AllSpeed.svg b/zelda-totk/assets/tokt_ui_icons/bonus_AllSpeed.svg
new file mode 100644
index 0000000..78b0581
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_AllSpeed.svg
@@ -0,0 +1,3 @@
+<svg width="39" height="38" viewBox="0 0 39 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6918 23.3715L0.370117 32.5L11.5827 10.7383L19.2204 21.9678L23.4856 14.0369L16.4431 7.52981L38.8701 0L38.3742 26.8807L30.9349 20.3636L19.2204 38L11.6918 23.3715Z" fill="#0088FF"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_AttackUp.svg b/zelda-totk/assets/tokt_ui_icons/bonus_AttackUp.svg
new file mode 100644
index 0000000..8df045e
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_AttackUp.svg
@@ -0,0 +1,12 @@
+<svg width="35" height="33" viewBox="0 0 35 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M25.9395 17.3275L9.75347 0.898964H1.93951V8.56563L19.2418 23.899L22.0325 21.1609L12.14 11.8513L8.63719 7.47039L13.2563 10.7561L23.1488 20.0656L25.9395 17.3275Z" fill="#FFFDE3"/>
+<path d="M20.8537 27.4848C21.6348 28.2658 21.6348 29.5321 20.8537 30.3132C20.0727 31.0942 18.8063 31.0942 18.0253 30.3132C17.2443 29.5321 17.2443 28.2658 18.0253 27.4848C18.8063 26.7037 20.0727 26.7037 20.8537 27.4848Z" fill="#FFFDE3"/>
+<path d="M31.8537 16.4848C32.6348 17.2658 32.6348 18.5321 31.8537 19.3132C31.0727 20.0942 29.8064 20.0942 29.0253 19.3132C28.2443 18.5321 28.2443 17.2658 29.0253 16.4848C29.8064 15.7037 31.0727 15.7037 31.8537 16.4848Z" fill="#FFFDE3"/>
+<path d="M20.8537 27.4848C21.6348 28.2658 21.6348 29.5321 20.8537 30.3132L31.8537 19.3132C31.0727 20.0942 29.8064 20.0942 29.0253 19.3132C28.2443 18.5321 28.2443 17.2658 29.0253 16.4848L18.0253 27.4848C18.8063 26.7037 20.0727 26.7037 20.8537 27.4848Z" fill="#FFFDE3"/>
+<path d="M24.2 25.695C23.4189 24.9139 23.4189 23.6476 24.2 22.8666L24.9071 22.1594C25.6881 21.3784 26.9545 21.3784 27.7355 22.1594L33.5964 28.0203C34.3774 28.8013 34.3774 30.0677 33.5964 30.8487L32.8892 31.5558C32.1082 32.3369 30.8419 32.3369 30.0608 31.5558L24.2 25.695Z" fill="#FFFDE3"/>
+<path d="M3.26793 16.4848C2.48688 17.2658 2.48688 18.5321 3.26793 19.3132C4.04898 20.0942 5.3153 20.0942 6.09635 19.3132C6.8774 18.5321 6.8774 17.2658 6.09635 16.4848C5.3153 15.7037 4.04898 15.7037 3.26793 16.4848Z" fill="#FFFDE3"/>
+<path d="M10.9217 25.695C11.7027 24.9139 11.7027 23.6476 10.9217 22.8666L10.2146 22.1594C9.43352 21.3784 8.16719 21.3784 7.38614 22.1594L6.75017 22.7954L1.5253 28.0203C0.744252 28.8013 0.744252 30.0677 1.5253 30.8487L2.23241 31.5558C3.01346 32.3369 4.27979 32.3369 5.06084 31.5558L10.2857 26.331L10.9217 25.695Z" fill="#FFFDE3"/>
+<path d="M14.2679 30.3132C13.4869 29.5321 13.4869 28.2658 14.2679 27.4848C14.985 26.7677 16.111 26.7089 16.8951 27.3085L16.9047 27.2931L6.09635 16.4848C6.8774 17.2658 6.8774 18.5321 6.09635 19.3132C5.3153 20.0942 4.04898 20.0942 3.26793 19.3132L6.75017 22.7954L7.38614 22.1594C8.16719 21.3784 9.43352 21.3784 10.2146 22.1594L10.9217 22.8666C11.7027 23.6476 11.7027 24.9139 10.9217 25.695L10.2857 26.331L14.2679 30.3132Z" fill="#FFFDE3"/>
+<path d="M14.2679 27.4848C13.4869 28.2658 13.4869 29.5321 14.2679 30.3132C14.985 31.0302 16.111 31.089 16.8951 30.4895C16.2877 29.5197 16.2877 28.2782 16.8951 27.3085C16.111 26.7089 14.985 26.7677 14.2679 27.4848Z" fill="#FFFDE3"/>
+<path d="M25.3682 0.898964H33.1821V8.56563L27.4395 13.399L20.4395 6.39896L25.3682 0.898964Z" fill="#FFFDE3"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_AttackUpCold.svg b/zelda-totk/assets/tokt_ui_icons/bonus_AttackUpCold.svg
new file mode 100644
index 0000000..099838e
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_AttackUpCold.svg
@@ -0,0 +1,12 @@
+<svg width="37" height="32" viewBox="0 0 37 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.370117 24.5833V20.4167C0.370117 20.1865 0.550648 20 0.773343 20H3.1927L5.61205 17.0833L2.58995 13.5701C2.45873 13.4176 2.38625 13.2206 2.38625 13.0165V10.8333C2.38625 10.3731 2.74731 10 3.1927 10H5.84826C6.1632 10 6.4185 10.2638 6.4185 10.5893C6.4185 10.7455 6.35842 10.8954 6.25148 11.0059L5.20883 12.0833L13.2733 20.8333L14.7192 19.3393C14.8262 19.2287 14.9712 19.1667 15.1224 19.1667C15.4374 19.1667 15.6927 19.4305 15.6927 19.7559V22.5C15.6927 22.9602 15.3316 23.3333 14.8862 23.3333H11.9671C11.7695 23.3333 11.5789 23.2584 11.4313 23.1228L8.03141 20L5.20883 22.0833V24.5833C5.20883 24.8134 5.0283 25 4.8056 25H0.773343C0.550648 25 0.370117 24.8134 0.370117 24.5833Z" fill="#8FF7FF"/>
+<path d="M8.03141 12.5L19.725 0H25.3701V5.83333L12.8701 17.5L10.854 15.4167L18.0008 8.33333L20.5314 5L17.1944 7.5L10.0475 14.5833L8.03141 12.5Z" fill="#8FF7FF"/>
+<path d="M28.871 13.3889C28.871 14.156 28.2211 14.7778 27.4194 14.7778C26.6178 14.7778 25.9679 14.156 25.9679 13.3889C25.9679 12.6218 26.6178 12 27.4194 12C28.2211 12 28.871 12.6218 28.871 13.3889Z" fill="#8FF7FF"/>
+<path d="M28.871 30.6111C28.871 31.3782 28.2211 32 27.4194 32C26.6178 32 25.9679 31.3782 25.9679 30.6111C25.9679 29.8441 26.6178 29.2222 27.4194 29.2222C28.2211 29.2222 28.871 29.8441 28.871 30.6111Z" fill="#8FF7FF"/>
+<path d="M19.1455 24.9639C19.8398 24.5803 20.7275 24.8079 21.1284 25.4722C21.5275 26.1336 21.2934 26.9785 20.6062 27.3644C20.6031 27.3661 20.6001 27.3678 20.5971 27.3695C19.9028 27.753 19.015 27.5254 18.6142 26.8611C18.2134 26.1968 18.4512 25.3474 19.1455 24.9639Z" fill="#8FF7FF"/>
+<path d="M34.1925 16.5833C34.8868 16.1998 35.7746 16.4274 36.1754 17.0917C36.5762 17.756 36.3384 18.6054 35.6441 18.989C34.9498 19.3725 34.062 19.1449 33.6612 18.4806C33.2621 17.8192 33.4962 16.9743 34.1834 16.5884C34.1864 16.5867 34.1895 16.585 34.1925 16.5833Z" fill="#8FF7FF"/>
+<path d="M34.1925 27.3695C34.1907 27.3685 34.1888 27.3675 34.187 27.3665C33.497 26.9815 33.2614 26.1348 33.6612 25.4722C34.062 24.8079 34.9498 24.5803 35.6441 24.9639C36.3383 25.3474 36.5762 26.1968 36.1754 26.8611C35.7745 27.5254 34.8868 27.753 34.1925 27.3695Z" fill="#8FF7FF"/>
+<path d="M19.0961 18.989C18.4019 18.6054 18.164 17.756 18.5648 17.0917C18.9657 16.4274 19.8534 16.1998 20.5477 16.5833C20.5495 16.5843 20.5514 16.5854 20.5532 16.5864C21.2432 16.9713 21.4788 17.818 21.079 18.4806C20.6782 19.1449 19.7904 19.3725 19.0961 18.989Z" fill="#8FF7FF"/>
+<path d="M28.871 13.3889C28.871 14.156 28.2211 14.7778 27.4194 14.7778C26.6178 14.7778 25.9679 14.156 25.9679 13.3889V19.5923L20.5532 16.5864C21.2432 16.9713 21.4788 17.818 21.079 18.4806C20.6782 19.1449 19.7904 19.3725 19.0961 18.989L24.4935 21.9852L19.1455 24.9639C19.8398 24.5803 20.7275 24.8079 21.1284 25.4722C21.5275 26.1336 21.2934 26.9785 20.6062 27.3644L25.9679 24.3782V30.6111C25.9679 29.8441 26.6178 29.2222 27.4194 29.2222C28.2211 29.2222 28.871 29.8441 28.871 30.6111V24.4153L34.187 27.3665C33.497 26.9815 33.2614 26.1348 33.6612 25.4722C34.062 24.8079 34.9498 24.5803 35.6441 24.9639L30.2714 21.9813L35.6441 18.989C34.9498 19.3725 34.062 19.1449 33.6612 18.4806C33.2621 17.8192 33.4962 16.9743 34.1834 16.5884L28.871 19.5472V13.3889Z" fill="#8FF7FF"/>
+<path d="M0.370117 24.5833V20.4167C0.370117 20.1865 0.550648 20 0.773343 20H3.1927L5.61205 17.0833L2.58995 13.5701C2.45873 13.4176 2.38625 13.2206 2.38625 13.0165V10.8333C2.38625 10.3731 2.74731 10 3.1927 10H5.84826C6.1632 10 6.4185 10.2638 6.4185 10.5893C6.4185 10.7455 6.35842 10.8954 6.25148 11.0059L5.20883 12.0833L13.2733 20.8333L14.7192 19.3393C14.8262 19.2287 14.9712 19.1667 15.1224 19.1667C15.4374 19.1667 15.6927 19.4305 15.6927 19.7559V22.5C15.6927 22.9602 15.3316 23.3333 14.8862 23.3333H11.9671C11.7695 23.3333 11.5789 23.2584 11.4313 23.1228L8.03141 20L5.20883 22.0833V24.5833C5.20883 24.8134 5.0283 25 4.8056 25H0.773343C0.550648 25 0.370117 24.8134 0.370117 24.5833Z" fill="#8FF7FF"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_AttackUpHot.svg b/zelda-totk/assets/tokt_ui_icons/bonus_AttackUpHot.svg
new file mode 100644
index 0000000..1c8862a
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_AttackUpHot.svg
@@ -0,0 +1,13 @@
+<svg width="39" height="32" viewBox="0 0 39 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.0368 13.6667C30.0368 14.5871 29.2906 15.3333 28.3701 15.3333C27.4496 15.3333 26.7034 14.5871 26.7034 13.6667C26.7034 12.7462 27.4496 12 28.3701 12C29.2906 12 30.0368 12.7462 30.0368 13.6667Z" fill="#FF9600"/>
+<path d="M30.0368 30.3333C30.0368 31.2538 29.2906 32 28.3701 32C27.4496 32 26.7034 31.2538 26.7034 30.3333C26.7034 29.4129 27.4496 28.6667 28.3701 28.6667C29.2906 28.6667 30.0368 29.4129 30.0368 30.3333Z" fill="#FF9600"/>
+<path d="M21.7034 22C21.7034 22.9205 20.9573 23.6667 20.0368 23.6667C19.1163 23.6667 18.3701 22.9205 18.3701 22C18.3701 21.0795 19.1163 20.3333 20.0368 20.3333C20.9573 20.3333 21.7034 21.0795 21.7034 22Z" fill="#FF9600"/>
+<path d="M38.3701 22C38.3701 22.9205 37.6239 23.6667 36.7034 23.6667C35.783 23.6667 35.0368 22.9205 35.0368 22C35.0368 21.0795 35.783 20.3333 36.7034 20.3333C37.6239 20.3333 38.3701 21.0795 38.3701 22Z" fill="#FF9600"/>
+<path d="M23.6561 14.9289C24.3069 15.5798 24.3069 16.6351 23.6561 17.286C23.0052 17.9368 21.9499 17.9368 21.299 17.286C20.6482 16.6351 20.6482 15.5798 21.299 14.9289C21.9499 14.2781 23.0052 14.2781 23.6561 14.9289Z" fill="#FF9600"/>
+<path d="M35.4412 26.714C36.092 27.3649 36.092 28.4202 35.4412 29.0711C34.7903 29.7219 33.735 29.7219 33.0842 29.0711C32.4333 28.4202 32.4333 27.3649 33.0842 26.714C33.735 26.0632 34.7903 26.0632 35.4412 26.714Z" fill="#FF9600"/>
+<path d="M23.6561 26.714C24.3069 27.3649 24.3069 28.4202 23.6561 29.0711C23.0052 29.7219 21.9499 29.7219 21.299 29.0711C20.6482 28.4202 20.6482 27.3649 21.299 26.714C21.9499 26.0632 23.0052 26.0632 23.6561 26.714Z" fill="#FF9600"/>
+<path d="M35.4412 14.9289C36.092 15.5798 36.092 16.6351 35.4412 17.286C34.7903 17.9368 33.735 17.9368 33.0842 17.286C32.4333 16.6351 32.4333 15.5798 33.0842 14.9289C33.735 14.2781 34.7903 14.2781 35.4412 14.9289Z" fill="#FF9600"/>
+<path d="M32.8146 22C32.8146 24.4546 30.8247 26.4444 28.3701 26.4444C25.9155 26.4444 23.9257 24.4546 23.9257 22C23.9257 19.5454 25.9155 17.5556 28.3701 17.5556C30.8247 17.5556 32.8146 19.5454 32.8146 22Z" fill="#FF9600"/>
+<path d="M0.370117 24.5833V20.4167C0.370117 20.1865 0.550647 20 0.773342 20H3.1927L5.61205 17.0833L2.58995 13.5701C2.45873 13.4176 2.38625 13.2206 2.38625 13.0165V10.8333C2.38625 10.3731 2.74731 10 3.1927 10H5.84826C6.16319 10 6.4185 10.2638 6.4185 10.5893C6.4185 10.7455 6.35843 10.8954 6.25148 11.0059L5.20883 12.0833L13.2733 20.8333L14.7192 19.3393C14.8262 19.2287 14.9712 19.1667 15.1224 19.1667C15.4374 19.1667 15.6927 19.4305 15.6927 19.7559V22.5C15.6927 22.9602 15.3316 23.3333 14.8862 23.3333H11.9671C11.7695 23.3333 11.5789 23.2584 11.4313 23.1228L8.03141 20L5.20883 22.0833V24.5833C5.20883 24.8134 5.0283 25 4.8056 25H0.773342C0.550647 25 0.370117 24.8134 0.370117 24.5833Z" fill="#FF9600"/>
+<path d="M8.03141 12.5L19.725 0H25.3701V5.83333L12.8701 17.5L10.854 15.4167L18.0008 8.33333L20.5314 5L17.1944 7.5L10.0475 14.5833L8.03141 12.5Z" fill="#FF9600"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_AttackUpThunderstorm.svg b/zelda-totk/assets/tokt_ui_icons/bonus_AttackUpThunderstorm.svg
new file mode 100644
index 0000000..cb743a1
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_AttackUpThunderstorm.svg
@@ -0,0 +1,5 @@
+<svg width="36" height="32" viewBox="0 0 36 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M31.2088 13H23.5314L18.8701 23.8971H25.9991L22.1604 32H22.983L35.8701 18.8676H28.7411L31.2088 13Z" fill="#E7E810"/>
+<path d="M0.870117 24.5833V20.4167C0.870117 20.1865 1.05065 20 1.27334 20H3.6927L6.11205 17.0833L3.08995 13.5701C2.95873 13.4176 2.88625 13.2206 2.88625 13.0165V10.8333C2.88625 10.3731 3.24731 10 3.6927 10H6.34826C6.6632 10 6.9185 10.2638 6.9185 10.5893C6.9185 10.7455 6.85842 10.8954 6.75148 11.0059L5.70883 12.0833L13.7733 20.8333L15.2192 19.3393C15.3262 19.2287 15.4712 19.1667 15.6224 19.1667C15.9374 19.1667 16.1927 19.4305 16.1927 19.7559V22.5C16.1927 22.9602 15.8316 23.3333 15.3862 23.3333H12.4671C12.2695 23.3333 12.0789 23.2584 11.9313 23.1228L8.53141 20L5.70883 22.0833V24.5833C5.70883 24.8134 5.5283 25 5.3056 25H1.27334C1.05065 25 0.870117 24.8134 0.870117 24.5833Z" fill="#E7E810"/>
+<path d="M8.53141 12.5L20.225 0H25.8701V5.83333L13.3701 17.5L11.354 15.4167L18.5008 8.33333L21.0314 5L17.6944 7.5L10.5475 14.5833L8.53141 12.5Z" fill="#E7E810"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_ClimbSpeedUp.svg b/zelda-totk/assets/tokt_ui_icons/bonus_ClimbSpeedUp.svg
new file mode 100644
index 0000000..c7577f6
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_ClimbSpeedUp.svg
@@ -0,0 +1,3 @@
+<svg width="38" height="33" viewBox="0 0 38 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.7437 0.57421L0.277173 31.3157C-0.0349429 31.9789 0.448977 32.7415 1.18199 32.7415H36.0582C36.7842 32.7415 37.2683 31.9922 36.9698 31.3304L26.9712 9.15956C26.6248 8.39148 25.542 8.36983 25.1652 9.12346L23.5459 12.3622C23.363 12.7279 22.8424 12.7314 22.6545 12.3683L16.5368 0.54058C16.1561 -0.195494 15.0966 -0.175621 14.7437 0.57421ZM11.9187 17.5384C11.7717 17.869 12.0138 18.2415 12.3756 18.2415H19.2972C19.6689 18.2415 19.9106 17.8503 19.7444 17.5179L16.08 10.1891C15.8911 9.81116 15.3475 9.82351 15.1759 10.2096L11.9187 17.5384ZM26.5341 19.2195C26.3642 18.8311 25.8184 18.8171 25.6288 19.1963L22.468 25.5179C22.3018 25.8503 22.5435 26.2415 22.9152 26.2415H28.8417C29.2023 26.2415 29.4443 25.8714 29.2998 25.5411L26.5341 19.2195Z" fill="#86CC00"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_DefenseUp.svg b/zelda-totk/assets/tokt_ui_icons/bonus_DefenseUp.svg
new file mode 100644
index 0000000..d2df68f
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_DefenseUp.svg
@@ -0,0 +1,6 @@
+<svg width="45" height="33" viewBox="0 0 45 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M33.8013 24.2302V32.7751C33.8013 32.8993 33.8995 33 34.0206 33H37.9664C38.0875 33 38.1856 32.8993 38.1856 32.7751V24.2302C38.1856 24.106 38.2837 24.0054 38.4048 24.0054H44.2738C44.463 24.0054 44.5633 23.7761 44.4377 23.6311L36.1573 14.0755C36.0701 13.9748 35.9168 13.9748 35.8296 14.0755L27.5493 23.6311C27.4236 23.7761 27.524 24.0054 27.7131 24.0054H33.5821C33.7032 24.0054 33.8013 24.106 33.8013 24.2302Z" fill="#FFFDE3"/>
+<path d="M8.96008 0.479525L0.743033 5.23676C0.495643 5.37999 0.418472 5.7011 0.573766 5.9411L5.2832 13.2193C5.49966 13.5538 6.00135 13.5131 6.16106 13.1481L9.25505 6.0761C9.2771 6.02571 9.29068 5.97203 9.29525 5.91722L9.70887 0.953761C9.74241 0.55128 9.3096 0.277168 8.96008 0.479525Z" fill="#FFFDE3"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.8337 5.23676L32.6166 0.479525C32.2671 0.277168 31.8343 0.55128 31.8678 0.953761L32.2815 5.91722C32.286 5.97203 32.2996 6.02571 32.3216 6.0761L33.8071 9.47139C35.3263 8.7768 37.1141 8.84982 38.5769 9.69045L41.0029 5.9411C41.1582 5.7011 41.0811 5.37999 40.8337 5.23676ZM31.854 11.0118L23.7562 20.3567C20.9909 23.548 22.9733 29.0054 27.6987 29.0054H28.787V31H32.6869C33.2773 31 33.7391 30.4913 33.6823 29.9037L33.1114 24.0054L33.0873 23.7554L27.5349 23.6311L32.5187 17.8798L31.854 11.0118Z" fill="#FFFDE3"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.89444 29.9037C7.83758 30.4913 8.29945 31 8.88979 31H28.787H32.6869C33.2773 31 33.7391 30.4913 33.6823 29.9037L33.1114 24.0054L33.0873 23.7554L27.5349 23.6311L32.5187 17.8798L31.854 11.0118L30.8758 0.903676C30.8262 0.391096 30.3954 0 29.8805 0H25.6685C25.4236 0 25.1872 0.0898786 25.0042 0.252591L21.4527 3.40945C21.0738 3.74624 20.5029 3.74624 20.124 3.40945L16.5725 0.252591C16.3895 0.0898786 16.1531 0 15.9081 0H11.6962C11.1813 0 10.7505 0.391096 10.7009 0.903676L7.89444 29.9037ZM16.9888 5.2995C17.1617 5.12667 17.4341 5.10413 17.633 5.24619L20.5383 7.32143L23.4437 5.24619C23.6426 5.10413 23.915 5.12667 24.0879 5.2995L24.8571 6.06873C25.0802 6.29184 25.0434 6.66329 24.7809 6.83831L22.6633 8.25L24.7809 9.66169C25.0434 9.83671 25.0802 10.2082 24.8571 10.4313L24.0879 11.2005C23.915 11.3733 23.6426 11.3959 23.4437 11.2538L20.5383 9.17857L17.633 11.2538C17.4341 11.3959 17.1617 11.3733 16.9888 11.2005L16.2196 10.4313C15.9965 10.2082 16.0333 9.83671 16.2958 9.66169L18.4133 8.25L16.2958 6.83831C16.0333 6.66329 15.9965 6.29184 16.2196 6.06873L16.9888 5.2995ZM16.9888 12.2995C17.1617 12.1267 17.4341 12.1041 17.633 12.2462L20.5383 14.3214L23.4437 12.2462C23.6426 12.1041 23.915 12.1267 24.0879 12.2995L24.8571 13.0687C25.0802 13.2918 25.0434 13.6633 24.7809 13.8383L22.6633 15.25L24.7809 16.6617C25.0434 16.8367 25.0802 17.2082 24.8571 17.4313L24.0879 18.2005C23.915 18.3733 23.6426 18.3959 23.4437 18.2538L20.5383 16.1786L17.633 18.2538C17.4341 18.3959 17.1617 18.3733 16.9888 18.2005L16.2196 17.4313C15.9965 17.2082 16.0333 16.8367 16.2958 16.6617L18.4133 15.25L16.2958 13.8383C16.0333 13.6633 15.9965 13.2918 16.2196 13.0687L16.9888 12.2995Z" fill="#FFFDE3"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_DivingMobilityUp.svg b/zelda-totk/assets/tokt_ui_icons/bonus_DivingMobilityUp.svg
new file mode 100644
index 0000000..8894f06
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_DivingMobilityUp.svg
@@ -0,0 +1,3 @@
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.6201 0.140976L24.1201 7.64098H19.8701V15.391H27.6201V11.141L35.1201 17.641L27.6201 24.141V19.891H19.8701V27.641H24.1201L17.6201 35.141L11.1201 27.641H15.3701V19.891H7.62012V24.141L0.120117 17.641L7.62012 11.141L7.62012 15.391L15.3701 15.391V7.64098H11.1201L17.6201 0.140976Z" fill="#D900FF"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_DurabilityUp.svg b/zelda-totk/assets/tokt_ui_icons/bonus_DurabilityUp.svg
new file mode 100644
index 0000000..949e3fa
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_DurabilityUp.svg
@@ -0,0 +1,4 @@
+<svg width="44" height="37" viewBox="0 0 44 37" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M32.8079 27.9722V36.5171C32.8079 36.6413 32.906 36.742 33.0271 36.742H36.9729C37.094 36.742 37.1921 36.6413 37.1921 36.5171V27.9722C37.1921 27.848 37.2903 27.7473 37.4113 27.7473H43.2803C43.4695 27.7473 43.5699 27.5181 43.4442 27.3731L35.1638 17.8174C35.0766 17.7168 34.9233 17.7168 34.8361 17.8174L26.5558 27.3731C26.4301 27.5181 26.5305 27.7473 26.7196 27.7473H32.5886C32.7097 27.7473 32.8079 27.848 32.8079 27.9722Z" fill="#97F9FF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.8131 32.5339C19.5979 33.3378 20.8907 33.3378 21.6754 32.5339L22.8346 31.3465C20.4636 29.2183 19.8654 25.3441 22.3225 22.5799L29.8771 14.0809C32.3434 11.3064 36.6787 11.3064 39.145 14.0809L39.4038 14.3721C40.1285 13.5862 40.1077 12.3635 39.347 11.6027L27.7443 0H12.7443L1.14157 11.6027C0.367169 12.3771 0.359621 13.6303 1.12464 14.414L18.8131 32.5339ZM6.2443 13.5H13.2443L17.7443 25L6.2443 13.5ZM14.2443 12.5L17.2443 4.5H22.2443L25.2443 12.5H14.2443Z" fill="#97F9FF"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_DurabilityUpPlus.svg b/zelda-totk/assets/tokt_ui_icons/bonus_DurabilityUpPlus.svg
new file mode 100644
index 0000000..395bf81
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_DurabilityUpPlus.svg
@@ -0,0 +1,5 @@
+<svg width="63" height="38" viewBox="0 0 63 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M32.2521 28.7141V37.2591C32.2521 37.3832 32.3502 37.4839 32.4713 37.4839H36.4171C36.5382 37.4839 36.6363 37.3832 36.6363 37.2591V28.7141C36.6363 28.59 36.7345 28.4893 36.8555 28.4893H42.7246C42.9137 28.4893 43.0141 28.26 42.8884 28.115L34.608 18.5594C34.5208 18.4588 34.3676 18.4588 34.2804 18.5594L26 28.115C25.8743 28.26 25.9747 28.4893 26.1638 28.4893H32.0329C32.1539 28.4893 32.2521 28.59 32.2521 28.7141Z" fill="#FFCE00"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.2574 33.2759C19.0421 34.0798 20.3349 34.0798 21.1197 33.2759L22.2788 32.0885C19.9078 29.9602 19.3096 26.0861 21.7667 23.3219L29.3213 14.8229C31.7876 12.0483 36.1229 12.0483 38.5892 14.8229L38.848 15.114C39.5727 14.3282 39.552 13.1054 38.7912 12.3447L27.1885 0.741959H12.1885L0.585786 12.3447C-0.188617 13.1191 -0.196165 14.3723 0.568852 15.156L18.2574 33.2759ZM5.68851 14.242H12.6885L17.1885 25.742L5.68851 14.242ZM13.6885 13.242L16.6885 5.24196H21.6885L24.6885 13.242H13.6885Z" fill="#FFCE00"/>
+<path d="M51.3637 28.7141V37.2591C51.3637 37.3832 51.4618 37.4839 51.5829 37.4839H55.5287C55.6498 37.4839 55.7479 37.3832 55.7479 37.2591V28.7141C55.7479 28.59 55.8461 28.4893 55.9671 28.4893H61.8362C62.0253 28.4893 62.1257 28.26 62 28.115L53.7196 18.5594C53.6324 18.4588 53.4792 18.4588 53.392 18.5594L45.1116 28.115C44.9859 28.26 45.0863 28.4893 45.2754 28.4893H51.1445C51.2655 28.4893 51.3637 28.59 51.3637 28.7141Z" fill="#FFCE00"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_ExStaminaMaxUp.svg b/zelda-totk/assets/tokt_ui_icons/bonus_ExStaminaMaxUp.svg
new file mode 100644
index 0000000..0d04f53
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_ExStaminaMaxUp.svg
@@ -0,0 +1,4 @@
+<svg width="43" height="41" viewBox="0 0 43 41" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M43 34.25V29.25H36.25V22.5H31.25V29.25H24.5V34.25H31.25V41H36.25V34.25H43Z" fill="#FFFDE3"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.5 37C8.28273 37 0 28.7173 0 18.5C0 8.28273 8.28273 0 18.5 0C28.7173 0 37 8.28273 37 18.5C37 18.8961 36.9876 19.2893 36.963 19.6792C36.6216 19.563 36.2557 19.5 35.875 19.5H31.625C29.761 19.5 28.25 21.011 28.25 22.875V25.75C28.25 26.0261 28.0261 26.25 27.75 26.25H24.875C23.011 26.25 21.5 27.761 21.5 29.625V33.875C21.5 34.9391 21.9924 35.8881 22.7618 36.5067C21.3936 36.8293 19.9667 37 18.5 37ZM18.5 26C22.6421 26 26 22.6421 26 18.5C26 14.3579 22.6421 11 18.5 11C14.3579 11 11 14.3579 11 18.5C11 22.6421 14.3579 26 18.5 26Z" fill="#FFFF00"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_FinishBlow.svg b/zelda-totk/assets/tokt_ui_icons/bonus_FinishBlow.svg
new file mode 100644
index 0000000..be38f2c
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_FinishBlow.svg
@@ -0,0 +1,4 @@
+<svg width="43" height="39" viewBox="0 0 43 39" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9991 0.682166C14.2542 -0.227391 15.5443 -0.227388 15.7994 0.682169L15.9369 1.17268C17.7371 7.59241 22.5475 12.7367 28.8345 14.9655C29.6263 15.2462 29.6263 16.3654 28.8345 16.6461C22.5475 18.8748 17.7371 24.0191 15.9369 30.4389L15.7994 30.9294C15.5443 31.8389 14.2542 31.8389 13.9991 30.9294L13.8616 30.4389C12.0614 24.0191 7.25096 18.8748 0.963977 16.6461C0.172164 16.3654 0.172164 15.2462 0.963977 14.9655C7.25096 12.7367 12.0614 7.5924 13.8616 1.17268L13.9991 0.682166Z" fill="#FFCE00"/>
+<path d="M33.7814 22.507C33.924 22.0298 34.6002 22.0298 34.7429 22.507L34.7796 22.6299C35.8333 26.1558 38.5407 28.9469 42.0342 30.1089C42.4821 30.2579 42.4821 30.8912 42.0342 31.0402C38.5407 32.2022 35.8333 34.9933 34.7796 38.5192L34.7429 38.6421C34.6002 39.1193 33.924 39.1193 33.7814 38.6421L33.7447 38.5192C32.6909 34.9933 29.9836 32.2022 26.4901 31.0402C26.0422 30.8912 26.0422 30.2579 26.4901 30.1089C29.9836 28.9469 32.6909 26.1558 33.7447 22.6299L33.7814 22.507Z" fill="#FFCE00"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_FiveWay.svg b/zelda-totk/assets/tokt_ui_icons/bonus_FiveWay.svg
new file mode 100644
index 0000000..fe0d59d
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_FiveWay.svg
@@ -0,0 +1,6 @@
+<svg width="38" height="37" viewBox="0 0 38 37" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.5334 21.4305C23.7287 21.6258 23.7287 21.9424 23.5334 22.1376L22.1192 23.5519C21.9239 23.7471 21.6073 23.7471 21.4121 23.5519L6.83363 8.97341C6.63837 8.77814 6.32179 8.77814 6.12653 8.97341L4.25353 10.8464C3.98206 11.1179 3.51861 10.9948 3.41759 10.6244L0.874494 1.29981C0.772698 0.926557 1.11518 0.584069 1.48843 0.685864L10.8131 3.22894C11.1834 3.32995 11.3065 3.79341 11.0351 4.06487L8.95495 6.14498C8.75969 6.34024 8.75969 6.65682 8.95495 6.85209L23.5334 21.4305Z" fill="#FFCE00"/>
+<path d="M9.4113 36.4003C8.66393 37.1407 7.4522 37.1407 6.70483 36.4003C5.95745 35.6599 5.95745 34.4594 6.70483 33.719L8.68541 31.6703C6.46778 28.8608 5.1443 25.3128 5.1443 21.4557C5.1443 18.6665 5.83637 16.0389 7.05816 13.7353C7.35854 13.169 8.11662 13.0848 8.56992 13.5381L10.8951 15.8633C11.1989 16.1671 11.2706 16.6294 11.1039 17.0254C10.5306 18.3879 10.2137 19.8848 10.2137 21.4557C10.2137 23.8799 10.9684 26.1278 12.2556 27.9774L16.1443 23.9556C16.8917 23.2152 18.1034 23.2152 18.8508 23.9556C19.5981 24.6961 19.5981 25.8965 18.8508 26.637L9.4113 36.4003Z" fill="#FFCE00"/>
+<path d="M26.4113 18.9556C25.6639 19.6961 24.4522 19.6961 23.7048 18.9556C22.9575 18.2152 22.9575 17.0147 23.7048 16.2743L27.9282 11.9058C26.1252 10.717 23.9655 10.0251 21.6443 10.0251C19.9717 10.0251 18.3829 10.3843 16.9511 11.0299C16.5503 11.2106 16.0747 11.1434 15.7638 10.8325L13.4587 8.52736C13.0106 8.07932 13.0866 7.33128 13.6405 7.02347C16.0109 5.70602 18.74 4.95565 21.6443 4.95565C25.3364 4.95565 28.7453 6.16832 31.4943 8.21707L33.1262 6.52915L33.1443 6.51097C33.8917 5.77054 35.1034 5.77054 35.8508 6.51097C36.5981 7.2514 36.5981 8.45187 35.8508 9.1923L26.4113 18.9556Z" fill="#FFCE00"/>
+<path d="M37.8263 30.7467C37.8263 34.2617 35.4133 36.0097 32.4493 36.0097C29.7513 36.0097 27.6233 34.6417 27.0153 32.4757L29.0103 31.8297C29.4093 33.3687 30.8343 34.1477 32.4683 34.1477C34.0643 34.1477 35.7363 33.0837 35.7363 30.7657C35.7363 28.3527 34.0263 27.4217 32.4873 27.4217C31.2713 27.4217 29.8843 28.1817 29.3903 29.3217L27.3573 28.8847L28.0603 20.8477H36.8193V22.7097H29.9413L29.5423 26.9087H29.5803C30.1313 26.1867 31.3093 25.7497 32.8103 25.7497C35.2803 25.7497 37.8263 27.1367 37.8263 30.7467Z" fill="#FFCE00"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_GuardUp.svg b/zelda-totk/assets/tokt_ui_icons/bonus_GuardUp.svg
new file mode 100644
index 0000000..0874915
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_GuardUp.svg
@@ -0,0 +1,4 @@
+<svg width="39" height="36" viewBox="0 0 39 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.4935 28.099V35.699C28.4935 35.8094 28.583 35.899 28.6935 35.899H32.2935C32.4039 35.899 32.4935 35.8094 32.4935 35.699V28.099C32.4935 27.9885 32.583 27.899 32.6935 27.899H38.0481C38.2207 27.899 38.3122 27.6951 38.1976 27.5661L30.643 19.0671C30.5634 18.9776 30.4236 18.9776 30.344 19.0671L22.7894 27.5661C22.6747 27.6951 22.7663 27.899 22.9389 27.899H28.2935C28.4039 27.899 28.4935 27.9885 28.4935 28.099Z" fill="#FFFDE3"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.800296 8.11268C3.26814 8.11268 12.454 2.70423 16.7385 0C21.0229 2.70423 30.2088 8.11268 32.6766 8.11268C32.7898 9.86194 32.7585 12.0357 32.4913 14.3969C31.5819 14.0195 30.586 13.9112 29.6269 14.0721C29.7599 12.4631 29.7656 10.9867 29.6882 9.76056C27.6831 9.76056 20.2196 5.25352 16.7385 3C13.2573 5.25352 5.79383 9.76056 3.7887 9.76056C3.37097 16.3803 5.37609 30.2958 16.7385 33C17.8606 32.7329 18.8914 32.3565 19.8377 31.8886C20.6766 32.5151 21.7315 32.899 22.9389 32.899H23.4505C21.5811 34.3085 19.3625 35.3911 16.7385 36C2.75401 32.7549 0.286162 16.0563 0.800296 8.11268ZM26.6998 11.4085C26.7735 12.6232 26.7492 14.1452 26.5624 15.7955L19.0523 24.2443C17.6336 25.8404 17.4294 27.8778 18.0888 29.5748C17.659 29.741 17.2092 29.8835 16.7385 30C7.99818 27.8366 6.45578 16.7042 6.77711 11.4085C8.31951 11.4085 14.0607 7.80282 16.7385 6C19.4162 7.80282 25.1574 11.4085 26.6998 11.4085Z" fill="#FFFDE3"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_GuardUpPlus.svg b/zelda-totk/assets/tokt_ui_icons/bonus_GuardUpPlus.svg
new file mode 100644
index 0000000..9b72551
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_GuardUpPlus.svg
@@ -0,0 +1,6 @@
+<svg width="55" height="36" viewBox="0 0 55 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.3718 28.099V35.699C28.3718 35.8094 28.4614 35.899 28.5718 35.899H32.1718C32.2823 35.899 32.3718 35.8094 32.3718 35.699V28.099C32.3718 27.9885 32.4614 27.899 32.5718 27.899H37.9265C38.099 27.899 38.1906 27.6951 38.076 27.5661L30.5213 19.0671C30.4418 18.9776 30.3019 18.9776 30.2224 19.0671L22.6677 27.5661C22.5531 27.6951 22.6446 27.899 22.8172 27.899H28.1718C28.2823 27.899 28.3718 27.9885 28.3718 28.099Z" fill="#FFCE00"/>
+<path d="M44.6151 28.099V35.699C44.6151 35.8094 44.7047 35.899 44.8151 35.899H48.4151C48.5256 35.899 48.6151 35.8094 48.6151 35.699V28.099C48.6151 27.9885 48.7047 27.899 48.8151 27.899H54.1697C54.3423 27.899 54.4339 27.6951 54.3192 27.5661L46.7646 19.0671C46.685 18.9776 46.5452 18.9776 46.4656 19.0671L38.911 27.5661C38.7964 27.6951 38.8879 27.899 39.0605 27.899H44.4151C44.5256 27.899 44.6151 27.9885 44.6151 28.099Z" fill="#FFCE00"/>
+<path d="M28.3718 28.099V35.699C28.3718 35.8094 28.4614 35.899 28.5718 35.899H32.1718C32.2823 35.899 32.3718 35.8094 32.3718 35.699V28.099C32.3718 27.9885 32.4614 27.899 32.5718 27.899H37.9265C38.099 27.899 38.1906 27.6951 38.076 27.5661L30.5213 19.0671C30.4418 18.9776 30.3019 18.9776 30.2224 19.0671L22.6677 27.5661C22.5531 27.6951 22.6446 27.899 22.8172 27.899H28.1718C28.2823 27.899 28.3718 27.9885 28.3718 28.099Z" fill="#FFCE00"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.678653 8.11268C3.1465 8.11268 12.3324 2.70423 16.6168 0C20.9013 2.70423 30.0871 8.11268 32.555 8.11268C32.6682 9.86194 32.6368 12.0357 32.3697 14.3969C31.4603 14.0195 30.4643 13.9112 29.5053 14.0721C29.6382 12.4631 29.644 10.9867 29.5666 9.76056C27.5615 9.76056 20.0979 5.25352 16.6168 3C13.1357 5.25352 5.67218 9.76056 3.66706 9.76056C3.24933 16.3803 5.25445 30.2958 16.6168 33C17.7389 32.7329 18.7698 32.3565 19.7161 31.8886C20.555 32.5151 21.6098 32.899 22.8172 32.899H23.3289C21.4594 34.3085 19.2409 35.3911 16.6168 36C2.63236 32.7549 0.164519 16.0563 0.678653 8.11268ZM26.5782 11.4085C26.6519 12.6232 26.6275 14.1452 26.4407 15.7955L18.9307 24.2443C17.5119 25.8404 17.3077 27.8778 17.9671 29.5748C17.5373 29.741 17.0875 29.8835 16.6168 30C7.87654 27.8366 6.33413 16.7042 6.65547 11.4085C8.19787 11.4085 13.939 7.80282 16.6168 6C19.2946 7.80282 25.0358 11.4085 26.5782 11.4085Z" fill="#FFCE00"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_LifeMaxUp.svg b/zelda-totk/assets/tokt_ui_icons/bonus_LifeMaxUp.svg
new file mode 100644
index 0000000..c627634
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_LifeMaxUp.svg
@@ -0,0 +1,3 @@
+<svg width="36" height="29" viewBox="0 0 36 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 7.76395C0 3.62181 3.35786 0.263947 7.5 0.263947C9.72125 0.263947 11.717 1.22957 13.0903 2.76395L17.2929 6.96657C17.6834 7.3571 18.3166 7.3571 18.7071 6.96657L22.9097 2.76395C24.283 1.22957 26.2787 0.263947 28.5 0.263947C32.6421 0.263947 36 3.62181 36 7.76395C36 10.2187 34.8207 12.3979 32.9978 13.7661L18.7049 28.059C18.3152 28.4487 17.6838 28.4497 17.2929 28.0612L2.43539 13.2957C2.28446 13.1574 2.13919 13.0131 2 12.863C0.758825 11.5249 0 9.73303 0 7.76395Z" fill="#FFFF00"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_LifeRepair.svg b/zelda-totk/assets/tokt_ui_icons/bonus_LifeRepair.svg
new file mode 100644
index 0000000..c4c3e6e
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_LifeRepair.svg
@@ -0,0 +1,6 @@
+<svg width="48" height="34" viewBox="0 0 48 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 17.951L2.43539 18.3837C2.28446 18.2454 2.13919 18.1011 2 17.951Z" fill="#FF6637"/>
+<path d="M7.5 5.35193C3.35786 5.35193 0 8.70979 0 12.8519C0 14.821 0.758825 16.6129 2 17.951L2.43539 18.3837L17.2929 33.1492C17.6838 33.5377 18.3152 33.5367 18.7049 33.147L20.6464 31.2055C20.8417 31.0102 20.8417 30.6936 20.6464 30.4984L13.3371 23.189C13.1484 23.0003 13.1412 22.6966 13.3207 22.4992L17.6732 17.7114C17.8552 17.5112 17.845 17.2026 17.6501 17.0149L12.8501 12.3917C12.6552 12.204 12.645 11.8952 12.8272 11.6951L14.4626 9.89807C14.6423 9.70061 14.6351 9.39678 14.4463 9.20798L13.0903 7.85193C11.717 6.31756 9.72125 5.35193 7.5 5.35193Z" fill="#FF6637"/>
+<path d="M36 12.8519C36 8.70979 32.6421 5.35193 28.5 5.35193C26.2787 5.35193 24.283 6.31756 22.9097 7.85193L18.3659 12.4793C18.1664 12.6824 18.1766 13.0108 18.3882 13.2013L22.6265 17.0158C22.8325 17.2012 22.8484 17.5187 22.662 17.7238L18.3233 22.4963C18.1427 22.6949 18.1512 23.0007 18.3426 23.189L23.1481 27.9177C23.3432 28.1096 23.6563 28.1091 23.8507 27.9165L32.9978 18.8541C34.8207 17.4859 36 15.3066 36 12.8519Z" fill="#FF6637"/>
+<path d="M36 0.351929L36.4079 2.45207C37.3408 7.25534 41.0966 11.0111 45.8999 11.944L48 12.3519L45.8999 12.7598C41.0966 13.6927 37.3408 17.4485 36.4079 22.2518L36 24.3519L35.5921 22.2518C34.6592 17.4485 30.9034 13.6927 26.1001 12.7598L24 12.3519L26.1001 11.944C30.9034 11.0111 34.6592 7.25534 35.5921 2.45207L36 0.351929Z" fill="#FFFF00"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_LightEmission.svg b/zelda-totk/assets/tokt_ui_icons/bonus_LightEmission.svg
new file mode 100644
index 0000000..27dc107
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_LightEmission.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.62012 2.14099L15.7748 11.2132L17.6201 0.140991L19.4655 11.2132L32.6201 2.14099L23.548 15.2956L34.6201 17.141L23.548 18.9864L32.6201 32.141L19.4655 23.0688L17.6201 34.141L15.7748 23.0688L2.62012 32.141L11.6923 18.9864L0.620117 17.141L11.6923 15.2956L2.62012 2.14099Z" fill="#FFD800"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_LongThrow.svg b/zelda-totk/assets/tokt_ui_icons/bonus_LongThrow.svg
new file mode 100644
index 0000000..7ff515c
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_LongThrow.svg
@@ -0,0 +1,4 @@
+<svg width="35" height="32" viewBox="0 0 35 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.77261 32L23.354 17H16.3589C19.9564 6.2 24.8529 1.16667 26.8515 0H17.3582C8.96409 2.4 5.86626 12.3333 5.36661 17H0.370117L9.77261 32Z" fill="#FFCE00"/>
+<path d="M34.3463 21C34.702 9.60822 30.9947 3.31209 28.6483 1.1247C27.6723 1.75914 26.1427 3.18043 24.436 5.55893C27.6251 8.86561 32.6221 17.2356 34.3463 21Z" fill="#FFCE00"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_MiasmaGuard.svg b/zelda-totk/assets/tokt_ui_icons/bonus_MiasmaGuard.svg
new file mode 100644
index 0000000..5b79c20
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_MiasmaGuard.svg
@@ -0,0 +1,3 @@
+<svg width="37" height="31" viewBox="0 0 37 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.86887 15.0846C-0.462801 11.7529 -0.462801 6.35118 2.86887 3.0195C6.20054 -0.312166 11.6022 -0.312166 14.9339 3.0195L18.3806 6.20827L21.8063 3.0195C25.138 -0.312166 30.5397 -0.312166 33.8714 3.0195C37.203 6.35118 37.203 11.7529 33.8714 15.0846L18.3806 30.8542L2.86887 15.0846ZM6.35909 6.50973C4.69326 8.17556 4.69326 10.8764 6.35909 12.5423L18.3806 24.2187L30.4021 12.5423C32.0679 10.8764 32.0679 8.17556 30.4021 6.50973C28.7363 4.84389 26.0354 4.84389 24.3696 6.50973L18.3806 12.8437L12.3916 6.50973C10.7258 4.84389 8.02493 4.84389 6.35909 6.50973Z" fill="#00CEBD"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_NotSlippy.svg b/zelda-totk/assets/tokt_ui_icons/bonus_NotSlippy.svg
new file mode 100644
index 0000000..3da079d
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_NotSlippy.svg
@@ -0,0 +1,4 @@
+<svg width="27" height="29" viewBox="0 0 27 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.9161 12.2519L18.1013 1.02264C18.2815 0.632393 18.8375 0.636375 19.0121 1.02916L24.2915 12.9063C25.2129 14.9792 26.0404 17.1245 26.147 19.3904C26.3212 23.0926 25.4094 28.5208 18.5639 28.5208C12.1691 28.5208 10.8478 23.7839 10.7768 20.1421C10.7231 17.3818 11.7588 14.7584 12.9161 12.2519Z" fill="#9DF2FF"/>
+<path d="M2.46351 4.68711L4.13441 1.02275C4.31367 0.62963 4.87352 0.633605 5.04718 1.02924L6.93796 5.33681C7.8408 7.39365 8.82015 9.56038 8.46129 11.7778C8.19846 13.4019 7.26406 15.006 4.59803 15.006C2.32716 15.006 1.28725 13.8421 0.844551 12.4935C-0.00804138 9.89609 1.32931 7.17446 2.46351 4.68711Z" fill="#9DF2FF"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_QuietnessUp.svg b/zelda-totk/assets/tokt_ui_icons/bonus_QuietnessUp.svg
new file mode 100644
index 0000000..184478e
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_QuietnessUp.svg
@@ -0,0 +1,4 @@
+<svg width="33" height="30" viewBox="0 0 33 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.18434 11.6683L0.648804 8.1328L8.1771 0.604499L13.8716 6.29904L19.6292 0.541473L25.1669 6.07916L29.0734 2.17264L32.5915 5.69074L25.1669 13.1154L23.6488 11.5973L21.6488 9.59726L19.6322 7.58066L13.8716 13.3412L8.19154 7.66113L4.18434 11.6683Z" fill="#D900FF"/>
+<path d="M4.18434 27.4681L0.648804 23.9326L8.1771 16.4043L13.8716 22.0988L19.6292 16.3412L25.1669 21.8789L29.0734 17.9724L32.5915 21.4905L25.1669 28.9151L23.6488 27.397L21.6488 25.397L19.6322 23.3804L13.8716 29.141L8.19154 23.4609L4.18434 27.4681Z" fill="#D900FF"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_RapidFire.svg b/zelda-totk/assets/tokt_ui_icons/bonus_RapidFire.svg
new file mode 100644
index 0000000..6354ced
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_RapidFire.svg
@@ -0,0 +1,7 @@
+<svg width="41" height="38" viewBox="0 0 41 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.122 21.5608C23.3172 21.756 23.3172 22.0726 23.122 22.2679L21.7077 23.6821C21.5125 23.8773 21.1959 23.8773 21.0006 23.6821L6.42219 9.10363C6.22693 8.90837 5.91035 8.90837 5.71509 9.10363L3.84209 10.9766C3.57062 11.2481 3.10717 11.125 3.00616 10.7546L0.463056 1.43003C0.36126 1.05678 0.703745 0.714295 1.077 0.81609L10.4016 3.35916C10.772 3.46018 10.8951 3.92363 10.6236 4.1951L8.54352 6.2752C8.34825 6.47047 8.34825 6.78705 8.54352 6.98231L23.122 21.5608Z" fill="#FFCE00"/>
+<path d="M8.99986 36.5305C8.25249 37.271 7.04076 37.271 6.29339 36.5305C5.54602 35.7901 5.54602 34.5896 6.29339 33.8492L8.27397 31.8006C6.05635 28.991 4.73286 25.443 4.73286 21.5859C4.73286 18.7967 5.42493 16.1691 6.64672 13.8656C6.9471 13.2992 7.70518 13.2151 8.15848 13.6683L10.4837 15.9935C10.7875 16.2974 10.8591 16.7596 10.6925 17.1557C10.1192 18.5181 9.80227 20.015 9.80227 21.5859C9.80227 24.0101 10.5569 26.2581 11.8442 28.1077L15.7329 24.0859C16.4802 23.3454 17.692 23.3454 18.4393 24.0859C19.1867 24.8263 19.1867 26.0268 18.4393 26.7672L8.99986 36.5305Z" fill="#FFCE00"/>
+<path d="M25.9999 19.0859C25.2525 19.8263 24.0408 19.8263 23.2934 19.0859C22.546 18.3454 22.546 17.145 23.2934 16.4045L27.5168 12.036C25.7137 10.8472 23.5541 10.1553 21.2329 10.1553C19.5602 10.1553 17.9715 10.5146 16.5396 11.1601C16.1389 11.3408 15.6632 11.2736 15.3524 10.9628L13.0472 8.65759C12.5992 8.20955 12.6752 7.46151 13.229 7.1537C15.5995 5.83625 18.3286 5.08588 21.2329 5.08588C24.925 5.08588 28.3338 6.29854 31.0829 8.3473L32.7147 6.65938L32.7329 6.64119C33.4802 5.90076 34.692 5.90076 35.4393 6.64119C36.1867 7.38162 36.1867 8.5821 35.4393 9.32253L25.9999 19.0859Z" fill="#FFCE00"/>
+<path d="M25.2984 36.9444C24.9835 37.2593 24.4449 37.0363 24.4449 36.5908V23.005C24.4449 22.5596 24.9835 22.3365 25.2984 22.6515L32.0913 29.4444C32.2866 29.6396 32.2866 29.9562 32.0913 30.1515L25.2984 36.9444Z" fill="#FFCE00"/>
+<path d="M33.2984 36.9444C32.9835 37.2593 32.4449 37.0363 32.4449 36.5908V23.005C32.4449 22.5596 32.9835 22.3365 33.2984 22.6515L40.0913 29.4444C40.2866 29.6396 40.2866 29.9562 40.0913 30.1515L33.2984 36.9444Z" fill="#FFCE00"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_ResistBurn.svg b/zelda-totk/assets/tokt_ui_icons/bonus_ResistBurn.svg
new file mode 100644
index 0000000..050e23a
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_ResistBurn.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="40" viewBox="0 0 32 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M31.8701 24.2302C31.8701 32.7906 24.9305 39.7302 16.3701 39.7302C7.8097 39.7302 0.870117 32.7906 0.870117 24.2302C0.870117 21.3928 1.63253 18.7334 2.96368 16.4458C3.71594 15.1531 4.64982 13.979 5.73037 12.9587C7.45504 11.3301 9.43498 9.97453 11.1123 8.29722L12.8125 6.59706C13.8846 5.52496 14.8701 4.24638 14.8701 2.7302C14.8701 1.74696 14.6336 0.818963 14.2144 0C16.4464 1.83401 17.8701 4.61584 17.8701 7.7302C17.8701 8.09041 17.8511 8.44618 17.8139 8.79655C17.7684 9.22637 17.6956 9.64805 17.5973 10.0599C17.0362 12.4115 14.6584 13.8213 13.5432 15.9664C13.1131 16.7935 12.8701 17.7335 12.8701 18.7302C12.8701 22.0439 15.5564 24.7302 18.8701 24.7302C22.1838 24.7302 24.8701 22.0439 24.8701 18.7302C24.8701 18.2514 24.814 17.7858 24.7081 17.3394C24.4267 16.1537 23.1991 15.503 22.4681 14.5278C22.2633 14.2546 22.1041 13.9453 22.0016 13.6112C21.9161 13.3326 21.8701 13.0368 21.8701 12.7302C21.8701 11.7191 22.3703 10.8248 23.1368 10.2813C23.8984 9.81945 24.553 9.94137 24.8701 10C25.2747 10.0748 25.2402 10.2363 25.3701 11C25.6104 12.4131 25.899 12.9985 26.8947 13.9441C28.7357 15.6925 30.6895 17.7634 31.3453 20.2162C31.6876 21.4965 31.8701 22.842 31.8701 24.2302Z" fill="#FF3F3F"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_ResistCold.svg b/zelda-totk/assets/tokt_ui_icons/bonus_ResistCold.svg
new file mode 100644
index 0000000..3cd6511
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_ResistCold.svg
@@ -0,0 +1,9 @@
+<svg width="32" height="36" viewBox="0 0 32 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.955 2.5C18.955 3.88071 17.8357 5 16.455 5C15.0743 5 13.955 3.88071 13.955 2.5C13.955 1.11929 15.0743 0 16.455 0C17.8357 0 18.955 1.11929 18.955 2.5Z" fill="#8FF7FF"/>
+<path d="M18.955 33.5C18.955 34.8807 17.8357 36 16.455 36C15.0743 36 13.955 34.8807 13.955 33.5C13.955 32.1193 15.0743 31 16.455 31C17.8357 31 18.955 32.1193 18.955 33.5Z" fill="#8FF7FF"/>
+<path d="M2.20506 23.3349C3.40079 22.6446 4.92976 23.0543 5.62012 24.25C6.30745 25.4405 5.90435 26.9613 4.72072 27.6559C4.71551 27.659 4.71029 27.662 4.70506 27.6651C3.50932 28.3554 1.98035 27.9457 1.28999 26.75C0.599637 25.5543 1.00932 24.0253 2.20506 23.3349Z" fill="#8FF7FF"/>
+<path d="M28.1201 8.25C29.3158 7.55964 30.8448 7.96933 31.5352 9.16506C32.2255 10.3608 31.8158 11.8898 30.6201 12.5801C29.4244 13.2705 27.8954 12.8608 27.205 11.6651C26.5177 10.4746 26.9208 8.95374 28.1044 8.25912C28.1096 8.25606 28.1149 8.25302 28.1201 8.25Z" fill="#8FF7FF"/>
+<path d="M28.12 27.6651C28.1169 27.6633 28.1138 27.6614 28.1106 27.6596C26.9222 26.9667 26.5164 25.4426 27.205 24.25C27.8953 23.0543 29.4243 22.6446 30.62 23.3349C31.8158 24.0253 32.2255 25.5543 31.5351 26.75C30.8448 27.9457 29.3158 28.3554 28.12 27.6651Z" fill="#8FF7FF"/>
+<path d="M2.12005 12.5801C0.924315 11.8898 0.514627 10.3608 1.20498 9.16506C1.89534 7.96933 3.42431 7.55964 4.62005 8.25C4.62318 8.25181 4.62632 8.25363 4.62944 8.25545C5.81792 8.94838 6.22365 10.4725 5.53511 11.6651C4.84475 12.8608 3.31578 13.2705 2.12005 12.5801Z" fill="#8FF7FF"/>
+<path d="M18.955 2.5C18.955 3.88071 17.8357 5 16.455 5C15.0743 5 13.955 3.88071 13.955 2.5V13.6661L4.62944 8.25545C5.81792 8.94838 6.22365 10.4725 5.53511 11.6651C4.84475 12.8608 3.31578 13.2705 2.12005 12.5801L11.4158 17.9734L2.20506 23.3349C3.40079 22.6446 4.92976 23.0543 5.62012 24.25C6.30745 25.4405 5.90435 26.9613 4.72072 27.6559L13.955 22.2807V33.5C13.955 32.1193 15.0743 31 16.455 31C17.8357 31 18.955 32.1193 18.955 33.5V22.3476L28.1106 27.6596C26.9222 26.9667 26.5164 25.4426 27.205 24.25C27.8953 23.0543 29.4243 22.6446 30.62 23.3349L21.3669 17.9663L30.6201 12.5801C29.4244 13.2705 27.8954 12.8608 27.205 11.6651C26.5177 10.4746 26.9208 8.95374 28.1044 8.25912L18.955 13.5849V2.5Z" fill="#8FF7FF"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_ResistElectric.svg b/zelda-totk/assets/tokt_ui_icons/bonus_ResistElectric.svg
new file mode 100644
index 0000000..6730ac7
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_ResistElectric.svg
@@ -0,0 +1,3 @@
+<svg width="31" height="37" viewBox="0 0 31 37" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.620117 20.2302L19.6201 0.730194L16.6201 12.7302L30.1201 17.2302L10.6201 36.7302L13.1201 24.2302L0.620117 20.2302Z" fill="#E7E810"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_ResistFreeze.svg b/zelda-totk/assets/tokt_ui_icons/bonus_ResistFreeze.svg
new file mode 100644
index 0000000..f8fa045
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_ResistFreeze.svg
@@ -0,0 +1,9 @@
+<svg width="32" height="36" viewBox="0 0 32 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.955 2.5C18.955 3.88071 17.8357 5 16.455 5C15.0743 5 13.955 3.88071 13.955 2.5C13.955 1.11929 15.0743 0 16.455 0C17.8357 0 18.955 1.11929 18.955 2.5Z" fill="#FFFDE3"/>
+<path d="M18.955 33.5C18.955 34.8807 17.8357 36 16.455 36C15.0743 36 13.955 34.8807 13.955 33.5C13.955 32.1193 15.0743 31 16.455 31C17.8357 31 18.955 32.1193 18.955 33.5Z" fill="#FFFDE3"/>
+<path d="M2.20506 23.3349C3.40079 22.6446 4.92976 23.0543 5.62012 24.25C6.30745 25.4405 5.90435 26.9613 4.72072 27.6559C4.71551 27.659 4.71029 27.662 4.70506 27.6651C3.50932 28.3554 1.98035 27.9457 1.28999 26.75C0.599637 25.5543 1.00932 24.0253 2.20506 23.3349Z" fill="#FFFDE3"/>
+<path d="M28.1201 8.25C29.3158 7.55964 30.8448 7.96933 31.5352 9.16506C32.2255 10.3608 31.8158 11.8898 30.6201 12.5801C29.4244 13.2705 27.8954 12.8608 27.205 11.6651C26.5177 10.4746 26.9208 8.95374 28.1044 8.25912C28.1096 8.25606 28.1149 8.25302 28.1201 8.25Z" fill="#FFFDE3"/>
+<path d="M28.12 27.6651C28.1169 27.6633 28.1138 27.6614 28.1106 27.6596C26.9222 26.9667 26.5164 25.4426 27.205 24.25C27.8953 23.0543 29.4243 22.6446 30.62 23.3349C31.8158 24.0253 32.2255 25.5543 31.5351 26.75C30.8448 27.9457 29.3158 28.3554 28.12 27.6651Z" fill="#FFFDE3"/>
+<path d="M2.12005 12.5801C0.924315 11.8898 0.514627 10.3608 1.20498 9.16506C1.89534 7.96933 3.42431 7.55964 4.62005 8.25C4.62318 8.25181 4.62632 8.25363 4.62944 8.25545C5.81792 8.94838 6.22365 10.4725 5.53511 11.6651C4.84475 12.8608 3.31578 13.2705 2.12005 12.5801Z" fill="#FFFDE3"/>
+<path d="M18.955 2.5C18.955 3.88071 17.8357 5 16.455 5C15.0743 5 13.955 3.88071 13.955 2.5V13.6661L4.62944 8.25545C5.81792 8.94838 6.22365 10.4725 5.53511 11.6651C4.84475 12.8608 3.31578 13.2705 2.12005 12.5801L11.4158 17.9734L2.20506 23.3349C3.40079 22.6446 4.92976 23.0543 5.62012 24.25C6.30745 25.4405 5.90435 26.9613 4.72072 27.6559L13.955 22.2807V33.5C13.955 32.1193 15.0743 31 16.455 31C17.8357 31 18.955 32.1193 18.955 33.5V22.3476L28.1106 27.6596C26.9222 26.9667 26.5164 25.4426 27.205 24.25C27.8953 23.0543 29.4243 22.6446 30.62 23.3349L21.3669 17.9663L30.6201 12.5801C29.4244 13.2705 27.8954 12.8608 27.205 11.6651C26.5177 10.4746 26.9208 8.95374 28.1044 8.25912L18.955 13.5849V2.5Z" fill="#FFFDE3"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_ResistHot.svg b/zelda-totk/assets/tokt_ui_icons/bonus_ResistHot.svg
new file mode 100644
index 0000000..966ced4
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_ResistHot.svg
@@ -0,0 +1,11 @@
+<svg width="37" height="36" viewBox="0 0 37 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.3701 3C21.3701 4.65685 20.027 6 18.3701 6C16.7133 6 15.3701 4.65685 15.3701 3C15.3701 1.34315 16.7133 0 18.3701 0C20.027 0 21.3701 1.34315 21.3701 3Z" fill="#FF9600"/>
+<path d="M21.3701 33C21.3701 34.6569 20.027 36 18.3701 36C16.7133 36 15.3701 34.6569 15.3701 33C15.3701 31.3431 16.7133 30 18.3701 30C20.027 30 21.3701 31.3431 21.3701 33Z" fill="#FF9600"/>
+<path d="M6.37012 18C6.37012 19.6569 5.02697 21 3.37012 21C1.71326 21 0.370117 19.6569 0.370117 18C0.370117 16.3431 1.71326 15 3.37012 15C5.02697 15 6.37012 16.3431 6.37012 18Z" fill="#FF9600"/>
+<path d="M36.3701 18C36.3701 19.6569 35.027 21 33.3701 21C31.7133 21 30.3701 19.6569 30.3701 18C30.3701 16.3431 31.7133 15 33.3701 15C35.027 15 36.3701 16.3431 36.3701 18Z" fill="#FF9600"/>
+<path d="M9.88481 5.27208C11.0564 6.44365 11.0564 8.34315 9.88481 9.51472C8.71323 10.6863 6.81374 10.6863 5.64217 9.51472C4.47059 8.34315 4.47059 6.44365 5.64217 5.27208C6.81374 4.10051 8.71323 4.10051 9.88481 5.27208Z" fill="#FF9600"/>
+<path d="M31.098 26.4853C32.2696 27.6569 32.2696 29.5563 31.098 30.7279C29.9264 31.8995 28.0269 31.8995 26.8554 30.7279C25.6838 29.5563 25.6838 27.6569 26.8554 26.4853C28.0269 25.3137 29.9264 25.3137 31.098 26.4853Z" fill="#FF9600"/>
+<path d="M9.88481 26.4853C11.0564 27.6569 11.0564 29.5563 9.88481 30.7279C8.71323 31.8995 6.81374 31.8995 5.64217 30.7279C4.47059 29.5563 4.47059 27.6569 5.64217 26.4853C6.81374 25.3137 8.71323 25.3137 9.88481 26.4853Z" fill="#FF9600"/>
+<path d="M31.098 5.27208C32.2696 6.44365 32.2696 8.34315 31.098 9.51472C29.9264 10.6863 28.0269 10.6863 26.8554 9.51472C25.6838 8.34315 25.6838 6.44365 26.8554 5.27208C28.0269 4.10051 29.9264 4.10051 31.098 5.27208Z" fill="#FF9600"/>
+<path d="M26.3701 18C26.3701 22.4183 22.7884 26 18.3701 26C13.9518 26 10.3701 22.4183 10.3701 18C10.3701 13.5817 13.9518 10 18.3701 10C22.7884 10 26.3701 13.5817 26.3701 18Z" fill="#FF9600"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_ResitLightning.svg b/zelda-totk/assets/tokt_ui_icons/bonus_ResitLightning.svg
new file mode 100644
index 0000000..57bab13
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_ResitLightning.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="35" viewBox="0 0 32 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.3701 0.730194H9.37012L0.870117 20.2302H13.8701L6.87012 34.7302H8.37012L31.8701 11.2302H18.8701L23.3701 0.730194Z" fill="#FFFDE3"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_SandMoveUp.svg b/zelda-totk/assets/tokt_ui_icons/bonus_SandMoveUp.svg
new file mode 100644
index 0000000..afd5ef3
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_SandMoveUp.svg
@@ -0,0 +1,6 @@
+<svg width="40" height="37" viewBox="0 0 40 37" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.754375 10.6733C3.92798 19.1626 3.92798 19.1626 3.92798 19.1626L16.7086 15.9662L15.3129 7.01831C14.1944 1.77143 10.4709 -0.833546 6.1894 0.237248C1.56056 1.39491 -0.560775 6.31778 0.754375 10.6733Z" fill="#FFFCC6"/>
+<path d="M38.9859 19.0768C35.8123 27.5661 35.8123 27.5661 35.8123 27.5661L23.0316 24.3697L24.4274 15.4218C25.5459 10.1749 29.2694 7.56997 33.5508 8.64076C38.1797 9.79843 40.301 14.7213 38.9859 19.0768Z" fill="#FFFCC6"/>
+<path d="M22.132 30.1374L22.4881 27.8542L34.4888 30.8555L33.6011 33.0618C32.5301 35.9554 29.4937 37.5879 26.5556 36.804C23.6969 36.0413 21.7113 33.1989 22.132 30.1374Z" fill="#FFFCC6"/>
+<path d="M17.6083 21.7339L17.2521 19.4507L5.25143 22.452L6.13909 24.6583C7.21011 27.5519 10.2465 29.1844 13.1847 28.4005C16.0433 27.6378 18.0289 24.7954 17.6083 21.7339Z" fill="#FFFCC6"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_SnowMoveUp.svg b/zelda-totk/assets/tokt_ui_icons/bonus_SnowMoveUp.svg
new file mode 100644
index 0000000..5d010a9
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_SnowMoveUp.svg
@@ -0,0 +1,6 @@
+<svg width="40" height="37" viewBox="0 0 40 37" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.754375 10.6733C3.92798 19.1626 3.92798 19.1626 3.92798 19.1626L16.7086 15.9662L15.3129 7.01831C14.1944 1.77143 10.4709 -0.833546 6.1894 0.237248C1.56056 1.39491 -0.560775 6.31778 0.754375 10.6733Z" fill="#E4FFFF"/>
+<path d="M38.9859 19.0768C35.8123 27.5661 35.8123 27.5661 35.8123 27.5661L23.0316 24.3697L24.4274 15.4218C25.5459 10.1749 29.2694 7.56997 33.5508 8.64076C38.1797 9.79843 40.301 14.7213 38.9859 19.0768Z" fill="#E4FFFF"/>
+<path d="M22.132 30.1374L22.4881 27.8542L34.4888 30.8555L33.6011 33.0618C32.5301 35.9554 29.4937 37.5879 26.5556 36.804C23.6969 36.0413 21.7113 33.1989 22.132 30.1374Z" fill="#E4FFFF"/>
+<path d="M17.6083 21.7339L17.2521 19.4507L5.25143 22.452L6.13909 24.6583C7.21011 27.5519 10.2465 29.1844 13.1847 28.4005C16.0433 27.6378 18.0289 24.7954 17.6083 21.7339Z" fill="#E4FFFF"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_StaminaRecover.svg b/zelda-totk/assets/tokt_ui_icons/bonus_StaminaRecover.svg
new file mode 100644
index 0000000..4254927
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_StaminaRecover.svg
@@ -0,0 +1,3 @@
+<svg width="37" height="37" viewBox="0 0 37 37" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.5 37C28.7173 37 37 28.7173 37 18.5C37 8.28273 28.7173 0 18.5 0C8.28273 0 0 8.28273 0 18.5C0 28.7173 8.28273 37 18.5 37ZM18.5 26C22.6421 26 26 22.6421 26 18.5C26 14.3579 22.6421 11 18.5 11C14.3579 11 11 14.3579 11 18.5C11 22.6421 14.3579 26 18.5 26Z" fill="#00F15A"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_SwimSpeedUp.svg b/zelda-totk/assets/tokt_ui_icons/bonus_SwimSpeedUp.svg
new file mode 100644
index 0000000..2445e36
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_SwimSpeedUp.svg
@@ -0,0 +1,4 @@
+<svg width="32" height="34" viewBox="0 0 32 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.23645 3.83824C4.65048 1.95781 6.90178 0.74147 9.43749 0.74147C11.4226 0.74147 13.2333 1.4869 14.6045 2.71281L20.6201 7.74147C22.0354 8.8748 24.3145 9.51566 26.453 9.51566C27.7855 9.51566 29.4635 8.91452 30.5392 8.46137C30.8609 8.32584 31.1952 8.6898 31.0159 8.98933C30.2614 10.2499 28.9544 12.3804 28.0037 13.6447C26.5897 15.5251 24.3384 16.7415 21.8027 16.7415C19.8176 16.7415 18.0068 15.996 16.6356 14.7701L9.95419 9.51566C8.53883 8.38234 6.92564 7.96728 4.78714 7.96728C3.45466 7.96728 1.77664 8.56842 0.701 9.02157C0.379292 9.1571 0.0449845 8.79314 0.224269 8.49361C0.978752 7.23307 2.28577 5.1025 3.23645 3.83824Z" fill="#9DF2FF"/>
+<path d="M3.23645 20.6382C4.65048 18.7578 6.90178 17.5415 9.43749 17.5415C11.4226 17.5415 13.2333 18.2869 14.6045 19.5128L20.6201 24.5415C22.0354 25.6748 24.3145 26.3157 26.453 26.3157C27.7855 26.3157 29.4635 25.7145 30.5392 25.2614C30.8609 25.1258 31.1952 25.4898 31.0159 25.7893C30.2614 27.0499 28.9544 29.1804 28.0037 30.4447C26.5897 32.3251 24.3384 33.5415 21.8027 33.5415C19.8176 33.5415 18.0068 32.796 16.6356 31.5701L9.95419 26.3157C8.53883 25.1823 6.92564 24.7673 4.78714 24.7673C3.45466 24.7673 1.77664 25.3684 0.701 25.8216C0.379292 25.9571 0.0449845 25.5931 0.224269 25.2936C0.978752 24.0331 2.28577 21.9025 3.23645 20.6382Z" fill="#9DF2FF"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_ThreeWayZoom.svg b/zelda-totk/assets/tokt_ui_icons/bonus_ThreeWayZoom.svg
new file mode 100644
index 0000000..25121a9
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_ThreeWayZoom.svg
@@ -0,0 +1,6 @@
+<svg width="38" height="37" viewBox="0 0 38 37" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.5334 21.1426C23.7287 21.3379 23.7287 21.6544 23.5334 21.8497L22.1192 23.2639C21.9239 23.4592 21.6073 23.4592 21.4121 23.2639L6.83363 8.68547C6.63837 8.49021 6.32179 8.49021 6.12653 8.68547L4.25353 10.5585C3.98206 10.8299 3.51861 10.7069 3.41759 10.3365L0.874494 1.01187C0.772698 0.638624 1.11518 0.296136 1.48843 0.397931L10.8131 2.941C11.1834 3.04202 11.3065 3.50547 11.0351 3.77694L8.95495 5.85704C8.75969 6.05231 8.75969 6.36889 8.95495 6.56415L23.5334 21.1426Z" fill="#FFCE00"/>
+<path d="M9.4113 36.1124C8.66393 36.8528 7.4522 36.8528 6.70483 36.1124C5.95745 35.3719 5.95745 34.1715 6.70483 33.431L8.68541 31.3824C6.46778 28.5729 5.1443 25.0248 5.1443 21.1677C5.1443 18.3785 5.83637 15.751 7.05816 13.4474C7.35854 12.8811 8.11662 12.7969 8.56992 13.2502L10.8951 15.5754C11.1989 15.8792 11.2706 16.3415 11.1039 16.7375C10.5306 18.0999 10.2137 19.5968 10.2137 21.1677C10.2137 23.5919 10.9684 25.8399 12.2556 27.6895L16.1443 23.6677C16.8917 22.9273 18.1034 22.9273 18.8508 23.6677C19.5981 24.4081 19.5981 25.6086 18.8508 26.349L9.4113 36.1124Z" fill="#FFCE00"/>
+<path d="M26.4113 18.6677C25.6639 19.4081 24.4522 19.4081 23.7048 18.6677C22.9575 17.9273 22.9575 16.7268 23.7048 15.9864L27.9282 11.6179C26.1252 10.429 23.9655 9.73714 21.6443 9.73714C19.9717 9.73714 18.3829 10.0964 16.9511 10.742C16.5503 10.9227 16.0747 10.8555 15.7638 10.5446L13.4587 8.23943C13.0106 7.79139 13.0866 7.04335 13.6405 6.73554C16.0109 5.41809 18.74 4.66772 21.6443 4.66772C25.3364 4.66772 28.7453 5.88038 31.4943 7.92914L33.1262 6.24122L33.1443 6.22303C33.8917 5.4826 35.1034 5.4826 35.8508 6.22303C36.5981 6.96346 36.5981 8.16394 35.8508 8.90437L26.4113 18.6677Z" fill="#FFCE00"/>
+<path d="M37.6363 31.2758C37.6363 33.9738 35.8123 35.7218 32.2403 35.7218C29.3143 35.7218 27.4713 34.3348 26.8823 32.1498L28.7823 31.4088C29.1813 33.0048 30.5683 33.8788 32.2023 33.8788C33.9883 33.8788 35.5083 32.8528 35.5083 31.1998C35.5083 29.6228 34.2923 28.5018 32.0883 28.5018C31.7273 28.5018 30.7203 28.5018 30.2453 28.5018V26.6208C30.7013 26.6208 31.4613 26.6208 31.8413 26.6208C33.5893 26.6208 34.9763 25.6518 34.9763 24.2838C34.9763 22.8398 33.8743 22.0228 32.2973 22.0228C30.6443 22.0228 29.5993 22.9918 29.3713 24.2078L27.4523 23.6188C27.8703 21.7948 29.4853 20.2178 32.3733 20.2178C35.2803 20.2178 37.1423 21.6998 37.1423 23.9988C37.1423 25.9178 35.9643 27.1148 34.2923 27.4188C36.0213 27.6848 37.6363 28.9958 37.6363 31.2758Z" fill="#FFCE00"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_TwoWay.svg b/zelda-totk/assets/tokt_ui_icons/bonus_TwoWay.svg
new file mode 100644
index 0000000..71b9f60
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_TwoWay.svg
@@ -0,0 +1,6 @@
+<svg width="38" height="37" viewBox="0 0 38 37" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.5334 20.8547C23.7287 21.0499 23.7287 21.3665 23.5334 21.5618L22.1192 22.976C21.9239 23.1712 21.6073 23.1712 21.4121 22.976L6.83363 8.39752C6.63837 8.20226 6.32179 8.20226 6.12653 8.39752L4.25353 10.2705C3.98206 10.542 3.51861 10.4189 3.41759 10.0485L0.874494 0.723925C0.772698 0.350675 1.11518 0.00818719 1.48843 0.109982L10.8131 2.65306C11.1834 2.75407 11.3065 3.21752 11.0351 3.48899L8.95495 5.5691C8.75969 5.76436 8.75969 6.08094 8.95495 6.2762L23.5334 20.8547Z" fill="#FFCE00"/>
+<path d="M9.4113 35.8244C8.66393 36.5649 7.4522 36.5649 6.70483 35.8244C5.95745 35.084 5.95745 33.8835 6.70483 33.1431L8.68541 31.0944C6.46778 28.2849 5.1443 24.7369 5.1443 20.8798C5.1443 18.0906 5.83637 15.463 7.05816 13.1595C7.35854 12.5931 8.11662 12.5089 8.56992 12.9622L10.8951 15.2874C11.1989 15.5913 11.2706 16.0535 11.1039 16.4496C10.5306 17.812 10.2137 19.3089 10.2137 20.8798C10.2137 23.304 10.9684 25.552 12.2556 27.4016L16.1443 23.3798C16.8917 22.6393 18.1034 22.6393 18.8508 23.3798C19.5981 24.1202 19.5981 25.3207 18.8508 26.0611L9.4113 35.8244Z" fill="#FFCE00"/>
+<path d="M26.4113 18.3798C25.6639 19.1202 24.4522 19.1202 23.7048 18.3798C22.9575 17.6393 22.9575 16.4389 23.7048 15.6984L27.9282 11.3299C26.1252 10.1411 23.9655 9.44919 21.6443 9.44919C19.9717 9.44919 18.3829 9.80845 16.9511 10.454C16.5503 10.6347 16.0747 10.5675 15.7638 10.2566L13.4587 7.95148C13.0106 7.50344 13.0866 6.7554 13.6405 6.44759C16.0109 5.13014 18.74 4.37977 21.6443 4.37977C25.3364 4.37977 28.7453 5.59243 31.4943 7.64119L33.1262 5.95327L33.1443 5.93508C33.8917 5.19465 35.1034 5.19465 35.8508 5.93508C36.5981 6.67552 36.5981 7.87599 35.8508 8.61642L26.4113 18.3798Z" fill="#FFCE00"/>
+<path d="M37.6743 35.0918H27.4523L27.4713 34.0848C27.5853 31.2538 29.4663 28.9168 32.0313 27.6818C34.4443 26.5418 35.3563 25.4398 35.3563 24.1668C35.3563 22.7418 34.3303 21.7918 32.4873 21.7918C30.9293 21.7918 29.6563 23.0078 29.5803 24.9458L27.5853 24.4708C27.7183 21.6778 29.8843 19.9298 32.6013 19.9298C35.7743 19.9298 37.5793 21.6778 37.5793 24.0718C37.5793 26.1618 36.3633 27.6818 33.3043 29.0878C31.3473 29.9808 29.9223 31.5388 29.8463 33.1728H37.6743V35.0918Z" fill="#FFCE00"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_bows_AttackUp.svg b/zelda-totk/assets/tokt_ui_icons/bonus_bows_AttackUp.svg
new file mode 100644
index 0000000..8edc0b6
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_bows_AttackUp.svg
@@ -0,0 +1,6 @@
+<svg width="41" height="37" viewBox="0 0 41 37" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.8413 28.599V36.199C30.8413 36.3094 30.9309 36.399 31.0413 36.399H34.6413C34.7518 36.399 34.8413 36.3094 34.8413 36.199V28.599C34.8413 28.4885 34.9309 28.399 35.0413 28.399H40.396C40.5685 28.399 40.6601 28.1951 40.5454 28.0661L32.9908 19.5671C32.9113 19.4776 32.7714 19.4776 32.6918 19.5671L25.1372 28.0661C25.0226 28.1951 25.1141 28.399 25.2867 28.399H30.6413C30.7518 28.399 30.8413 28.4885 30.8413 28.599Z" fill="#FFFDE3"/>
+<path d="M22.7634 20.7628C22.9586 20.9581 22.9586 21.2747 22.7634 21.47L21.3492 22.8842C21.1539 23.0794 20.8373 23.0794 20.6421 22.8842L6.06361 8.30571C5.86835 8.11045 5.55177 8.11045 5.35651 8.30571L3.48351 10.1787C3.21204 10.4502 2.74859 10.3271 2.64757 9.95671L0.104474 0.632112C0.002678 0.258863 0.345164 -0.0836249 0.718414 0.0181702L10.043 2.56124C10.4134 2.66226 10.5365 3.12571 10.265 3.39718L8.18493 5.47728C7.98967 5.67255 7.98967 5.98913 8.18493 6.18439L22.7634 20.7628Z" fill="#FFFDE3"/>
+<path d="M8.64128 35.7326C7.89391 36.4731 6.68218 36.4731 5.93481 35.7326C5.18744 34.9922 5.18744 33.7917 5.93481 33.0513L7.91539 31.0026C5.69776 28.1931 4.37428 24.6451 4.37428 20.788C4.37428 17.9988 5.06635 15.3712 6.28814 13.0676C6.58852 12.5013 7.3466 12.4171 7.7999 12.8704L10.1251 15.1956C10.4289 15.4994 10.5006 15.9617 10.3339 16.3577C9.76058 17.7202 9.44369 19.2171 9.44369 20.788C9.44369 23.2122 10.1984 25.4602 11.4856 27.3097L15.3743 23.2879C16.1217 22.5475 17.3334 22.5475 18.0808 23.2879C18.8281 24.0284 18.8281 25.2289 18.0808 25.9693L8.64128 35.7326Z" fill="#FFFDE3"/>
+<path d="M25.6413 18.2879C24.8939 19.0284 23.6822 19.0284 22.9348 18.2879C22.1874 17.5475 22.1874 16.347 22.9348 15.6066L27.1582 11.2381C25.3551 10.0493 23.1955 9.35738 20.8743 9.35738C19.2016 9.35738 17.6129 9.71664 16.1811 10.3622C15.7803 10.5429 15.3047 10.4757 14.9938 10.1648L12.6886 7.85967C12.2406 7.41163 12.3166 6.66359 12.8704 6.35578C15.2409 5.03833 17.97 4.28796 20.8743 4.28796C24.5664 4.28796 27.9753 5.50062 30.7243 7.54938L32.3562 5.86145L32.3743 5.84327C33.1217 5.10284 34.3334 5.10284 35.0807 5.84327C35.8281 6.5837 35.8281 7.78418 35.0807 8.52461L25.6413 18.2879Z" fill="#FFFDE3"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_bows_AttackUpPlus.svg b/zelda-totk/assets/tokt_ui_icons/bonus_bows_AttackUpPlus.svg
new file mode 100644
index 0000000..9cb3f28
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_bows_AttackUpPlus.svg
@@ -0,0 +1,7 @@
+<svg width="55" height="37" viewBox="0 0 55 37" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.6185 28.9979V36.5979C28.6185 36.7084 28.708 36.7979 28.8185 36.7979H32.4185C32.5289 36.7979 32.6185 36.7084 32.6185 36.5979V28.9979C32.6185 28.8875 32.708 28.7979 32.8185 28.7979H38.1731C38.3457 28.7979 38.4372 28.594 38.3226 28.465L30.768 19.9661C30.6884 19.8766 30.5485 19.8766 30.469 19.9661L22.9144 28.465C22.7997 28.594 22.8913 28.7979 23.0638 28.7979H28.4185C28.5289 28.7979 28.6185 28.8875 28.6185 28.9979Z" fill="#FFCE00"/>
+<path d="M22.7429 21.1618C22.9382 21.3571 22.9382 21.6736 22.7429 21.8689L21.3287 23.2831C21.1335 23.4784 20.8169 23.4784 20.6216 23.2831L6.04317 8.70467C5.8479 8.50941 5.53132 8.50941 5.33606 8.70467L3.46306 10.5777C3.1916 10.8491 2.72814 10.7261 2.62713 10.3557L0.0840276 1.03107C-0.0177688 0.657823 0.324717 0.315335 0.697967 0.41713L10.0226 2.9602C10.393 3.06122 10.5161 3.52467 10.2446 3.79614L8.16449 5.87624C7.96922 6.07151 7.96922 6.38809 8.16449 6.58335L22.7429 21.1618Z" fill="#FFCE00"/>
+<path d="M8.62083 36.1316C7.87346 36.872 6.66173 36.872 5.91436 36.1316C5.16699 35.3911 5.16699 34.1907 5.91436 33.4502L7.89494 31.4016C5.67732 28.5921 4.35383 25.044 4.35383 21.1869C4.35383 18.3977 5.0459 15.7702 6.26769 13.4666C6.56807 12.9003 7.32615 12.8161 7.77945 13.2694L10.1046 15.5946C10.4085 15.8984 10.4801 16.3607 10.3135 16.7567C9.74013 18.1191 9.42325 19.616 9.42325 21.1869C9.42325 23.6111 10.1779 25.8591 11.4651 27.7087L15.3538 23.6869C16.1012 22.9465 17.3129 22.9465 18.0603 23.6869C18.8077 24.4273 18.8077 25.6278 18.0603 26.3682L8.62083 36.1316Z" fill="#FFCE00"/>
+<path d="M25.6208 18.6869C24.8735 19.4273 23.6617 19.4273 22.9144 18.6869C22.167 17.9465 22.167 16.746 22.9144 16.0056L27.1377 11.6371C25.3347 10.4482 23.1751 9.75634 20.8538 9.75634C19.1812 9.75634 17.5925 10.1156 16.1606 10.7612C15.7598 10.9419 15.2842 10.8747 14.9734 10.5638L12.6682 8.25863C12.2201 7.81059 12.2961 7.06255 12.85 6.75474C15.2205 5.43729 17.9495 4.68692 20.8538 4.68692C24.5459 4.68692 27.9548 5.89958 30.7039 7.94834L32.3357 6.26042L32.3538 6.24223C33.1012 5.5018 34.3129 5.5018 35.0603 6.24223C35.8077 6.98266 35.8077 8.18314 35.0603 8.92357L25.6208 18.6869Z" fill="#FFCE00"/>
+<path d="M44.8617 28.9979V36.5979C44.8617 36.7084 44.9513 36.7979 45.0617 36.7979H48.6617C48.7722 36.7979 48.8617 36.7084 48.8617 36.5979V28.9979C48.8617 28.8875 48.9513 28.7979 49.0617 28.7979H54.4164C54.5889 28.7979 54.6805 28.594 54.5659 28.465L47.0112 19.9661C46.9317 19.8766 46.7918 19.8766 46.7123 19.9661L39.1576 28.465C39.043 28.594 39.1345 28.7979 39.3071 28.7979H44.6617C44.7722 28.7979 44.8617 28.8875 44.8617 28.9979Z" fill="#FFCE00"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_weapons_AttackUp.svg b/zelda-totk/assets/tokt_ui_icons/bonus_weapons_AttackUp.svg
new file mode 100644
index 0000000..9d234ab
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_weapons_AttackUp.svg
@@ -0,0 +1,5 @@
+<svg width="39" height="32" viewBox="0 0 39 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.6833 24.2V31.8C28.6833 31.9105 28.7728 32 28.8833 32H32.4833C32.5937 32 32.6833 31.9105 32.6833 31.8V24.2C32.6833 24.0895 32.7728 24 32.8833 24H38.2379C38.4105 24 38.5021 23.7961 38.3874 23.6671L30.8328 15.1682C30.7532 15.0787 30.6134 15.0787 30.5338 15.1682L22.9792 23.6671C22.8645 23.7961 22.9561 24 23.1287 24H28.4833C28.5937 24 28.6833 24.0895 28.6833 24.2Z" fill="#FFFDE3"/>
+<path d="M0.683289 29.5V24.5C0.683289 24.2239 0.907146 24 1.18329 24H4.18329L7.18329 20.5L3.43588 16.2842C3.27317 16.1011 3.18329 15.8647 3.18329 15.6198V13C3.18329 12.4477 3.631 12 4.18329 12H7.47618C7.86671 12 8.18329 12.3166 8.18329 12.7071C8.18329 12.8946 8.10879 13.0745 7.97618 13.2071L6.68329 14.5L16.6833 25L18.4762 23.2071C18.6088 23.0745 18.7886 23 18.9762 23C19.3667 23 19.6833 23.3166 19.6833 23.7071V27C19.6833 27.5523 19.2356 28 18.6833 28H15.0635C14.8186 28 14.5822 27.9101 14.3991 27.7474L10.1833 24L6.68329 26.5V29.5C6.68329 29.7761 6.45943 30 6.18329 30H1.18329C0.907146 30 0.683289 29.7761 0.683289 29.5Z" fill="#FFFDE3"/>
+<path d="M10.1833 15L24.6833 0H31.6833V7L16.1833 21L13.6833 18.5L22.5454 10L25.6833 6L21.5454 9L12.6833 17.5L10.1833 15Z" fill="#FFFDE3"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/bonus_weapons_AttackUpPlus.svg b/zelda-totk/assets/tokt_ui_icons/bonus_weapons_AttackUpPlus.svg
new file mode 100644
index 0000000..9a76824
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/bonus_weapons_AttackUpPlus.svg
@@ -0,0 +1,6 @@
+<svg width="56" height="32" viewBox="0 0 56 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M27.8108 24.099V31.699C27.8108 31.8094 27.9004 31.899 28.0108 31.899H31.6108C31.7213 31.899 31.8108 31.8094 31.8108 31.699V24.099C31.8108 23.9885 31.9004 23.899 32.0108 23.899H37.3654C37.538 23.899 37.6296 23.6951 37.5149 23.5661L29.9603 15.0671C29.8807 14.9776 29.7409 14.9776 29.6613 15.0671L22.1067 23.5661C21.992 23.6951 22.0836 23.899 22.2562 23.899H27.6108C27.7213 23.899 27.8108 23.9885 27.8108 24.099Z" fill="#FFCE00"/>
+<path d="M45.3108 24.099V31.699C45.3108 31.8094 45.4004 31.899 45.5108 31.899H49.1108C49.2213 31.899 49.3108 31.8094 49.3108 31.699V24.099C49.3108 23.9885 49.4004 23.899 49.5108 23.899H54.8654C55.038 23.899 55.1296 23.6951 55.0149 23.5661L47.4603 15.0671C47.3807 14.9776 47.2409 14.9776 47.1613 15.0671L39.6067 23.5661C39.492 23.6951 39.5836 23.899 39.7562 23.899H45.1108C45.2213 23.899 45.3108 23.9885 45.3108 24.099Z" fill="#FFCE00"/>
+<path d="M9.55579 15L24.0558 3.8147e-06H31.0558V7L15.5558 21L13.0558 18.5L21.9179 10L25.0558 6L20.9179 9L12.0558 17.5L9.55579 15Z" fill="#FFCE00"/>
+<path d="M0.0557861 24.5V29.5C0.0557861 29.7761 0.279644 30 0.555786 30H5.55579C5.83193 30 6.05579 29.7761 6.05579 29.5V26.5L9.55579 24L13.7716 27.7474C13.9547 27.9101 14.1911 28 14.436 28H18.0558C18.6081 28 19.0558 27.5523 19.0558 27V23.7071C19.0558 23.3166 18.7392 23 18.3487 23C18.1611 23 17.9813 23.0745 17.8487 23.2071L16.0558 25L6.05579 14.5L7.34868 13.2071C7.48129 13.0745 7.55579 12.8946 7.55579 12.7071C7.55579 12.3166 7.2392 12 6.84868 12H3.55579C3.0035 12 2.55579 12.4477 2.55579 13V15.6198C2.55579 15.8647 2.64566 16.1011 2.80838 16.2842L6.55579 20.5L3.55579 24H0.555786C0.279644 24 0.0557861 24.2239 0.0557861 24.5Z" fill="#FFCE00"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/heart_heal1.svg b/zelda-totk/assets/tokt_ui_icons/heart_heal1.svg
new file mode 100644
index 0000000..c51648c
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/heart_heal1.svg
@@ -0,0 +1,7 @@
+<svg width="36" height="29" viewBox="0 0 36 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.43539 13.2077C2.28446 13.0695 2.13919 12.9251 2 12.775L2.43539 13.2077Z" fill="#FF6637"/>
+<path d="M36 7.67596C36 3.53383 32.6421 0.175964 28.5 0.175964C26.2787 0.175964 24.283 1.14159 22.9097 2.67596L18.7071 6.87859C18.5118 7.07385 18.2559 7.17148 18 7.17148V7.19796V14.22V28.2639C18.2552 28.2634 18.5102 28.1657 18.7049 27.9711L32.9978 13.6782C34.8207 12.31 36 10.1307 36 7.67596Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1669 14.22C13.4544 12.9354 15 10.4862 15 7.67596C15 5.75508 14.2779 4.00286 13.0903 2.67596L17.2929 6.87859C17.4882 7.07385 17.7441 7.17148 18 7.17148V7.19796V14.22H11.1669ZM3.83308 14.22C3.32816 13.9364 2.85938 13.5961 2.43539 13.2077L3.45392 14.22H3.83308Z" fill="#FF6637"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.83308 14.22H11.1669C13.4544 12.9354 15 10.4862 15 7.67596C15 5.75508 14.2779 4.00286 13.0903 2.67596C11.717 1.14159 9.72125 0.175964 7.5 0.175964C3.35786 0.175964 0 3.53383 0 7.67596C0 9.64505 0.758825 11.4369 2 12.775L2.43539 13.2077C2.85938 13.5961 3.32816 13.9364 3.83308 14.22Z" fill="#FF6637"/>
+<path d="M17.2929 27.9732C17.4885 28.1676 17.7444 28.2645 18 28.2639V14.22H11.1669H3.83308H3.45392L17.2929 27.9732Z" fill="black"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/heart_heal2.svg b/zelda-totk/assets/tokt_ui_icons/heart_heal2.svg
new file mode 100644
index 0000000..d4b3379
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/heart_heal2.svg
@@ -0,0 +1,6 @@
+<svg width="36" height="29" viewBox="0 0 36 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.43539 13.1197C2.28446 12.9815 2.13919 12.8371 2 12.6871L2.43539 13.1197Z" fill="black" fill-opacity="0.5"/>
+<path d="M36 7.58798C36 3.44585 32.6421 0.0879822 28.5 0.0879822C26.2787 0.0879822 24.283 1.05361 22.9097 2.58798L18.7071 6.79061C18.5118 6.98587 18.2559 7.0835 18 7.0835V28.176C18.2552 28.1754 18.5102 28.0777 18.7049 27.8831L32.9978 13.5902C34.8207 12.222 36 10.0427 36 7.58798Z" fill="black" fill-opacity="0.5"/>
+<path d="M7.5 15.088C11.6421 15.088 15 11.7301 15 7.58798C15 5.6671 14.2779 3.91487 13.0903 2.58798C11.717 1.05361 9.72125 0.0879822 7.5 0.0879822C3.35786 0.0879822 0 3.44585 0 7.58798C0 9.55706 0.758825 11.3489 2 12.6871L2.43539 13.1197C3.76976 14.3421 5.54777 15.088 7.5 15.088Z" fill="#FF6637"/>
+<path d="M15 7.58798C15 11.7301 11.6421 15.088 7.5 15.088C5.54777 15.088 3.76976 14.3421 2.43539 13.1197L17.2929 27.8853C17.4885 28.0797 17.7444 28.1765 18 28.176V7.0835C17.7441 7.0835 17.4882 6.98587 17.2929 6.79061L13.0903 2.58798C14.2779 3.91487 15 5.6671 15 7.58798Z" fill="#FF6637"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/heart_heal4.svg b/zelda-totk/assets/tokt_ui_icons/heart_heal4.svg
new file mode 100644
index 0000000..3be89d7
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/heart_heal4.svg
@@ -0,0 +1,5 @@
+<svg width="36" height="29" viewBox="0 0 36 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 7.5C15 11.6421 11.6421 15 7.5 15C5.54777 15 3.76976 14.2541 2.43539 13.0318C2.28446 12.8935 2.13919 12.7491 2 12.5991C0.758825 11.2609 0 9.46908 0 7.5C0 3.35786 3.35786 0 7.5 0C9.72125 0 11.717 0.965627 13.0903 2.5C14.2779 3.82689 15 5.57911 15 7.5Z" fill="#FF6637"/>
+<path d="M36 7.5C36 9.95471 34.8207 12.134 32.9978 13.5022C31.7447 14.4427 30.1874 15 28.5 15C24.3579 15 21 11.6421 21 7.5C21 5.57911 21.7221 3.82689 22.9097 2.5C24.283 0.965627 26.2787 0 28.5 0C32.6421 0 36 3.35786 36 7.5Z" fill="#FF6637"/>
+<path d="M15 7.5C15 11.6421 11.6421 15 7.5 15C5.54777 15 3.76976 14.2541 2.43539 13.0318L17.2929 27.7973C17.6838 28.1857 18.3152 28.1848 18.7049 27.7951L32.9978 13.5022C31.7447 14.4427 30.1874 15 28.5 15C24.3579 15 21 11.6421 21 7.5C21 5.57911 21.7221 3.82689 22.9097 2.5L18.7071 6.70263C18.3166 7.09315 17.6834 7.09315 17.2929 6.70263L13.0903 2.5C14.2779 3.82689 15 5.57911 15 7.5Z" fill="#FF6637"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/map_cave.svg b/zelda-totk/assets/tokt_ui_icons/map_cave.svg
new file mode 100644
index 0000000..894fec3
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/map_cave.svg
@@ -0,0 +1,5 @@
+<svg width="35" height="36" viewBox="0 0 35 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.4109 32V17C30.4109 12.6667 27.8109 4 17.4109 4C7.01089 4 4.41089 12.6667 4.41089 17V32H11.4109V21C11.4109 19.1667 12.6109 15.5 17.4109 15.5C22.2109 15.5 23.4109 19.1667 23.4109 21V32H30.4109Z" fill="#9E843A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.41089 36C2.20175 36 0.410889 34.2091 0.410889 32V17C0.410889 14.1932 1.22001 10.0721 3.76475 6.53778C6.45634 2.79946 10.9072 0 17.4109 0C23.9146 0 28.3654 2.79946 31.057 6.53778C33.6018 10.0721 34.4109 14.1932 34.4109 17V32C34.4109 34.2091 32.62 36 30.4109 36H23.4109C21.2017 36 19.4109 34.2091 19.4109 32V21C19.4109 20.9494 19.3982 20.7776 19.3296 20.5575C19.2637 20.3462 19.1705 20.1673 19.0652 20.0333C18.971 19.9133 18.8511 19.8064 18.6634 19.7176C18.4726 19.6274 18.0922 19.5 17.4109 19.5C16.7295 19.5 16.3492 19.6274 16.1584 19.7176C15.9707 19.8064 15.8508 19.9133 15.7566 20.0333C15.6513 20.1673 15.558 20.3462 15.4922 20.5575C15.4236 20.7776 15.4109 20.9494 15.4109 21V32C15.4109 34.2091 13.62 36 11.4109 36H4.41089ZM30.4109 17C30.4109 12.6667 27.8109 4 17.4109 4C7.01089 4 4.41089 12.6667 4.41089 17V32H11.4109V21C11.4109 19.1667 12.6109 15.5 17.4109 15.5C22.2109 15.5 23.4109 19.1667 23.4109 21V32H30.4109V17Z" fill="black"/>
+<path d="M23.4109 36C21.2017 36 19.4109 34.2091 19.4109 32V21C19.4109 20.9494 19.3982 20.7776 19.3296 20.5575C19.2637 20.3462 19.1705 20.1673 19.0652 20.0333C18.971 19.9133 18.8511 19.8064 18.6634 19.7176C18.4726 19.6274 18.0922 19.5 17.4109 19.5C16.7295 19.5 16.3492 19.6274 16.1584 19.7176C15.9707 19.8064 15.8508 19.9133 15.7566 20.0333C15.6513 20.1673 15.558 20.3462 15.4922 20.5575C15.4236 20.7776 15.4109 20.9494 15.4109 21V32C15.4109 34.2091 13.62 36 11.4109 36H23.4109Z" fill="black"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/map_chasm.svg b/zelda-totk/assets/tokt_ui_icons/map_chasm.svg
new file mode 100644
index 0000000..1b1bdc5
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/map_chasm.svg
@@ -0,0 +1,5 @@
+<svg width="49" height="49" viewBox="0 0 49 49" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.901 4.40579L28.1197 10.4994C28.1739 10.7702 28.4373 10.9458 28.708 10.8916L37.1756 9.19811C37.5905 9.11513 37.9145 9.55291 37.7139 9.92545L34.9669 15.0271C34.8313 15.2788 34.934 15.5927 35.1921 15.7156L44.2549 20.0312C44.6375 20.2134 44.6342 20.759 44.2495 20.9366L39.1763 23.278C38.9238 23.3946 38.8149 23.6948 38.9339 23.9461L42.8196 32.1491C42.9902 32.5093 42.6915 32.9145 42.297 32.8581L36.6943 32.0578C36.4282 32.0197 36.1797 32.1989 36.1316 32.4633L35.3705 36.6497L34.4226 41.863C34.3445 42.2923 33.7925 42.4227 33.5307 42.0736L30.0637 37.4509C29.8811 37.2075 29.5253 37.1822 29.3101 37.3973L21.9332 44.7742C21.6403 45.0671 21.1388 44.8973 21.084 44.4868L20.2909 38.5382C20.2518 38.2446 19.9675 38.0493 19.6795 38.1178L10.7598 40.2416C10.3468 40.3399 10.007 39.9113 10.1968 39.5316L12.9988 33.9277C13.1204 33.6843 13.0252 33.3883 12.7844 33.2616L4.54887 28.9271C4.1946 28.7406 4.1922 28.2342 4.54469 28.0444L9.76373 25.2342C10.0122 25.1004 10.1008 24.7876 9.95939 24.5434L5.27232 16.4476C5.05668 16.0751 5.38107 15.6223 5.80309 15.7067L11.6721 16.8806C11.9636 16.9388 12.2412 16.7315 12.2681 16.4355L13.1211 7.05282C13.1595 6.63064 13.6729 6.44477 13.9726 6.74453L18.3642 11.1361C18.5595 11.3314 18.876 11.3314 19.0713 11.1361L26.0571 4.1503C26.3395 3.86792 26.8227 4.0142 26.901 4.40579ZM26.4599 17.8818L25.1825 14.6614C25.0156 14.2405 24.4199 14.2405 24.253 14.6614L22.9756 17.8818C22.86 18.1731 22.5079 18.2875 22.2432 18.1197L19.3168 16.2652C18.9344 16.0229 18.4525 16.373 18.5648 16.8116L19.4243 20.1678C19.502 20.4714 19.2844 20.7709 18.9716 20.7908L15.5141 21.0105C15.0623 21.0393 14.8782 21.6058 15.2269 21.8946L17.8949 24.1046C18.1363 24.3046 18.1363 24.6748 17.8949 24.8747L15.2269 27.0848C14.8782 27.3736 15.0623 27.9401 15.5141 27.9688L18.9716 28.1885C19.2844 28.2084 19.502 28.5079 19.4243 28.8116L18.5648 32.1677C18.4525 32.6063 18.9344 32.9565 19.3168 32.7141L22.2432 30.8596C22.5079 30.6918 22.86 30.8062 22.9756 31.0976L24.253 34.318C24.4199 34.7388 25.0156 34.7388 25.1825 34.318L26.4599 31.0976C26.5755 30.8062 26.9276 30.6918 27.1923 30.8596L30.1187 32.7141C30.5011 32.9565 30.983 32.6063 30.8707 32.1677L30.0112 28.8116C29.9335 28.5079 30.1511 28.2084 30.4639 28.1885L33.9214 27.9688C34.3732 27.9401 34.5573 27.3736 34.2086 27.0848L31.5406 24.8747C31.2992 24.6748 31.2992 24.3046 31.5406 24.1046L34.2086 21.8946C34.5573 21.6058 34.3732 21.0393 33.9214 21.0105L30.4639 20.7908C30.1511 20.7709 29.9335 20.4714 30.0112 20.1678L30.8707 16.8116C30.983 16.373 30.5011 16.0229 30.1187 16.2652L27.1923 18.1197C26.9276 18.2875 26.5755 18.1731 26.4599 17.8818Z" fill="#9E843A"/>
+<path d="M25.1825 14.6614L26.4599 17.8818C26.5755 18.1731 26.9276 18.2875 27.1923 18.1197L30.1187 16.2652C30.5011 16.0229 30.983 16.373 30.8707 16.8116L30.0112 20.1678C29.9335 20.4714 30.1511 20.7709 30.4639 20.7908L33.9214 21.0105C34.3732 21.0393 34.5573 21.6058 34.2086 21.8946L31.5406 24.1046C31.2992 24.3046 31.2992 24.6748 31.5406 24.8747L34.2086 27.0848C34.5573 27.3736 34.3732 27.9401 33.9214 27.9688L30.4639 28.1885C30.1511 28.2084 29.9335 28.5079 30.0112 28.8116L30.8707 32.1677C30.983 32.6063 30.5011 32.9565 30.1187 32.7141L27.1923 30.8596C26.9276 30.6918 26.5755 30.8062 26.4599 31.0976L25.1825 34.318C25.0156 34.7388 24.4199 34.7388 24.253 34.318L22.9756 31.0976C22.86 30.8062 22.5079 30.6918 22.2432 30.8596L19.3168 32.7141C18.9344 32.9565 18.4525 32.6063 18.5648 32.1677L19.4243 28.8116C19.502 28.5079 19.2844 28.2084 18.9716 28.1885L15.5141 27.9688C15.0623 27.9401 14.8782 27.3736 15.2269 27.0848L17.8949 24.8747C18.1363 24.6748 18.1363 24.3046 17.8949 24.1046L15.2269 21.8946C14.8782 21.6058 15.0623 21.0393 15.5141 21.0105L18.9716 20.7908C19.2844 20.7709 19.502 20.4714 19.4243 20.1678L18.5648 16.8116C18.4525 16.373 18.9344 16.0229 19.3168 16.2652L22.2432 18.1197C22.5079 18.2875 22.86 18.1731 22.9756 17.8818L24.253 14.6614C24.4199 14.2405 25.0156 14.2405 25.1825 14.6614Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.3581 42.5786L39.4644 36.4941L41.7313 36.8179C45.2818 37.3252 47.9699 33.6781 46.4346 30.4368L44.0622 25.4285L45.9257 24.5684C49.3883 22.9703 49.4178 18.0593 45.9746 16.4197L40.2324 13.6853L41.2358 11.8219C43.0412 8.46893 40.1253 4.52896 36.3911 5.27579L31.3556 6.28289L30.8233 3.62133C30.1184 0.0970242 25.7702 -1.21958 23.2287 1.32187L18.7178 5.83282L16.801 3.9161C14.1032 1.21829 9.48295 2.89109 9.13754 6.69067L8.6372 12.1944L6.58755 11.7844C2.78944 11.0248 -0.130089 15.0996 1.81061 18.4517L4.6891 23.4236L2.64829 24.5225C-0.524118 26.2307 -0.502499 30.7887 2.68588 32.4668L7.88808 35.2048L6.61911 37.7427C4.91036 41.1602 7.96939 45.0178 11.6863 44.1328L16.8379 42.9062L17.1191 45.0154C17.6118 48.7103 22.1258 50.2385 24.7616 47.6027L29.285 43.0793L30.3307 44.4736C32.687 47.6153 37.6556 46.4425 38.3581 42.5786ZM28.1197 10.4994L26.901 4.40579C26.8227 4.0142 26.3395 3.86792 26.0571 4.1503L19.0713 11.1361C18.876 11.3314 18.5595 11.3314 18.3642 11.1361L13.9726 6.74453C13.6729 6.44477 13.1595 6.63064 13.1211 7.05282L12.2681 16.4355C12.2412 16.7315 11.9636 16.9388 11.6721 16.8806L5.80309 15.7067C5.38107 15.6223 5.05668 16.0751 5.27232 16.4476L9.95939 24.5434C10.1008 24.7876 10.0122 25.1004 9.76373 25.2342L4.54469 28.0444C4.1922 28.2342 4.1946 28.7406 4.54887 28.9271L12.7844 33.2616C13.0252 33.3883 13.1204 33.6843 12.9988 33.9277L10.1968 39.5316C10.007 39.9113 10.3468 40.3399 10.7598 40.2416L19.6795 38.1178C19.9675 38.0493 20.2518 38.2446 20.2909 38.5382L21.084 44.4868C21.1388 44.8973 21.6403 45.0671 21.9332 44.7742L29.3101 37.3973C29.5253 37.1822 29.8811 37.2075 30.0637 37.4509L33.5307 42.0736C33.7925 42.4227 34.3445 42.2923 34.4226 41.863L35.3705 36.6497L36.1316 32.4633C36.1797 32.1989 36.4282 32.0197 36.6943 32.0578L42.297 32.8581C42.6915 32.9145 42.9902 32.5093 42.8196 32.1491L38.9339 23.9461C38.8149 23.6948 38.9238 23.3946 39.1763 23.278L44.2495 20.9366C44.6342 20.759 44.6375 20.2134 44.2549 20.0312L35.1921 15.7156C34.934 15.5927 34.8313 15.2788 34.9669 15.0271L37.7139 9.92545C37.9145 9.55291 37.5905 9.11513 37.1756 9.19811L28.708 10.8916C28.4373 10.9458 28.1739 10.7702 28.1197 10.4994Z" fill="black"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/map_korok.svg b/zelda-totk/assets/tokt_ui_icons/map_korok.svg
new file mode 100644
index 0000000..cd20ae6
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/map_korok.svg
@@ -0,0 +1,5 @@
+<svg width="49" height="47" viewBox="0 0 49 47" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.257 12.1719C8.32774 16.6562 4 20.5933 4 27.8719C4 39.1434 16.4541 42.4017 25.824 42.4017C35.1939 42.4017 44.8217 38.8793 44.8217 28.3122C44.8217 23.0035 39.7576 19.949 34.2789 16.6445C29.4541 13.7344 24.3079 10.6305 22.0158 5.62226C21.6659 4.85776 20.5573 4.6679 20.0274 5.32072C17.8815 7.96482 15.5066 10.1253 13.257 12.1719ZM15.6404 14.8464C12.7504 17.4794 10 19.9852 10 22.9242C10 27.4359 15 29.9242 20.5 29.9242C26 29.9242 32.5 26.9242 29.5 22.9242C28.2866 21.3064 26.5925 20.7502 24.9593 20.214C22.1363 19.2872 19.4954 18.4201 19.8335 12.2337C19.8612 11.727 19.1667 11.4229 18.8201 11.7934C17.833 12.8489 16.7268 13.8567 15.6404 14.8464Z" fill="#C8B56D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.20074 18.3893C5.26265 20.9838 4 23.9404 4 27.8719C4 39.1434 16.4541 42.4017 25.824 42.4017C35.1939 42.4017 44.8217 38.8793 44.8217 28.3122C44.8217 23.0035 39.7576 19.949 34.2789 16.6445C29.4541 13.7344 24.3079 10.6305 22.0158 5.62226C21.6659 4.85776 20.5573 4.6679 20.0274 5.32072C19.3027 6.21368 18.5519 7.05148 17.7886 7.84837C17.2802 8.37914 16.7662 8.89176 16.2508 9.39043C15.2487 10.36 14.2409 11.2768 13.257 12.1719C13.2473 12.1807 13.2376 12.1895 13.2279 12.1984C10.9719 14.2507 8.84365 16.1899 7.20074 18.3893ZM19.5693 11.7399C19.3427 11.5907 19.0223 11.5773 18.8201 11.7934C18.7055 11.916 18.5893 12.0379 18.4717 12.1592C17.8176 12.8338 17.1207 13.49 16.4183 14.1357C16.2309 14.3079 16.0431 14.4794 15.8556 14.6503C15.7929 14.7075 15.7303 14.7646 15.6677 14.8217C15.6586 14.8299 15.6495 14.8382 15.6404 14.8464C13.5604 16.7415 11.5527 18.5707 10.5907 20.5429C10.216 21.3108 10 22.1005 10 22.9242C10 27.4359 15 29.9242 20.5 29.9242C26 29.9242 32.5 26.9242 29.5 22.9242C28.2866 21.3064 26.5925 20.7502 24.9593 20.214C22.8847 19.5329 20.9084 18.884 20.1406 16.1324C20.0883 15.9449 20.0416 15.7478 20.0008 15.5402C19.8477 14.7599 19.7788 13.8324 19.8126 12.7217C19.8175 12.5628 19.8244 12.4001 19.8335 12.2337C19.8451 12.0225 19.7311 11.8465 19.5693 11.7399ZM16.9917 19.0393C17.319 19.6839 17.7207 20.2834 18.205 20.8351C19.9156 22.7838 22.2255 23.5325 23.4987 23.9451C23.5733 23.9693 23.6444 23.9923 23.7116 24.0144C24.6925 24.3365 25.2731 24.5582 25.6569 24.7743C24.4523 25.4139 22.4717 25.9242 20.5 25.9242C18.2823 25.9242 16.4304 25.4113 15.2759 24.7045C14.2079 24.0508 14 23.4515 14 22.9242C14 22.7519 14.0744 22.2602 14.8709 21.2556C15.4194 20.5638 16.1239 19.8538 16.9917 19.0393ZM10.2427 9.50632C10.3507 9.40819 10.4582 9.31044 10.5653 9.21305C12.8398 7.14389 14.9941 5.17499 16.9216 2.80002C18.2375 1.17868 20.1727 0.744548 21.7159 0.989423C23.2417 1.23152 24.8472 2.19704 25.6529 3.95764C27.3358 7.63455 31.2461 10.144 36.3448 13.2193C36.4121 13.2599 36.4796 13.3006 36.5474 13.3415C39.1352 14.9018 42.0835 16.6794 44.3496 18.8171C46.7839 21.1134 48.8217 24.185 48.8217 28.3122C48.8217 35.0703 45.6194 39.8429 40.9326 42.7265C36.4849 45.4629 30.9063 46.4017 25.824 46.4017C20.7866 46.4017 14.6204 45.5422 9.55585 42.914C4.30214 40.1877 0 35.3643 0 27.8719C0 18.8141 5.52982 13.789 10.2427 9.50632Z" fill="black"/>
+<path d="M16.9917 19.0393C17.319 19.6839 17.7207 20.2834 18.205 20.8351C19.9156 22.7838 22.2255 23.5325 23.4987 23.9451C23.5733 23.9693 23.6444 23.9923 23.7116 24.0144C24.6925 24.3365 25.2731 24.5582 25.6569 24.7743C24.4523 25.4139 22.4717 25.9242 20.5 25.9242C18.2823 25.9242 16.4304 25.4113 15.2759 24.7045C14.2079 24.0508 14 23.4515 14 22.9242C14 22.7519 14.0744 22.2602 14.8709 21.2556C15.4194 20.5638 16.1239 19.8538 16.9917 19.0393Z" fill="black"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/map_well.svg b/zelda-totk/assets/tokt_ui_icons/map_well.svg
new file mode 100644
index 0000000..f9e9801
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/map_well.svg
@@ -0,0 +1,4 @@
+<svg width="39" height="30" viewBox="0 0 39 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.4109 4C11.1266 4 4.41089 6.68629 4.41089 10V20C4.41089 23.3137 11.1266 26 19.4109 26C27.6952 26 34.4109 23.3137 34.4109 20V10C34.4109 6.68629 27.6952 4 19.4109 4ZM19.4109 13C25.486 13 29.9109 11.6569 29.9109 10C29.9109 8.34315 25.486 7 19.4109 7C13.3358 7 8.91089 8.34315 8.91089 10C8.91089 11.6569 13.3358 13 19.4109 13Z" fill="#9E843A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.92162 10.1409C8.91449 10.0942 8.91089 10.0472 8.91089 10C8.91089 8.34315 13.3358 7 19.4109 7C25.486 7 29.9109 8.34315 29.9109 10C29.9109 10.0472 29.9073 10.0942 29.9002 10.1409C29.6572 11.7324 25.3128 13 19.4109 13C13.509 13 9.16458 11.7324 8.92162 10.1409ZM5.39036 7.86285C4.75749 8.52676 4.41089 9.24719 4.41089 10V20C4.41089 23.3137 11.1266 26 19.4109 26C27.6952 26 34.4109 23.3137 34.4109 20V10C34.4109 9.24719 34.0643 8.52676 33.4314 7.86285C31.2786 5.60439 25.8131 4 19.4109 4C13.0086 4 7.54321 5.60439 5.39036 7.86285ZM7.31872 2.04345C10.6132 0.725668 14.8901 0 19.4109 0C23.9316 0 28.2086 0.725668 31.5031 2.04345C33.1392 2.69791 34.7317 3.57724 35.9805 4.75831C37.2379 5.94736 38.4109 7.71731 38.4109 10V20C38.4109 22.2827 37.2379 24.0526 35.9805 25.2417C34.7317 26.4228 33.1392 27.3021 31.5031 27.9565C28.2086 29.2743 23.9316 30 19.4109 30C14.8901 30 10.6132 29.2743 7.31872 27.9565C5.68259 27.3021 4.0901 26.4228 2.84123 25.2417C1.58391 24.0526 0.410889 22.2827 0.410889 20V10C0.410889 7.71731 1.58391 5.94736 2.84123 4.75831C4.0901 3.57724 5.68259 2.69791 7.31872 2.04345Z" fill="black"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/stamp_Heart.svg b/zelda-totk/assets/tokt_ui_icons/stamp_Heart.svg
new file mode 100644
index 0000000..90bd9c9
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/stamp_Heart.svg
@@ -0,0 +1,4 @@
+<svg width="51" height="42" viewBox="0 0 51 42" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.10843 7.33812C3.78897 10.6576 3.78897 16.0395 7.10843 19.3589L25.2706 37.01C25.4645 37.1986 25.7732 37.1986 25.9673 37.0102L44.1501 19.3589C47.4696 16.0395 47.4696 10.6576 44.1501 7.33812C40.8307 4.01866 35.4488 4.01866 32.1293 7.33812L25.9585 13.0349C25.7668 13.2119 25.4711 13.2117 25.2796 13.0344L19.1292 7.33812C15.8098 4.01866 10.4279 4.01866 7.10843 7.33812Z" fill="#F6F65E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.32064 22.2274C4.307 22.2142 4.29345 22.2008 4.28 22.1874C-0.601553 17.3058 -0.601553 9.39124 4.28 4.50969C9.14178 -0.352093 17.0121 -0.371782 21.8982 4.45062L25.6232 7.90056L29.3628 4.44815C34.2492 -0.371776 42.1176 -0.351259 46.9785 4.50969C51.8601 9.39124 51.8601 17.3058 46.9785 22.1874C46.9712 22.1947 46.9638 22.2021 46.9564 22.2094C46.9497 22.2159 46.943 22.2225 46.9363 22.229L28.7535 39.8803L25.9673 37.0102L44.1501 19.3589C47.4696 16.0395 47.4696 10.6576 44.1501 7.33812C40.8307 4.01866 35.4488 4.01866 32.1293 7.33812L25.9585 13.0349C25.7668 13.2119 25.4711 13.2117 25.2796 13.0344L19.1292 7.33812C15.8098 4.01866 10.4279 4.01866 7.10843 7.33812C3.78897 10.6576 3.78897 16.0395 7.10843 19.3589L25.2706 37.01L22.4828 39.8785L4.32064 22.2274ZM25.2706 37.01C25.4645 37.1986 25.7732 37.1986 25.9673 37.0102L28.7535 39.8803C27.0068 41.5759 24.2284 41.5751 22.4828 39.8785L25.2706 37.01Z" fill="black"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/stamp_Human.svg b/zelda-totk/assets/tokt_ui_icons/stamp_Human.svg
new file mode 100644
index 0000000..45a65a8
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/stamp_Human.svg
@@ -0,0 +1,4 @@
+<svg width="30" height="62" viewBox="0 0 30 62" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.45256 20.5604C6.53005 19.5 5.82737 18.2434 5.41541 16.8614C5.14517 15.9548 5.00003 14.9944 5.00003 14C5.00003 8.47715 9.47718 4 15 4C20.5229 4 25 8.47715 25 14C25 14.7699 24.913 15.5195 24.7483 16.2394C24.376 17.8669 23.6065 19.343 22.5474 20.5604C22.1049 21.0691 21.6118 21.5326 21.076 21.9431C20.4358 22.4335 19.7347 22.8483 18.9859 23.1741L26 27L23 57.5H7.00003L4.00003 27L11.0142 23.1741C10.24 22.8372 9.51666 22.4053 8.85907 21.8929C8.34829 21.4949 7.87713 21.0485 7.45256 20.5604ZM3.88169 22.5082C2.07526 20.1516 0.999988 17.2028 0.999988 14C0.999988 6.26801 7.268 0 15 0C22.732 0 29 6.26801 29 14C29 17.2028 27.9247 20.1516 26.1183 22.5082L27.9154 23.4884C29.3247 24.2571 30.1379 25.7939 29.9808 27.3916L26.9808 57.8916C26.7794 59.9392 25.0575 61.5 23 61.5H6.99999C4.9425 61.5 3.2206 59.9392 3.0192 57.8916L0.0191982 27.3916C-0.137945 25.7939 0.675266 24.2571 2.08458 23.4884L3.88169 22.5082Z" fill="black"/>
+<path d="M4.00003 27L7.00003 57.5H23L26 27L18.9859 23.1741C19.7347 22.8483 20.4358 22.4335 21.076 21.9431C21.6118 21.5326 22.1049 21.0691 22.5474 20.5604C23.6065 19.343 24.376 17.8669 24.7483 16.2394C24.913 15.5195 25 14.7699 25 14C25 8.47715 20.5229 4 15 4C9.47718 4 5.00003 8.47715 5.00003 14C5.00003 14.9944 5.14517 15.9548 5.41541 16.8614C6.01699 18.8794 7.23852 20.6302 8.85907 21.8929C9.51666 22.4053 10.24 22.8372 11.0142 23.1741L4.00003 27Z" fill="#F6F65E"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/stamp_Leaf.svg b/zelda-totk/assets/tokt_ui_icons/stamp_Leaf.svg
new file mode 100644
index 0000000..601414f
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/stamp_Leaf.svg
@@ -0,0 +1,5 @@
+<svg width="45" height="48" viewBox="0 0 45 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.56126 23.3707C3.6369 32.6149 6.13062 40.8621 7.30283 43.3726C7.45144 43.6909 7.77619 43.8707 8.12745 43.8707H10.5613C11.1135 43.8707 11.5613 43.423 11.5613 42.8707V40.3295C11.5613 40.07 11.7532 39.8545 12.0115 39.8298C21.8002 38.8927 40.069 34.1794 40.5613 21.8707C40.9728 11.5818 39.0918 6.54303 37.7739 4.65277C37.393 4.10642 36.6948 4.01153 36.0632 4.22308C27.293 7.16082 5.80548 10.9278 4.56126 23.3707Z" fill="#F6F65E"/>
+<path d="M31.7289 10.1691C14.3362 14.3416 9.88723 26.5849 9.57901 34.0266C9.5687 34.2756 9.88529 34.3747 10.0234 34.1674C13.8474 28.4288 22.7218 16.9649 31.9309 10.622C32.1595 10.4645 31.9988 10.1043 31.7289 10.1691Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.67844 45.0649C2.23698 41.9778 -0.422721 33.0115 0.5811 22.9728C1.44664 14.3168 9.22151 9.45009 15.9023 6.56106C19.4403 5.03107 23.1726 3.84171 26.4876 2.86694C27.7511 2.49543 28.9208 2.16376 29.9995 1.85791C31.865 1.32897 33.4581 0.877262 34.7927 0.430215C36.3993 -0.107931 39.2879 -0.169636 41.0551 2.36509C43.093 5.28809 44.985 11.3563 44.5581 22.0306C44.2215 30.4453 37.7946 35.6742 31.5159 38.7147C26.3009 41.2401 20.3586 42.699 15.531 43.4235C15.2559 45.9248 13.1358 47.8707 10.5613 47.8707H8.12744C6.44312 47.8707 4.57295 46.9807 3.67844 45.0649ZM7.30283 43.3726C6.13062 40.8621 3.6369 32.6149 4.56126 23.3707C5.60442 12.9385 20.877 8.60483 30.9544 5.74533C32.8967 5.19419 34.646 4.6978 36.0632 4.22308C36.6948 4.01153 37.393 4.10642 37.7739 4.65277C39.0918 6.54303 40.9728 11.5818 40.5613 21.8707C40.069 34.1794 21.8002 38.8927 12.0115 39.8298C11.7532 39.8545 11.5613 40.07 11.5613 40.3295V42.8707C11.5613 43.423 11.1135 43.8707 10.5613 43.8707H8.12745C7.77619 43.8707 7.45144 43.6909 7.30283 43.3726Z" fill="black"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/stamp_Ore.svg b/zelda-totk/assets/tokt_ui_icons/stamp_Ore.svg
new file mode 100644
index 0000000..f73e0aa
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/stamp_Ore.svg
@@ -0,0 +1,4 @@
+<svg width="46" height="54" viewBox="0 0 46 54" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.00003 20.1758L23 4L42 20.1758L30 50H16L4.00003 20.1758ZM18.5 47.4725L9.00003 21.1868L15.5 23.7143L23 7.03297L30.5 23.7143L37 21.1868L27.5 47.4725H26L29 25.2308H17L20 47.4725H18.5Z" fill="#F6F65E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.00003 20.1758L23 4L42 20.1758L30 50H16L4.00003 20.1758ZM37 21.1868L30.5 23.7143L23 7.03297L15.5 23.7143L9.00003 21.1868L18.5 47.4725H20L17 25.2308H29L26 47.4725H27.5L37 21.1868ZM0.289108 21.6689C-0.353022 20.073 0.0971407 18.2453 1.40699 17.1301L20.407 0.954287C21.9015 -0.318096 24.0985 -0.318096 25.593 0.954287L44.593 17.1301C45.9028 18.2453 46.353 20.073 45.7109 21.6689L33.7109 51.4931C33.1014 53.0078 31.6326 54 30 54H16C14.3673 54 12.8985 53.0078 12.2891 51.4931L0.289108 21.6689Z" fill="black"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/stamp_Pot.svg b/zelda-totk/assets/tokt_ui_icons/stamp_Pot.svg
new file mode 100644
index 0000000..69c3b20
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/stamp_Pot.svg
@@ -0,0 +1,5 @@
+<svg width="56" height="50" viewBox="0 0 56 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M51.5001 18.6H4.50006C4.22392 18.6 4.00006 18.8295 4.00006 19.1125V24.8919C4.00006 25.2854 4.4148 25.5321 4.74813 25.3368L7.38477 23.7925C7.46032 23.7483 7.54583 23.725 7.63284 23.725H8.50006C8.7762 23.725 9.00006 23.9545 9.00006 24.2375V40.125C9.00006 42.9555 11.2386 45.25 14.0001 45.25H41.0001C43.7615 45.25 46.0001 42.9555 46.0001 40.125V24.2375C46.0001 23.9545 46.2239 23.725 46.5001 23.725H47.4189C47.4727 23.725 47.5261 23.7339 47.577 23.7513L51.3419 25.0376C51.6657 25.1483 52.0001 24.9013 52.0001 24.5514V19.1125C52.0001 18.8295 51.7762 18.6 51.5001 18.6Z" fill="#F6F65E"/>
+<path d="M9.00006 15.525V13.475C9.00006 11.7767 10.3432 10.4 12.0001 10.4H26.0001V8.35H24.0001C23.4478 8.35 23.0001 7.89109 23.0001 7.325V5.275C23.0001 4.70891 23.4478 4.25 24.0001 4.25H32.0001C32.5523 4.25 33.0001 4.70891 33.0001 5.275V7.325C33.0001 7.89109 32.5523 8.35 32.0001 8.35H30.0001V10.4H44.0001C45.6569 10.4 47.0001 11.7767 47.0001 13.475V15.525H9.00006Z" fill="#F6F65E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.00006 14.6H4.50006C1.92225 14.6 6.10352e-05 16.714 6.10352e-05 19.1125V24.8919C6.10352e-05 27.5896 2.40553 29.7033 5.00006 29.3944V40.125C5.00006 45.0709 8.93696 49.25 14.0001 49.25H41.0001C46.0632 49.25 50.0001 45.0709 50.0001 40.125V28.8062L50.0487 28.8228C53.1017 29.8659 56.0001 27.5012 56.0001 24.5514V19.1125C56.0001 16.714 54.0779 14.6 51.5001 14.6H51.0001V13.475C51.0001 9.66127 47.9586 6.4 44.0001 6.4H37.0001V5.275C37.0001 2.59345 34.854 0.25 32.0001 0.25H24.0001C21.1461 0.25 19.0001 2.59345 19.0001 5.275V6.4H12.0001C8.04153 6.4 5.00006 9.66127 5.00006 13.475V14.6ZM9.00006 15.525H47.0001V13.475C47.0001 12.7348 46.7449 12.0557 46.3198 11.525C45.7696 10.8381 44.9348 10.4 44.0001 10.4H30.0001V8.35H32.0001C32.5523 8.35 33.0001 7.89109 33.0001 7.325V5.275C33.0001 4.70891 32.5523 4.25 32.0001 4.25H24.0001C23.4478 4.25 23.0001 4.70891 23.0001 5.275V7.325C23.0001 7.89109 23.4478 8.35 24.0001 8.35H26.0001V10.4H12.0001C11.0654 10.4 10.2305 10.8381 9.68031 11.525C9.25522 12.0557 9.00006 12.7348 9.00006 13.475V15.525ZM4.50006 18.6C4.22392 18.6 4.00006 18.8295 4.00006 19.1125V24.8919C4.00006 25.2854 4.4148 25.5321 4.74813 25.3368L7.38477 23.7925C7.46032 23.7483 7.54583 23.725 7.63284 23.725H8.50006C8.7762 23.725 9.00006 23.9545 9.00006 24.2375V40.125C9.00006 42.9555 11.2386 45.25 14.0001 45.25H41.0001C43.7615 45.25 46.0001 42.9555 46.0001 40.125V24.2375C46.0001 23.9545 46.2239 23.725 46.5001 23.725H47.4189C47.4727 23.725 47.5261 23.7339 47.577 23.7513L51.3419 25.0376C51.6657 25.1483 52.0001 24.9013 52.0001 24.5514V19.1125C52.0001 18.8295 51.7762 18.6 51.5001 18.6H4.50006ZM8.50006 25.6967L8.00006 24.843L8.50006 25.6967Z" fill="black"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/stamp_Rhombus.svg b/zelda-totk/assets/tokt_ui_icons/stamp_Rhombus.svg
new file mode 100644
index 0000000..3e50b0c
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/stamp_Rhombus.svg
@@ -0,0 +1,5 @@
+<svg width="57" height="56" viewBox="0 0 57 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.6399 9.5L47.1399 28L28.6399 46.5L10.1399 28L28.6399 9.5ZM4.63989 28L28.6399 4L52.6399 28L28.6399 52L4.63989 28ZM16.1399 28L28.6399 15.5L41.1399 28L28.6399 40.5L16.1399 28ZM1.81147 30.8284C0.249368 29.2663 0.249368 26.7337 1.81147 25.1716L25.8115 1.17158C27.3736 -0.390521 29.9062 -0.390521 31.4683 1.17158L55.4683 25.1716C57.0304 26.7337 57.0304 29.2663 55.4683 30.8284L31.4683 54.8284C29.9062 56.3905 27.3736 56.3905 25.8115 54.8284L1.81147 30.8284Z" fill="black"/>
+<path d="M16.1399 28L28.6399 15.5L41.1399 28L28.6399 40.5L16.1399 28Z" fill="#F6F65E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.63989 28L28.6399 4L52.6399 28L28.6399 52L4.63989 28ZM28.6399 9.5L10.1399 28L28.6399 46.5L47.1399 28L28.6399 9.5Z" fill="#F6F65E"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/stamp_Skull.svg b/zelda-totk/assets/tokt_ui_icons/stamp_Skull.svg
new file mode 100644
index 0000000..ec1a88c
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/stamp_Skull.svg
@@ -0,0 +1,5 @@
+<svg width="50" height="52" viewBox="0 0 50 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.1311 45.6437L34.5253 41.6481C34.5382 41.517 34.607 41.3983 34.7137 41.323L42.2706 35.9939C43.9806 34.7879 45.0002 32.8099 45.0002 30.6982V20.0917C45.0002 18.6958 44.5536 17.3377 43.7275 16.221L38.3759 8.98762C37.4845 7.78281 36.2092 6.93678 34.7757 6.58667C34.6299 6.55106 34.4839 6.51671 34.338 6.48236C34.1388 6.43545 33.9394 6.38852 33.7407 6.33846C32.6577 6.06569 29.8296 5.5 25.0002 5.5C20.1708 5.5 17.3427 6.06569 16.2597 6.33846C16.0609 6.38853 15.8617 6.43544 15.6624 6.48235C15.5164 6.51671 15.3705 6.55106 15.2247 6.58667C13.7911 6.93678 12.5158 7.78281 11.6245 8.98762L6.27291 16.221C5.44677 17.3377 5.00018 18.6958 5.00018 20.0917V30.6982C5.00018 32.8099 6.01973 34.7879 7.72978 35.9939L15.2867 41.323C15.3933 41.3983 15.4622 41.517 15.4751 41.6481L15.8693 45.6437C15.8913 45.8672 16.072 46.039 16.2913 46.049C16.3048 46.0496 16.317 46.0499 16.3304 46.051C16.6867 46.0795 21.9945 46.5 25.0002 46.5C28.0058 46.5 33.3136 46.0795 33.67 46.051C33.6834 46.0499 33.6956 46.0496 33.709 46.049C33.9284 46.039 34.1091 45.8672 34.1311 45.6437ZM12.014 29.4636L14.7745 31.3292C15.0666 31.5266 15.4141 31.6483 15.7534 31.5574C17.9727 30.9629 20.8512 26.9399 21.6923 24.3123C21.8503 23.8186 21.7032 23.2917 21.379 22.89L18.8621 19.7715C18.3033 19.0792 17.3281 18.9071 16.5715 19.3673L12.0855 22.0959C11.55 22.4216 11.2224 23.0082 11.2224 23.6413V27.9641C11.2224 28.5666 11.5195 29.1293 12.014 29.4636ZM37.9863 29.4636L35.2258 31.3292C34.9338 31.5266 34.5863 31.6483 34.247 31.5574C32.0276 30.9629 29.1492 26.9399 28.3081 24.3123C28.1501 23.8186 28.2972 23.2917 28.6214 22.89L31.1383 19.7715C31.6971 19.0792 32.6722 18.9071 33.4289 19.3673L37.9148 22.0959C38.4503 22.4216 38.778 23.0082 38.778 23.6413V27.9641C38.778 28.5666 38.4809 29.1293 37.9863 29.4636ZM23.7214 32.0155C23.8993 31.9244 24.5336 31.6165 24.9752 31.6165C24.9835 31.6165 24.9918 31.6166 25.0002 31.6168C25.442 31.628 26.0269 31.9301 26.1868 32.0172C26.2151 32.0326 26.2413 32.051 26.2629 32.0751C26.3359 32.1566 26.3855 32.2653 26.4033 32.3849L27.6345 37.7976C27.6722 38.0503 27.5626 38.2988 27.374 38.4023C27.346 38.4176 27.3149 38.4255 27.2836 38.4309L25.0491 38.8126C25.0329 38.8154 25.0165 38.8173 25.0002 38.8182C24.9672 38.8201 24.934 38.8182 24.9014 38.8126L22.6668 38.4309C22.6355 38.4255 22.6044 38.4176 22.5765 38.4023C22.3878 38.2988 22.2782 38.0503 22.3159 37.7976L23.4988 32.3849C23.5164 32.2675 23.5644 32.1606 23.6352 32.0796C23.6592 32.0523 23.6892 32.032 23.7214 32.0155Z" fill="#F6F65E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.4095 37.3697L22.3159 37.7976C22.2782 38.0503 22.3878 38.2988 22.5765 38.4023M22.6753 38.4323L22.6668 38.4309L22.6753 38.4323ZM22.6753 38.4323L24.9014 38.8126C24.934 38.8182 24.9672 38.8201 25.0002 38.8182C25.0165 38.8173 25.0329 38.8154 25.0491 38.8126L26.9469 38.4884M27.2752 38.4323L27.2836 38.4309C27.2878 38.4302 27.2919 38.4294 27.296 38.4286C27.3231 38.4233 27.3497 38.4156 27.374 38.4023M27.6345 37.7976L26.4033 32.3849C26.3855 32.2653 26.3359 32.1566 26.2629 32.0751C26.2413 32.051 26.2151 32.0326 26.1868 32.0172C26.0269 31.9301 25.442 31.628 25.0002 31.6168C24.9918 31.6166 24.9835 31.6165 24.9752 31.6165C24.5336 31.6165 23.8993 31.9244 23.7214 32.0155C23.6892 32.032 23.6592 32.0523 23.6352 32.0796C23.5644 32.1606 23.5164 32.2675 23.4988 32.3849L22.4095 37.3697M18.8621 19.7715L21.379 22.89C21.7032 23.2917 21.8503 23.8186 21.6923 24.3123C20.8512 26.9399 17.9727 30.9629 15.7534 31.5574C15.4141 31.6483 15.0666 31.5266 14.7745 31.3292L12.014 29.4636C11.5195 29.1293 11.2224 28.5666 11.2224 27.9641V23.6413C11.2224 23.0082 11.55 22.4216 12.0855 22.0959L16.5715 19.3673C17.3281 18.9071 18.3033 19.0792 18.8621 19.7715ZM11.6245 8.98762L7.60493 6.01383C9.18799 3.87409 11.4636 2.35826 14.0385 1.72942C14.2046 1.68884 14.3677 1.65044 14.5085 1.61732L14.5166 1.6154L15.6624 6.48235C15.5164 6.51671 15.3705 6.55106 15.2247 6.58667C13.7911 6.93678 12.5158 7.78281 11.6245 8.98762ZM6.27291 16.221C5.44677 17.3377 5.00018 18.6958 5.00018 20.0917V30.6982C5.00018 32.8099 6.01973 34.7879 7.72978 35.9939L15.2867 41.323C15.3933 41.3983 15.4622 41.517 15.4751 41.6481L15.8693 45.6437C15.8913 45.8672 16.072 46.039 16.2913 46.049C16.2949 46.0492 16.2985 46.0493 16.302 46.0494C16.3114 46.0498 16.3206 46.0502 16.3304 46.051C16.6867 46.0795 21.9945 46.5 25.0002 46.5C28.0058 46.5 33.3136 46.0795 33.67 46.051C33.6798 46.0502 33.6889 46.0498 33.6984 46.0494C33.7019 46.0493 33.7054 46.0492 33.709 46.049C33.9284 46.039 34.1091 45.8672 34.1311 45.6437L34.5253 41.6481C34.5382 41.517 34.607 41.3983 34.7137 41.323L42.2706 35.9939C43.9806 34.7879 45.0002 32.8099 45.0002 30.6982V20.0917C45.0002 18.6958 44.5536 17.3377 43.7275 16.221L38.3759 8.98762C37.4845 7.78281 36.2092 6.93678 34.7757 6.58667C34.6299 6.55106 34.4839 6.51671 34.338 6.48236C34.1388 6.43545 33.9394 6.38852 33.7407 6.33846C32.6577 6.06569 29.8296 5.5 25.0002 5.5C20.1708 5.5 17.3427 6.06569 16.2597 6.33846C16.0609 6.38853 15.8617 6.43544 15.6624 6.48235L14.5166 1.6154C14.7222 1.56701 14.8836 1.5289 15.0385 1.48989C16.5374 1.11236 19.7766 0.5 25.0002 0.5C30.2238 0.5 33.463 1.11236 34.9619 1.48989C35.1167 1.52889 35.2782 1.56702 35.4837 1.6154L35.4919 1.61731C35.6326 1.65044 35.7957 1.68884 35.9619 1.72942C38.5368 2.35826 40.8124 3.87409 42.3954 6.01383L47.747 13.2472C49.2132 15.2291 50.0002 17.6308 50.0002 20.0917V30.6982C50.0002 34.4174 48.2051 37.9271 45.1522 40.08L39.2969 44.2092L39.107 46.1346C38.847 48.7699 36.7109 50.8872 33.9978 51.0407C33.2794 51.0976 28.1008 51.5 25.0002 51.5C21.8995 51.5 16.721 51.0976 16.0026 51.0407C13.2894 50.8871 11.1534 48.7699 10.8934 46.1346L10.7035 44.2092L4.8482 40.08C1.79531 37.9271 0.000183105 34.4174 0.000183105 30.6982V20.0917C0.000183105 17.6308 0.787113 15.2291 2.25339 13.2472L6.27291 16.221ZM6.27291 16.221L11.6245 8.98762L7.60493 6.01383L2.25339 13.2472L6.27291 16.221ZM35.2258 31.3292L37.9863 29.4636C38.4809 29.1293 38.778 28.5666 38.778 27.9641V23.6413C38.778 23.0082 38.4503 22.4216 37.9148 22.0959L33.4289 19.3673C32.6722 18.9071 31.6971 19.0792 31.1383 19.7715L28.6214 22.89C28.2972 23.2917 28.1501 23.8186 28.3081 24.3123C29.1492 26.9399 32.0276 30.9629 34.247 31.5574C34.5863 31.6483 34.9338 31.5266 35.2258 31.3292Z" fill="black"/>
+<path d="M24.9752 31.6165C24.5336 31.6165 23.8993 31.9244 23.7214 32.0155C23.6892 32.032 23.6592 32.0523 23.6352 32.0796C23.5644 32.1606 23.5164 32.2675 23.4988 32.3849L22.4095 37.3697L22.5765 38.4023C22.6044 38.4176 22.6355 38.4255 22.6668 38.4309L22.6753 38.4323L24.9014 38.8126C24.934 38.8182 24.9672 38.8201 25.0002 38.8182C25.0165 38.8173 25.0329 38.8154 25.0491 38.8126L26.9469 38.4884L27.2752 38.4323L27.374 38.4023C27.5626 38.2988 27.6722 38.0503 27.6345 37.7976L26.4033 32.3849C26.3855 32.2653 26.3359 32.1566 26.2629 32.0751C26.2413 32.051 26.2151 32.0326 26.1868 32.0172C26.0269 31.9301 25.442 31.628 25.0002 31.6168C24.9918 31.6166 24.9835 31.6165 24.9752 31.6165Z" fill="black"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/stamp_Star.svg b/zelda-totk/assets/tokt_ui_icons/stamp_Star.svg
new file mode 100644
index 0000000..0d45841
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/stamp_Star.svg
@@ -0,0 +1,4 @@
+<svg width="54" height="52" viewBox="0 0 54 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M27.1399 4L33.2058 19.6509H49.6398L38.1398 32L41.6398 48L27.1399 40L12.6398 48L16.1398 32L4.63983 19.6509H21.0739L27.1399 4Z" fill="#F6F65E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30.8695 2.55446C30.2727 1.01474 28.7912 -3.8147e-06 27.1398 -3.8147e-06C25.4885 -3.8147e-06 24.0069 1.01474 23.4102 2.55446L18.3343 15.6509H4.6398C3.04782 15.6509 1.60739 16.595 0.972098 18.0547C0.336803 19.5144 0.627595 21.2119 1.71253 22.3769L11.7844 33.1924L8.7322 47.1452C8.39669 48.679 8.98946 50.2671 10.2478 51.206C11.5062 52.1449 13.1974 52.2607 14.5721 51.5023L27.1398 44.5684L39.7075 51.5023C41.0821 52.2607 42.7734 52.1449 44.0318 51.206C45.2901 50.2672 45.8829 48.679 45.5474 47.1452L42.4952 33.1924L52.5671 22.3769C53.652 21.2119 53.9428 19.5144 53.3075 18.0547C52.6722 16.595 51.2318 15.6509 49.6398 15.6509H35.9454L30.8695 2.55446ZM33.2058 19.6509L27.1399 4L21.0739 19.6509H4.63983L16.1398 32L12.6398 48L27.1399 40L41.6398 48L38.1398 32L49.6398 19.6509H33.2058Z" fill="black"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/stamp_Sword.svg b/zelda-totk/assets/tokt_ui_icons/stamp_Sword.svg
new file mode 100644
index 0000000..5b8d6c3
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/stamp_Sword.svg
@@ -0,0 +1,7 @@
+<svg width="52" height="52" viewBox="0 0 52 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.4841 26L38.0647 4H48.0002V14.2667L26.0002 34.8L22.4518 31.1333L35.0302 18.6667L39.4841 12.8L33.6109 17.2L21.0324 29.6667L17.4841 26Z" fill="#F6F65E"/>
+<path d="M4.00018 39.9333V47.2667C4.00018 47.6717 4.31792 48 4.70986 48H11.8066C12.1986 48 12.5163 47.6717 12.5163 47.2667V42.8667L17.4841 39.2L23.4678 44.6962C23.7276 44.9348 24.0632 45.0667 24.4108 45.0667H29.5486C30.3325 45.0667 30.9679 44.41 30.9679 43.6V41.5622V38.7704C30.9679 38.1977 30.5186 37.7333 29.9643 37.7333C29.8312 37.7333 29.7008 37.7607 29.5802 37.8123C29.5657 37.8185 29.5513 37.8251 29.537 37.832C29.4331 37.8825 29.3374 37.9516 29.2546 38.0371L28.2021 39.1247L26.7099 40.6667L12.6848 25.4495L12.5163 25.2667L10.4983 21.6H8.96793C8.18404 21.6 7.54857 22.2566 7.54857 23.0667V26.909C7.54857 27.2682 7.67614 27.615 7.90709 27.8834L13.226 34.0667L8.96793 39.2H4.70986C4.31792 39.2 4.00018 39.5283 4.00018 39.9333Z" fill="#F6F65E"/>
+<path d="M12.5163 25.2667L14.3514 23.3704C14.5396 23.1759 14.6453 22.9121 14.6453 22.6371C14.6453 22.0643 14.196 21.6 13.6417 21.6H10.4983L12.5163 25.2667Z" fill="#F6F65E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.2066 44.3764L20.762 47.6421C21.7477 48.5475 23.0447 49.0667 24.4108 49.0667H29.5486C32.6642 49.0667 34.9679 46.4945 34.9679 43.6V38.7704C34.9679 36.925 33.9465 35.2133 32.3557 34.3397L50.7295 17.1909C51.54 16.4344 52.0002 15.3754 52.0002 14.2667V4C52.0002 1.79086 50.2093 0 48.0002 0H38.0647C36.9576 0 35.9 0.458866 35.1436 1.26737L17.7871 19.8209C16.9081 18.5045 15.4209 17.6 13.6417 17.6H8.96793C5.85228 17.6 3.54857 20.1722 3.54857 23.0667V26.909C3.54857 28.2105 4.00971 29.4865 4.87467 30.492L7.99005 34.1136L7.08889 35.2H4.70986C1.98616 35.2 0.000183105 37.4438 0.000183105 39.9333V47.2667C0.000183105 49.7562 1.98616 52 4.70986 52H11.8066C14.5303 52 16.5163 49.7562 16.5163 47.2667V44.8859L17.2066 44.3764ZM4.00018 47.2667V39.9333C4.00018 39.5283 4.31792 39.2 4.70986 39.2H8.96793L13.226 34.0667L7.90709 27.8834C7.67614 27.615 7.54857 27.2682 7.54857 26.909V23.0667C7.54857 22.2566 8.18404 21.6 8.96793 21.6H10.4983H13.6417C14.196 21.6 14.6453 22.0643 14.6453 22.6371C14.6453 22.9121 14.5396 23.1759 14.3514 23.3704L12.5163 25.2667L12.6848 25.4495L28.2021 39.1247L29.2546 38.0371C29.3374 37.9516 29.4331 37.8825 29.537 37.832C29.5513 37.8251 29.5657 37.8185 29.5802 37.8123C29.7008 37.7607 29.8312 37.7333 29.9643 37.7333C30.5186 37.7333 30.9679 38.1977 30.9679 38.7704V41.5622V43.6C30.9679 44.41 30.3325 45.0667 29.5486 45.0667H24.4108C24.0632 45.0667 23.7276 44.9348 23.4678 44.6962L17.4841 39.2L12.5163 42.8667V47.2667C12.5163 47.6717 12.1986 48 11.8066 48H4.70986C4.31792 48 4.00018 47.6717 4.00018 47.2667ZM38.0647 4L17.4841 26L21.0324 29.6667L33.6109 17.2L39.4841 12.8L35.0302 18.6667L22.4518 31.1333L26.0002 34.8L48.0002 14.2667V4H38.0647Z" fill="black"/>
+<path d="M12.6848 25.4495L26.7099 40.6667L28.2021 39.1247L12.6848 25.4495Z" fill="black"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/stamp_TreasureBox.svg b/zelda-totk/assets/tokt_ui_icons/stamp_TreasureBox.svg
new file mode 100644
index 0000000..d374fe4
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/stamp_TreasureBox.svg
@@ -0,0 +1,8 @@
+<svg width="54" height="42" viewBox="0 0 54 42" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.00018 22.5455H18.0219L17.1524 18.4242H4.00018L5.00018 22.5455Z" fill="black"/>
+<path d="M35.9784 22.5455H49.0002L50.0002 18.4242H36.848L35.9784 22.5455Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M53.7175 19.9041C53.8999 19.4464 54.0002 18.947 54.0002 18.4242V13.2727C54.0002 6.0558 48.2916 0 41.0002 0H13.0002C5.70876 0 0.000183105 6.0558 0.000183105 13.2727V18.4242C0.000183105 18.947 0.100465 19.4463 0.282842 19.9041L1.01979 22.9412C1.03196 23.0635 1.04983 23.1858 1.07348 23.3077L4.07348 38.7622C4.43845 40.6424 6.08494 42 8.00018 42H46.0002C47.9154 42 49.5619 40.6424 49.9269 38.7622L52.9269 23.3077C52.9505 23.1858 52.9684 23.0635 52.9806 22.9412L53.7175 19.9041ZM4.00018 18.4242V13.2727C4.00018 8.15154 8.02962 4 13.0002 4H41.0002C45.9707 4 50.0002 8.15154 50.0002 13.2727V18.4242L49.0002 22.5455L46.0002 38H8.00018L5.00018 22.5455L4.00018 18.4242Z" fill="black"/>
+<path d="M27.9053 20.3702C27.5663 20.5595 27.263 20.7933 27.0002 21.0613C26.7374 20.7933 26.434 20.5595 26.0951 20.3702C25.896 20.259 25.7094 20.1083 25.5477 19.9222C25.2146 19.5388 25.0002 19.0206 25.0002 18.4242C25.0002 17.9971 25.1096 17.6142 25.2907 17.2916C25.6698 16.6165 26.3242 16.2424 27.0002 16.2424C27.6762 16.2424 28.3306 16.6165 28.7096 17.2916C28.8907 17.6142 29.0002 17.9971 29.0002 18.4242C29.0002 19.0206 28.7858 19.5388 28.4527 19.9222C28.291 20.1083 28.1043 20.259 27.9053 20.3702Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.00018 13.2727V18.4242H17.1524L18.0219 22.5455H5.00018L8.00018 38H46.0002L49.0002 22.5455H35.9784L36.848 18.4242H50.0002V13.2727C50.0002 8.15154 45.9707 4 41.0002 4H13.0002C8.02962 4 4.00018 8.15154 4.00018 13.2727ZM21.8029 15.3333C22.8403 13.4856 24.7793 12.2424 27.0002 12.2424C29.221 12.2424 31.1601 13.4856 32.1975 15.3333C32.5752 16.0061 32.8334 16.7591 32.9422 17.5613C32.9878 17.8968 33.0005 18.0857 33.0002 18.4242C33.0002 19.6367 32.6614 20.7676 32.076 21.7221C32.0687 21.734 32.0613 21.746 32.0538 21.7579L32.0517 21.7614L32.0407 21.779L32.0251 21.8036C31.859 22.0653 31.6741 22.3133 31.4724 22.5455C31.013 23.0743 30.4665 23.5212 29.8562 23.8622L31.0002 31.8182H23.0002L24.1442 23.8622C23.5339 23.5212 22.9874 23.0743 22.528 22.5455C22.3128 22.2978 22.1168 22.0322 21.9422 21.7511L21.9243 21.7221C21.8512 21.6028 21.7819 21.4807 21.7166 21.3561C21.2596 20.4836 21.0002 19.4852 21.0002 18.4242C21.0002 18.1779 21.0142 17.935 21.0414 17.6962C21.045 17.6644 21.0488 17.6329 21.0529 17.6012L21.0582 17.5613C21.0564 17.5746 21.0546 17.5879 21.0529 17.6012C21.0488 17.6329 21.045 17.6644 21.0414 17.6962C21.0142 17.935 21.0002 18.1779 21.0002 18.4242C21.0002 19.4852 21.2596 20.4836 21.7166 21.3561C21.7819 21.4807 21.8512 21.6028 21.9243 21.7221L21.9422 21.7511C22.1168 22.0322 22.3128 22.2978 22.528 22.5455C22.9874 23.0743 23.5339 23.5212 24.1442 23.8622L23.0002 31.8182H31.0002L29.8562 23.8622C30.4665 23.5212 31.013 23.0743 31.4724 22.5455C31.6741 22.3133 31.859 22.0653 32.0251 21.8036L32.0407 21.779L32.0517 21.7614L32.0538 21.7579L32.0581 21.7511L32.076 21.7221C32.6614 20.7676 33.0002 19.6367 33.0002 18.4242C33.0005 18.0857 32.9878 17.8968 32.9422 17.5613C32.8334 16.7591 32.5752 16.0061 32.1975 15.3333C31.1601 13.4856 29.221 12.2424 27.0002 12.2424C24.7793 12.2424 22.8403 13.4856 21.8029 15.3333C21.4251 16.0061 21.1669 16.7591 21.0582 17.5613L21.0529 17.6012C21.0546 17.5879 21.0564 17.5746 21.0582 17.5613C21.1669 16.7591 21.4251 16.0061 21.8029 15.3333ZM32.076 21.7221L32.0581 21.7511L32.0538 21.7579C32.0613 21.746 32.0687 21.734 32.076 21.7221ZM27.0002 21.0613C27.263 20.7933 27.5663 20.5595 27.9053 20.3702C28.1043 20.259 28.291 20.1083 28.4527 19.9222C28.7858 19.5388 29.0002 19.0206 29.0002 18.4242C29.0002 17.9971 28.8907 17.6142 28.7096 17.2916C28.3306 16.6165 27.6762 16.2424 27.0002 16.2424C26.3242 16.2424 25.6698 16.6165 25.2907 17.2916C25.1096 17.6142 25.0002 17.9971 25.0002 18.4242C25.0002 19.0206 25.2146 19.5388 25.5477 19.9222C25.7094 20.1083 25.896 20.259 26.0951 20.3702C26.434 20.5595 26.7374 20.7933 27.0002 21.0613Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.00018 18.4242V13.2727C4.00018 8.15154 8.02962 4 13.0002 4H41.0002C45.9707 4 50.0002 8.15154 50.0002 13.2727V18.4242H36.848L35.9784 22.5455H50.0002L47.0002 38H8.00018L5.00018 22.5455H18.0219L17.1524 18.4242H4.00018ZM23.0002 31.8182H31.0002L29.8562 23.8622C30.4665 23.5212 31.013 23.0743 31.4724 22.5455C32.4225 21.4518 33.0002 20.0075 33.0002 18.4242C33.0002 18.127 32.9798 17.8346 32.9404 17.5485C32.9332 17.496 32.9253 17.4437 32.9168 17.3916C32.7962 16.6528 32.5485 15.9585 32.1975 15.3333C31.1601 13.4856 29.221 12.2424 27.0002 12.2424C24.7793 12.2424 22.8403 13.4856 21.8029 15.3333C21.416 16.0223 21.1546 16.7954 21.0506 17.6194C21.0473 17.645 21.0443 17.6706 21.0414 17.6962C21.0142 17.935 21.0002 18.1779 21.0002 18.4242C21.0002 19.6611 21.3528 20.8132 21.96 21.7795C22.1301 22.0502 22.3201 22.3062 22.528 22.5455C22.9874 23.0743 23.5339 23.5212 24.1442 23.8622L23.0002 31.8182Z" fill="#F6F65E"/>
+</svg>
diff --git a/zelda-totk/assets/tokt_ui_icons/totk_ui_icons_readme.txt b/zelda-totk/assets/tokt_ui_icons/totk_ui_icons_readme.txt
new file mode 100644
index 0000000..8c73ec6
--- /dev/null
+++ b/zelda-totk/assets/tokt_ui_icons/totk_ui_icons_readme.txt
@@ -0,0 +1,3 @@
+TOTK UI icons were extracted and compiled by risograph#0
+
+original assets: https://www.figma.com/community/file/1255259745702285104/TOTK-SVG-UI-Icon-Kit
\ No newline at end of file
diff --git a/zelda-totk/index.html b/zelda-totk/index.html
index f3be735..3f24dfd 100644
--- a/zelda-totk/index.html
+++ b/zelda-totk/index.html
@@ -8,8 +8,13 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
 	<link rel="shortcut icon" href="./favicon.png"/>
 	<link type="text/css" rel="stylesheet" href="./zelda-totk.css" media="all"/>
+	<script type="text/javascript" src="./lib/cash.min.js"></script>
+	<script type="text/javascript" src="./lib/murmurhash3js.min.js"></script>
 	<script type="text/javascript" src="../savegame-editor.js"></script>
 	<script type="text/javascript" src="./zelda-totk.js"></script>
+	<script type="text/javascript" src="./zelda-totk.locale.js"></script>
+	<script type="text/javascript" src="./zelda-totk.variables.js"></script>
+	<script defer type="text/javascript" src="./zelda-totk.class.pouch.js"></script>
 	<script defer type="text/javascript" src="./zelda-totk.class.equipment.js"></script>
 	<script defer type="text/javascript" src="./zelda-totk.class.armor.js"></script>
 	<script defer type="text/javascript" src="./zelda-totk.class.item.js"></script>
@@ -18,9 +23,7 @@
 	<script defer type="text/javascript" src="./zelda-totk.completism.js"></script>
 	<script defer type="text/javascript" src="./zelda-totk.coordinates.js"></script>
 	<script defer type="text/javascript" src="./zelda-totk.exp-calculator.js"></script>
-	<script defer type="text/javascript" src="./zelda-totk.locale.js"></script>
 	<script defer type="text/javascript" src="./zelda-totk.master.js"></script>
-	<script defer type="text/javascript" src="./murmurhash3js.min.js"></script>
 	<script type="text/javascript"><!--
 		/* service worker */
 		/*var FORCE_HTTPS=true;
@@ -36,41 +39,69 @@
 
 <!-- HEADER -->
 <div id="header">
-	<div id="header-top">
-		<div class="row wrapper padding-vertical">
-			<h1>Savegame Editor for The legend of Zelda: TOTK</h1>
-			<div class="six columns text-left"><img src="./assets/logo.png" style="max-width:90%"/></div>
-			<div class="six columns text-right header-buttons">
-				by <a href="/" class="author">Marc Robledo</a>
-				<a href="https://github.com/marcrobledo/savegame-editors/tree/master/zelda-totk" target="_blank" class="button"><span class="sprite github"></span> See on GitHub</a>
-				<a href="https://www.paypal.me/marcrobledo/5" target="_blank" rel="nofollow" class="donate button"><span class="sprite heart"></span> Donate</a>
+	<div class="wrapper">
+		<div id="header-top">
+			<div class="row padding-vertical">
+				<h1>Savegame Editor for The legend of Zelda: TOTK</h1>
+				<div class="text-left"><img src="./assets/logo.png" style="max-width:90%"/></div>
+				<div class="text-right header-buttons">
+					by <a href="/" class="author">Marc Robledo</a>
+					<a href="https://github.com/marcrobledo/savegame-editors/tree/master/zelda-totk" target="_blank" class="button"><img src="assets/octicons/octicon_github.svg" loading="lazy" class="octicon" /> See on GitHub</a>
+					<a href="https://www.paypal.me/marcrobledo/5" target="_blank" rel="nofollow" class="donate button"><img src="assets/octicons/octicon_heart.svg" loading="lazy" class="octicon" /> Donate</a>
+				</div>
 			</div>
 		</div>
-	</div>
-	<div id="toolbar" class="hidden padding-vertical">
-		<div class="row wrapper">
-			<div class="twelve columns text-center">
-				<button id="tab-button-home" data-translate-title="Home" title="Home" class="tab-button active" onclick="showTab('home')"><i class="tab-icon home"></i></button>
-				<button id="tab-button-weapons" data-translate-title="Weapons" title="Weapons" class="tab-button" onclick="showTab('weapons')"><i class="tab-icon weapons"></i></button>
-				<button id="tab-button-bows" data-translate-title="Bows" title="Bows" class="tab-button" onclick="showTab('bows')"><i class="tab-icon bows"></i></button>
-				<button id="tab-button-shields" data-translate-title="Shields" title="Shields" class="tab-button" onclick="showTab('shields')"><i class="tab-icon shields"></i></button>
-				<button id="tab-button-armors" data-translate-title="Armors" title="Armors" class="tab-button" onclick="showTab('armors')"><i class="tab-icon clothes"></i></button>
-				<button id="tab-button-materials" data-translate-title="Materials" title="Materials" class="tab-button" onclick="showTab('materials')"><i class="tab-icon materials"></i></button>
-				<button id="tab-button-food" data-translate-title="Food" title="Food" class="tab-button" onclick="showTab('food')"><i class="tab-icon food"></i></button>
-				<button id="tab-button-devices" data-translate-title="Zonai devices" title="Zonai devices" class="tab-button" onclick="showTab('devices')"><i class="tab-icon devices"></i></button>
-				<button id="tab-button-key" data-translate-title="Key items" title="Key items" class="tab-button" onclick="showTab('key')"><i class="tab-icon other"></i></button>
-				<button id="tab-button-horses" data-translate-title="Horses" title="Horses" class="tab-button" onclick="showTab('horses')"><i class="tab-icon horses"></i></button>
-				<button id="tab-button-master" data-translate-title="Master editor" title="Master editor" class="tab-button" onclick="showTab('master')"><i class="tab-icon master"></i></button>
-				<button id="tab-button-settings" data-translate-title="Settings" title="Settings" class="tab-button" onclick="showTab('settings')"><i class="tab-icon settings"></i></button>
-				| <button class="button with-icon icon3" data-translate="Close file" onclick="closeFile()">Close file</button>
-				<button class="button colored blue with-icon icon9" data-translate="Save changes" onclick="saveChanges()">Save changes</button>
+		<div id="toolbar" class="hide">
+			<div class="row">
+				<div id="nav">
+					<button class="nav-link" data-translate-title="Home" title="Home" data-target="home"><i class="tab-icon home"></i></button>
+					<button class="nav-link" data-translate-title="Weapons" title="Weapons" data-target="weapons"><i class="tab-icon weapons"></i></button>
+					<button class="nav-link" data-translate-title="Bows" title="Bows" data-target="bows"><i class="tab-icon bows"></i></button>
+					<button class="nav-link" data-translate-title="Shields" title="Shields" data-target="shields"><i class="tab-icon shields"></i></button>
+					<button class="nav-link" data-translate-title="Armors" title="Armors" data-target="armors"><i class="tab-icon clothes"></i></button>
+					<button class="nav-link" data-translate-title="Materials" title="Materials" data-target="materials"><i class="tab-icon materials"></i></button>
+					<button class="nav-link" data-translate-title="Food" title="Food" data-target="food"><i class="tab-icon food"></i></button>
+					<button class="nav-link" data-translate-title="Zonai devices" title="Zonai devices" data-target="devices"><i class="tab-icon devices"></i></button>
+					<button class="nav-link" data-translate-title="Key items" title="Key items" data-target="key"><i class="tab-icon other"></i></button>
+					<button class="nav-link" data-translate-title="Horses" title="Horses" data-target="horses"><i class="tab-icon horses"></i></button>
+					<button class="nav-link" data-translate-title="Master editor" title="Master editor" data-target="master"><i class="tab-icon master"></i></button>
+				</div>
+				<div>
+					<button class="btn" onclick="closeFile()"><img src="assets/octicons/octicon_x.svg" loading="lazy" class="octicon" /> <span data-translate="Close file">Close file</span></button>
+					<button class="btn btn-primary" onclick="saveChanges()"><img src="assets/octicons/octicon_check.svg" loading="lazy" class="octicon" /> <span data-translate="Save changes">Save changes</span></button>
+				</div>
 			</div>
 		</div>
 	</div>
 </div>
 
 <!-- THE EDITOR -->
-<div id="the-editor" class="wrapper hidden">
+<div id="container-startup" class="wrapper">
+	<div id="alert-troubleshooting" class="alert alert-info">
+		
+		<p><strong>Troubleshooting</strong>: Please read the <a href="https://github.com/marcrobledo/savegame-editors/wiki/TOTK-known-issues-&-FAQ" target="_blank">list of known issues</a> if you are having problems when loading/saving your edited savegame.</p>
+		<p class="alert-danger"><strong>Always remember to make backups of your savegames before editing. Use this savegame editor at your own risk. By using it, you are responsible of any data lost.</strong></p>		
+	</div>
+	<div id="container-language" class="text-center">
+		<label for="select-language">Select your language</label>
+		<select id="select-language">
+			<option value="en">English</option>
+			<option value="fr">Français</option>
+			<option value="fr_alt">Français (Canada)</option>
+			<option value="de">Deutsch</option>
+			<option value="it">Italiano</option>
+			<option value="es">Español</option>
+			<option value="es_alt">Español latino</option>
+			<option value="nl">Dutch</option>
+			<option value="ru">Russian</option>
+			<option value="ja">Japanese</option>
+			<option value="ko">Korean</option>
+			<option value="zh">Chinese (simplified)</option>
+			<option value="zh_alt">Chinese (traditional)</option>
+		</select>
+	</div>
+</div>
+<div id="the-editor" class="wrapper hide">
 	<!-- DEBUG -->
 	<div id="debug"></div>
 	
@@ -79,20 +110,20 @@
 		<!-- RUPEES -->
 		<h3 class="border-red" data-translate="Status">Status</h3>
 		<div class="row mb-10">
-			<div class="ten columns"><label data-translate="Game version">Game version</label></div>
-			<div class="two columns text-right"><span id="span-version"></span></div>
+			<div><label data-translate="Game version">Game version</label></div>
+			<div><span id="span-version"></span></div>
 		</div>
 		<div class="row mb-10">
-			<div class="ten columns"><label data-translate="Playtime">Playtime</label></div>
-			<div class="two columns text-right"><span id="span-playtime"></span></div>
+			<div><label data-translate="Playtime">Playtime</label></div>
+			<div><span id="span-playtime"></span></div>
 		</div>
 		<div class="row mb-5">
-			<div class="ten columns"><label for="number-rupees" data-translate="Rupees">Rupees</label></div>
-			<div class="two columns"><input id="number-rupees" class="full-width" type="text" /></div>
+			<div><label for="number-rupees" data-translate="Rupees">Rupees</label></div>
+			<div class="col-right"><input id="number-rupees" class="full-width" type="text" /></div>
 		</div>
 		<div class="row mb-5">
-			<div class="ten columns"><label for="select-max-hearts" data-translate="Max. hearts">Max. hearts</label></div>
-			<div class="two columns">
+			<div><label for="select-max-hearts" data-translate="Max. hearts">Max. hearts</label></div>
+			<div class="col-right">
 				<select id="select-max-hearts" class="full-width">
 					<option value="4">1 heart</option>
 					<option value="8">2 hearts</option>
@@ -138,8 +169,8 @@
 			</div>
 		</div>
 		<div class="row mb-5">
-			<div class="ten columns"><label for="select-max-stamina" data-translate="Max. stamina">Max. stamina</label></div>
-			<div class="two columns">
+			<div><label for="select-max-stamina" data-translate="Max. stamina">Max. stamina</label></div>
+			<div class="col-right">
 				<select id="select-max-stamina" class="full-width">
 					<option value="1148846080">1 wheel</option>
 					<option value="1150681088">1 wheel+1/5</option>
@@ -157,8 +188,8 @@
 			</div>
 		</div>
 		<div class="row mb-5">
-			<div class="ten columns"><label for="select-max-battery" data-translate="Battery size">Battery size</label></div>
-			<div class="two columns">
+			<div><label for="select-max-battery" data-translate="Battery size">Battery size</label></div>
+			<div class="col-right">
 				<select id="select-max-battery" class="full-width">
 					<option value="3000">3000</option>
 					<option value="4000">4000</option>
@@ -210,178 +241,452 @@
 			</div>
 		</div>
 		<div class="row mb-5">
-			<div class="ten columns"><label for="number-pony-points" data-translate="Pony points">Pony points</label></div>
-			<div class="two columns"><input id="number-pony-points" class="full-width" type="text" /></div>
+			<div><label for="number-pony-points" data-translate="Pony points">Pony points</label></div>
+			<div class="col-right"><input id="number-pony-points" class="full-width" type="text" /></div>
 		</div>
 		
 		<!-- Pouch size -->
 		<h3 class="border-green">Pouch size</h3>
 		<div class="row mb-5">
-			<div class="ten columns"><label for="number-pouch-size-swords" data-translate="Sword pouch size">Sword pouch size</label></div>
-			<div class="two columns"><input id="number-pouch-size-swords" class="full-width" type="text" /></div>
+			<div><label for="number-pouch-size-swords" data-translate="Sword pouch size">Sword pouch size</label></div>
+			<div class="col-right"><input id="number-pouch-size-swords" class="full-width" type="text" /></div>
 		</div>
 		<div class="row mb-5">
-			<div class="ten columns"><label for="number-pouch-size-bows" data-translate="Bow pouch size">Bow pouch size</label></div>
-			<div class="two columns"><input id="number-pouch-size-bows" class="full-width" type="text" /></div>
+			<div><label for="number-pouch-size-bows" data-translate="Bow pouch size">Bow pouch size</label></div>
+			<div class="col-right"><input id="number-pouch-size-bows" class="full-width" type="text" /></div>
 		</div>
 		<div class="row">
-			<div class="ten columns"><label for="number-pouch-size-shields" data-translate="Shield pouch size">Shield pouch size</label></div>
-			<div class="two columns"><input id="number-pouch-size-shields" class="full-width" type="text" /></div>
+			<div><label for="number-pouch-size-shields" data-translate="Shield pouch size">Shield pouch size</label></div>
+			<div class="col-right"><input id="number-pouch-size-shields" class="full-width" type="text" /></div>
 		</div>
 	
 		<!-- Coordinates -->
-		<h3 class="border-orange" data-translate="Coordinates">Coordinates</h3>
-		<div class="row">
-			<div class="six columns"><label for="float-pos-x" data-translate="Current Link coordinates">Current Link coordinates</label> (XYZ)</div>
-			<div class="two columns"><input id="float-pos-x" class="full-width" type="text" /></div>
-			<div class="two columns"><input id="float-pos-y" class="full-width" type="text" /></div>
-			<div class="two columns"><input id="float-pos-z" class="full-width" type="text" /></div>
+		<h3 class="border-orange" data-translate="Coordinates">Link position</h3>
+		<div class="row mb-10">
+			<div><label for="float-pos-x" data-translate="Coordinates">Coordinates</label> (XYZ)</div>
+			<div class="col-right">
+				<input id="float-pos-x" class="medium" type="text" />
+				<input id="float-pos-y" class="medium" type="text" />
+				<input id="float-pos-z" class="medium" type="text" />
+			</div>
 		</div>
+		<!-- <div class="row">
+			<div><label for="map" data-translate="Map">Map</label></div>
+			<div class="col-right">
+				<select id="map">
+					<option value="OpeningField">OpeningField</option>
+					<option value="MainField">MainField</option>
+					<option value="Dungeon000">Dungeon000</option>
+					<option value="Dungeon001">Dungeon001</option>
+					<option value="Dungeon002">Dungeon002</option>
+					<option value="Dungeon003">Dungeon003</option>
+					<option value="Dungeon004">Dungeon004</option>
+					<option value="Dungeon005">Dungeon005</option>
+					<option value="Dungeon006">Dungeon006</option>
+					<option value="Dungeon007">Dungeon007</option>
+					<option value="Dungeon008">Dungeon008</option>
+					<option value="Dungeon009">Dungeon009</option>
+					<option value="Dungeon010">Dungeon010</option>
+					<option value="Dungeon011">Dungeon011</option>
+					<option value="Dungeon012">Dungeon012</option>
+					<option value="Dungeon013">Dungeon013</option>
+					<option value="Dungeon014">Dungeon014</option>
+					<option value="Dungeon015">Dungeon015</option>
+					<option value="Dungeon016">Dungeon016</option>
+					<option value="Dungeon017">Dungeon017</option>
+					<option value="Dungeon018">Dungeon018</option>
+					<option value="Dungeon019">Dungeon019</option>
+					<option value="Dungeon020">Dungeon020</option>
+					<option value="Dungeon021">Dungeon021</option>
+					<option value="Dungeon022">Dungeon022</option>
+					<option value="Dungeon023">Dungeon023</option>
+					<option value="Dungeon024">Dungeon024</option>
+					<option value="Dungeon025">Dungeon025</option>
+					<option value="Dungeon026">Dungeon026</option>
+					<option value="Dungeon027">Dungeon027</option>
+					<option value="Dungeon028">Dungeon028</option>
+					<option value="Dungeon029">Dungeon029</option>
+					<option value="Dungeon030">Dungeon030</option>
+					<option value="Dungeon031">Dungeon031</option>
+					<option value="Dungeon032">Dungeon032</option>
+					<option value="Dungeon033">Dungeon033</option>
+					<option value="Dungeon034">Dungeon034</option>
+					<option value="Dungeon035">Dungeon035</option>
+					<option value="Dungeon036">Dungeon036</option>
+					<option value="Dungeon037">Dungeon037</option>
+					<option value="Dungeon038">Dungeon038</option>
+					<option value="Dungeon039">Dungeon039</option>
+					<option value="Dungeon040">Dungeon040</option>
+					<option value="Dungeon041">Dungeon041</option>
+					<option value="Dungeon042">Dungeon042</option>
+					<option value="Dungeon043">Dungeon043</option>
+					<option value="Dungeon044">Dungeon044</option>
+					<option value="Dungeon045">Dungeon045</option>
+					<option value="Dungeon046">Dungeon046</option>
+					<option value="Dungeon047">Dungeon047</option>
+					<option value="Dungeon048">Dungeon048</option>
+					<option value="Dungeon049">Dungeon049</option>
+					<option value="Dungeon050">Dungeon050</option>
+					<option value="Dungeon051">Dungeon051</option>
+					<option value="Dungeon052">Dungeon052</option>
+					<option value="Dungeon053">Dungeon053</option>
+					<option value="Dungeon054">Dungeon054</option>
+					<option value="Dungeon055">Dungeon055</option>
+					<option value="Dungeon056">Dungeon056</option>
+					<option value="Dungeon057">Dungeon057</option>
+					<option value="Dungeon058">Dungeon058</option>
+					<option value="Dungeon059">Dungeon059</option>
+					<option value="Dungeon060">Dungeon060</option>
+					<option value="Dungeon061">Dungeon061</option>
+					<option value="Dungeon062">Dungeon062</option>
+					<option value="Dungeon063">Dungeon063</option>
+					<option value="Dungeon064">Dungeon064</option>
+					<option value="Dungeon065">Dungeon065</option>
+					<option value="Dungeon066">Dungeon066</option>
+					<option value="Dungeon067">Dungeon067</option>
+					<option value="Dungeon068">Dungeon068</option>
+					<option value="Dungeon069">Dungeon069</option>
+					<option value="Dungeon070">Dungeon070</option>
+					<option value="Dungeon071">Dungeon071</option>
+					<option value="Dungeon072">Dungeon072</option>
+					<option value="Dungeon073">Dungeon073</option>
+					<option value="Dungeon074">Dungeon074</option>
+					<option value="Dungeon075">Dungeon075</option>
+					<option value="Dungeon076">Dungeon076</option>
+					<option value="Dungeon077">Dungeon077</option>
+					<option value="Dungeon078">Dungeon078</option>
+					<option value="Dungeon079">Dungeon079</option>
+					<option value="Dungeon080">Dungeon080</option>
+					<option value="Dungeon081">Dungeon081</option>
+					<option value="Dungeon082">Dungeon082</option>
+					<option value="Dungeon083">Dungeon083</option>
+					<option value="Dungeon084">Dungeon084</option>
+					<option value="Dungeon085">Dungeon085</option>
+					<option value="Dungeon086">Dungeon086</option>
+					<option value="Dungeon087">Dungeon087</option>
+					<option value="Dungeon088">Dungeon088</option>
+					<option value="Dungeon089">Dungeon089</option>
+					<option value="Dungeon090">Dungeon090</option>
+					<option value="Dungeon091">Dungeon091</option>
+					<option value="Dungeon092">Dungeon092</option>
+					<option value="Dungeon093">Dungeon093</option>
+					<option value="Dungeon094">Dungeon094</option>
+					<option value="Dungeon095">Dungeon095</option>
+					<option value="Dungeon096">Dungeon096</option>
+					<option value="Dungeon097">Dungeon097</option>
+					<option value="Dungeon098">Dungeon098</option>
+					<option value="Dungeon099">Dungeon099</option>
+					<option value="Dungeon100">Dungeon100</option>
+					<option value="Dungeon101">Dungeon101</option>
+					<option value="Dungeon102">Dungeon102</option>
+					<option value="Dungeon103">Dungeon103</option>
+					<option value="Dungeon104">Dungeon104</option>
+					<option value="Dungeon105">Dungeon105</option>
+					<option value="Dungeon106">Dungeon106</option>
+					<option value="Dungeon107">Dungeon107</option>
+					<option value="Dungeon108">Dungeon108</option>
+					<option value="Dungeon109">Dungeon109</option>
+					<option value="Dungeon110">Dungeon110</option>
+					<option value="Dungeon111">Dungeon111</option>
+					<option value="Dungeon112">Dungeon112</option>
+					<option value="Dungeon113">Dungeon113</option>
+					<option value="Dungeon114">Dungeon114</option>
+					<option value="Dungeon115">Dungeon115</option>
+					<option value="Dungeon116">Dungeon116</option>
+					<option value="Dungeon117">Dungeon117</option>
+					<option value="Dungeon118">Dungeon118</option>
+					<option value="Dungeon119">Dungeon119</option>
+					<option value="Dungeon120">Dungeon120</option>
+					<option value="Dungeon121">Dungeon121</option>
+					<option value="Dungeon122">Dungeon122</option>
+					<option value="Dungeon123">Dungeon123</option>
+					<option value="Dungeon124">Dungeon124</option>
+					<option value="Dungeon125">Dungeon125</option>
+					<option value="Dungeon126">Dungeon126</option>
+					<option value="Dungeon127">Dungeon127</option>
+					<option value="Dungeon128">Dungeon128</option>
+					<option value="Dungeon129">Dungeon129</option>
+					<option value="Dungeon130">Dungeon130</option>
+					<option value="Dungeon131">Dungeon131</option>
+					<option value="Dungeon132">Dungeon132</option>
+					<option value="Dungeon133">Dungeon133</option>
+					<option value="Dungeon134">Dungeon134</option>
+					<option value="Dungeon135">Dungeon135</option>
+					<option value="Dungeon136">Dungeon136</option>
+					<option value="Dungeon137">Dungeon137</option>
+					<option value="Dungeon138">Dungeon138</option>
+					<option value="Dungeon139">Dungeon139</option>
+					<option value="Dungeon140">Dungeon140</option>
+					<option value="Dungeon141">Dungeon141</option>
+					<option value="Dungeon142">Dungeon142</option>
+					<option value="Dungeon143">Dungeon143</option>
+					<option value="Dungeon144">Dungeon144</option>
+					<option value="Dungeon145">Dungeon145</option>
+					<option value="Dungeon146">Dungeon146</option>
+					<option value="Dungeon147">Dungeon147</option>
+					<option value="Dungeon148">Dungeon148</option>
+					<option value="Dungeon149">Dungeon149</option>
+					<option value="Dungeon150">Dungeon150</option>
+					<option value="Dungeon151">Dungeon151</option>
+				</select>
+			</div>
+		</div> -->
 	
 
 
 		<!-- MAP PINS -->
 		<h3 class="border-blue" data-translate="Map pins">Map pins</h3>
 		<div class="row mb-10">
-			<div class="four columns"><span data-translate="Map pins">Map pins</span> <span id="span-pin-counter"></span></div>
-			<div class="eight columns text-right">
-				<button onclick="SavegameEditor.clearAllMapPins()" data-translate="Remove all map pins" class="button with-icon icon3">Remove all map pins</button>
+			<div>
+				<div id="map-pins-edit" class="container-counter clickable">
+					<span data-translate="Map pins">Map pins</span><br/>
+					<span id="span-pin-counter"></span>
+				</div>
+			</div>
+			<div>
+				<button onclick="SavegameEditor.clearAllMapPins()" class="btn"><img src="assets/octicons/octicon_pin_slash.svg" loading="lazy" class="octicon" /> <span data-translate="Remove all map pins">Remove all map pins</span></button>
 			</div>
-		</div>
-		<div class="mb-10">
-			<span data-translate="Pin missing collectibles in map">Pin missing collectibles in map</span>
-		</div>
-		<div class="mb-10 text-center">
-			<button onclick="SavegameEditor.addPinsShrines()" data-translate="Shrines">Shrines</button>
-			<button onclick="SavegameEditor.addPinsLightroots()" data-translate="Lightroots">Lightroots</button>
-			<button onclick="SavegameEditor.addPinsKoroksHidden()" data-translate="Koroks">Hidden koroks</button>
-			<button onclick="SavegameEditor.addPinsKoroksCarry()" data-translate="Strayed koroks (&times;2)">Strayed koroks (&times;2)</button>
-			<button onclick="SavegameEditor.addPinsBubbuls()" data-translate="Bubbuls">Bubbuls</button>
-		</div>
-		<div class="mb-10 text-center">
-			<span data-translate="Locations">Locations</span>:
-			<button onclick="SavegameEditor.addPinsLocationsCaves()" data-translate="Caves">Caves</button>
-			<button onclick="SavegameEditor.addPinsLocationsWells()" data-translate="Wells">Wells</button>
-			<span style="color:red">*Experimental, caves/bubbuls coordinates may be wrong</span>
-		</div>
-		<div class="mb-10 text-center">
-			<span data-translate="Bosses">Bosses</span>:
-			<button onclick="SavegameEditor.addPinsBossesHinox()" data-translate="Hinox">Hinox</button>
-			<button onclick="SavegameEditor.addPinsBossesTalus()" data-translate="Talus">Talus</button>
-			<button onclick="SavegameEditor.addPinsBossesMolduga()" data-translate="Molduga">Molduga</button>
-			<button onclick="SavegameEditor.addPinsBossesFlux()" data-translate="Flux Construct">Flux Construct</button>
-			<button onclick="SavegameEditor.addPinsBossesFrox()" data-translate="Frox">Frox</button>
-			<button onclick="SavegameEditor.addPinsBossesGleeok()" data-translate="Gleeok">Gleeok</button>
-		</div>
-		<div class="mb-10 text-center">
-			<span data-translate="Schematics">Schematics</span>:
-			<button onclick="SavegameEditor.addPinsSchematicsStone()" data-translate="Schema stones">Schema stones</button>
-			<button onclick="SavegameEditor.addPinsSchematicsYiga()" data-translate="Yiga schematics">Yiga schematics</button>
 		</div>
 
 		<!-- COMPLETIONISM -->
 		<h3 class="border-red" data-translate="Completionism">Completionism</h3>
-		<div class="row mb-10">
-			<div class="four columns">
-				<span data-translate="Shrines">Shrines</span><br/>
-				<span data-translate="Found">Found</span>: <span id="span-shrines-found-counter"></span><br/>
-				<span data-translate="Cleared">Cleared</span>: <span id="span-shrines-clear-counter"></span>
+		<div class="mb-10 text-center">
+			<span data-translate="Choose completionism mode">Choose completionism mode</span>:
+			<label class="clickable"><input id="input-radio-completionism-map" type="radio" name="completionism" value="map" /> <span data-translate="Pin to map">Pin to map</span></label>
+			<label class="clickable"><input id="input-radio-completionism-unlock" type="radio" name="completionism" value="unlock" /> <span data-translate="Unlock">Unlock</span></label>
+		</div>
+		<div class="mb-10 text-center">
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Shrines">Shrines</strong></div>
+				<div><span data-translate="Found">Found</span>:<br/><span id="span-shrines-found-counter"></span></div>
+				<div><span data-translate="Cleared">Cleared</span>:<br/><span id="span-shrines-clear-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsShrines()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.setShrinesAsFound()" data-translate="Set all as found">Set all as found</button> | 
+						<button onclick="Completism.setShrinesAsClear()" data-translate="Set all as cleared">Set all as cleared</button>
+					</div>
+				</div>
 			</div>
-			<div class="eight columns text-right">
-				<button onclick="Completism.setShrinesAsFound()" data-translate="Set all shrines as found">Set all shrines as found</button>
-				<button onclick="Completism.setShrinesAsClear()" data-translate="Set all shrines as cleared">Set all shrines as cleared</button>
+
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Lightroots">Lightroots</strong></div>
+				<div><span data-translate="Found">Found</span>:<br/><span id="span-lightroots-found-counter"></span></div>
+				<div><span data-translate="Cleared">Cleared</span>:<br/><span id="span-lightroots-clear-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsLightroots()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.setLightrootsAsFound()" data-translate="Set all as found">Set all as found</button> | 
+						<button onclick="Completism.setLightrootsAsClear()" data-translate="Set all as cleared">Set all as cleared</button>
+					</div>
+				</div>
 			</div>
 		</div>
-		<div class="row mb-10">
-			<div class="four columns">
-				<span data-translate="Lightroots">Lightroots</span><br/>
-				<span data-translate="Found">Found</span>: <span id="span-lightroots-found-counter"></span><br/>
-				<span data-translate="Cleared">Cleared</span>: <span id="span-lightroots-clear-counter"></span>
+
+		<div class="mb-10 text-center">
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Koroks">Koroks</strong></div>
+				<div><span id="span-korok-hidden-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsKoroksHidden()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.setKoroksAsFound()" data-translate="Set all as found">Set all as found</button>
+					</div>
+				</div>
 			</div>
-			<div class="eight columns text-right">
-				<button onclick="Completism.setLightrootsAsFound()" data-translate="Set all lightroots as found">Set all lightroots as found</button>
-				<button onclick="Completism.setLightrootsAsClear()" data-translate="Set all lightroots as activated">Set all lightroots as activated</button>
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Strayed koroks">Strayed koroks</strong> <small>(&times;2)</small></div>
+				<div><span id="span-korok-carry-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsKoroksCarry()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.setKoroksAsCarried()" data-translate="Set all as carried">Set all as carried</button>
+					</div>
+				</div>
+			</div>
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Bubbuls">Bubbuls</strong></div>
+				<div><span id="span-bubbuls-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsBubbuls()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.defeatBubbuls()" data-translate="Set all as defeated">Set all as defeated</button>
+					</div>
+				</div>
 			</div>
 		</div>
-		<div class="row mb-10">
-			<div class="four columns">
-				<span data-translate="Koroks">Koroks</span><br/>
-				<span data-translate="Found">Found</span>: <span id="span-korok-hidden-counter"></span><br/>
-				<span data-translate="Carried">Carried</span>: <span id="span-korok-carry-counter"></span> <small>(&times;2)</small>
+
+		<div class="mb-10 text-center">
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Caves">Caves</strong></div>
+				<div><span id="span-location-caves-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsLocationsCaves()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.visitLocationCaves()" data-translate="Set all as visited">Set all as visited</button>
+					</div>
+				</div>
 			</div>
-			<div class="eight columns text-right">
-				<button onclick="Completism.setKoroksAsFound()" data-translate="Set all 800 koroks as found">Set all 800 koroks as found</button>
-				<button onclick="Completism.setKoroksAsCarried()" data-translate="Set all 100 koroks as carried">Set all 100 koroks as carried</button>
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Wells">Wells</strong></div>
+				<div><span id="span-location-wells-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsLocationsWells()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.visitLocationWells()" data-translate="Set all as visited">Set all as visited</button>
+					</div>
+				</div>
 			</div>
 		</div>
-		<div class="row mb-10">
-			<div class="four columns">
-				<span data-translate="Bubbuls">Bubbuls</span><br/>
-				<span data-translate="Defeated">Defeated</span>: <span id="span-bubbuls-counter"></span>
+
+		<div class="mb-10 text-center">
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Hinox">Hinox</strong></div>
+				<div><span id="span-boss-hinox-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsBossesHinox()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.defeatBossesHinox()" data-translate="Set all as defeated">Set all as defeated</button>
+					</div>
+				</div>
 			</div>
-			<div class="eight columns text-right">
-				<button onclick="Completism.defeatBubbuls()" data-translate="Set bubbuls as defeated">Set bubbuls as defeated</button>
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Talus">Talus</strong></div>
+				<div><span id="span-boss-talus-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsBossesTalus()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.defeatBossesTalus()" data-translate="Set all as defeated">Set all as defeated</button>
+					</div>
+				</div>
+			</div>
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Molduga">Molduga</strong></div>
+				<div><span id="span-boss-molduga-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsBossesMolduga()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.defeatBossesMolduga()" data-translate="Set all as defeated">Set all as defeated</button>
+					</div>
+				</div>
 			</div>
 		</div>
-		<div class="row mb-10">
-			<div class="four columns">
-				<span data-translate="Locations">Locations</span><br/>
-				<span data-translate="Caves">Caves</span>: <span id="span-location-caves-counter"></span><br/>
-				<span data-translate="Wells">Wells</span>: <span id="span-location-wells-counter"></span>
+		<div class="mb-10 text-center">
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Flux Construct">Flux Construct</strong></div>
+				<div><span id="span-boss-flux-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsBossesFlux()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.defeatBossesFlux()" data-translate="Set all as defeated">Set all as defeated</button>
+					</div>
+				</div>
 			</div>
-			<div class="eight columns text-right">
-				<span data-translate="Set locations as visited">Set locations as visited</span>:
-				<button onclick="Completism.visitLocationCaves()" data-translate="Caves">Caves</button>
-				<button onclick="Completism.visitLocationWells()" data-translate="Wells">Wells</button>
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Frox">Frox</strong></div>
+				<div><span id="span-boss-frox-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsBossesFrox()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.defeatBossesFrox()" data-translate="Set all as defeated">Set all as defeated</button>
+					</div>
+				</div>
+			</div>
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Gleeok">Gleeok</strong></div>
+				<div><span id="span-boss-gleeok-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsBossesGleeok()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.defeatBossesGleeok()" data-translate="Set all as defeated">Set all as defeated</button>
+					</div>
+				</div>
 			</div>
 		</div>
-		<div class="row mb-10">
-			<div class="four columns">
-				<span data-translate="Bosses">Bosses</span><br/>
-				<span data-translate="Hinox">Hinox</span>: <span id="span-boss-hinox-counter"></span><br/>
-				<span data-translate="Talus">Talus</span>: <span id="span-boss-talus-counter"></span><br/>
-				<span data-translate="Molduga">Molduga</span>: <span id="span-boss-molduga-counter"></span><br/>
-				<span data-translate="Flux Construct">Flux Construct</span>: <span id="span-boss-flux-counter"></span><br/>
-				<span data-translate="Frox">Frox</span>: <span id="span-boss-frox-counter"></span><br/>
-				<span data-translate="Gleeok">Gleeok</span>: <span id="span-boss-gleeok-counter"></span>
+
+		<div class="mb-10 text-center">
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Old maps">Old maps</strong></div>
+				<div><span id="span-old-maps-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsOldMaps()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.setOldMapsAsFound()" data-translate="Set all as found">Set all as found</button>
+					</div>
+				</div>
 			</div>
-			<div class="eight columns text-right">
-				<span data-translate="Set bosses as defeated">Set bosses as defeated</span>:
-				<button onclick="Completism.defeatBossesHinox()" data-translate="Hinox">Hinox</button>
-				<button onclick="Completism.defeatBossesTalus()" data-translate="Talus">Talus</button>
-				<button onclick="Completism.defeatBossesMolduga()" data-translate="Molduga">Molduga</button>
-				<button onclick="Completism.defeatBossesFlux()" data-translate="Flux Construct">Flux Construct</button>
-				<button onclick="Completism.defeatBossesFrox()" data-translate="Frox">Frox</button>
-				<button onclick="Completism.defeatBossesGleeok()" data-translate="Gleeok">Gleeok</button>
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Schema stones">Schema stones</strong></div>
+				<div><span id="span-schematics-stone-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsSchematicsStone()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.setSchematicStonesAsFound()" data-translate="Set all as found">Set all as found</button>
+					</div>
+				</div>
+			</div>
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Yiga schematics">Yiga schematics</strong></div>
+				<div><span id="span-schematics-yiga-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-map">
+						<button onclick="SavegameEditor.addPinsSchematicsYiga()" data-translate="Pin missing to map">Pin missing to map</button>
+					</div>
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.setSchematicYigaAsFound()" data-translate="Set all as found">Set all as found</button>
+					</div>
+				</div>
 			</div>
 		</div>
-		<div class="row mb-10">
-			<div class="four columns">
-				<span data-translate="Schematics">Schematics</span><br/>
-				<span data-translate="Schema stones">Schema stones</span>: <span id="span-schematics-stone-counter"></span><br/>
-				<span data-translate="Yiga schematics">Yiga schematics</span>: <span id="span-schematics-yiga-counter"></span>
-			</div>
-			<div class="eight columns text-right">
-				<span data-translate="Set schematics as found">Set schematics as found</span>:
-				<button onclick="Completism.setSchematicStonesAsFound()" data-translate="Schema stones">Schema stones</button>
-				<button onclick="Completism.setSchematicYigaAsFound()" data-translate="Yiga schematics">Yiga schematics</button>
-			</div>
-		</div>
-		<div class="row mb-10">
-			<div class="four columns">
-				<span data-translate="Hyrule Compendium">Hyrule Compendium</span><br/>
-				<span id="span-compendium-counter"></span>
-			</div>
-			<div class="eight columns text-right">
-				<button onclick="Completism.setCompendiumAsStockCurrentOnly()" data-translate="Set current to stock">Set current to stock</button>
-				<button onclick="Completism.setCompendiumAsBought()" data-translate="Unlock missing">Unlock missing</button>
+
+		<div class="mb-10 text-center">
+			<div class="container-counter">
+				<div class="mb-10"><strong data-translate="Hyrule Compendium">Hyrule Compendium</strong></div>
+				<div><span id="span-compendium-counter"></span></div>
+				<div class="completionism-actions">
+					<div class="completionism-actions-unlock">
+						<button onclick="Completism.setCompendiumAsStockCurrentOnly()" data-translate="Set current to stock">Set current to stock</button> | 
+						<button onclick="Completism.setCompendiumAsBought()" data-translate="Unlock missing">Unlock missing</button>
+					</div>
+				</div>
 			</div>
 		</div>
 
+
 		<!-- AUTOBUILDER -->
 		<h3 class="border-grey" data-translate="Autobuilder">Autobuilder</h3>
 		<div class="row mb-10">
-			<div class="twelve columns">
+			<div>
 				<label><span data-translate="Design">Design</span> <select id="select-autobuilder-index" style="width:auto">
 					<option value="0">01</option>
 					<option value="1">02</option>
@@ -414,29 +719,35 @@
 					<option value="28">29</option>
 					<option value="29">30</option>
 				</select></label>
-				<button id="button-autobuilder-export" data-translate="Export">Export</button>
-				<button id="button-autobuilder-import" data-translate="Import">Import</button>
-				<input id="input-file-autobuilder-import" type="file" accept=".totkab" style="display:none" />
+				<button class="btn" id="button-autobuilder-export"><img src="assets/octicons/octicon_download.svg" loading="lazy" class="octicon" /> <span data-translate="Export">Export</span></button>
+				<button class="btn" id="button-autobuilder-import"><img src="assets/octicons/octicon_upload.svg" loading="lazy" class="octicon" /> <span data-translate="Import">Import</span></button>
+				<input id="input-file-autobuilder-import" type="file" accept=".cai" class="hide" />
 			</div>
 		</div>
 
 		<!-- EXPERIENCE -->
 		<h3 class="border-grey" data-translate="Experience">Experience</h3>
-		<div class="row mb-10">
-			<div class="four columns">
-				<span data-translate="Total experience">Total experience</span>: <span id="span-experience" style="font-weight:bold"></span>
-				<span id="span-experience-edit" class="clickable" data-translate="Manual edit">Manual edit</span>
+		<div class="text-center mb-10">
+			<div id="span-experience-edit" class="container-counter clickable">
+				<span data-translate="Total experience">Total experience</span><br/>
+				<span id="span-experience" style="font-weight:bold"></span>
 			</div>
-			<div class="eight columns text-right">
-				<button id="button-experience-reset" data-translate="Reset">Reset</button>
-				<button id="button-experience-calculate" data-translate="Recalculate">Recalculate</button>
+			<div id="pristine-weapons-edit" class="container-counter clickable">
+				<span data-translate="Unlocked pristine weapons">Unlocked pristine weapons</span><br/>
+				<span id="span-pristine-weapons-counter"></span>
 			</div>
 		</div>
 		<div class="row mb-10">
-			<div class="four columns">
-				<span data-translate="Current enemy tier">Current enemy tier</span>
+			<div style="min-width:144px">
+				<strong data-translate="Current enemy tier">Current enemy tier</strong>
 			</div>
-			<div class="eight columns text-right" id="experience-enemy-tiers"></div>
+			<div id="experience-enemy-tiers"></div>
+		</div>
+		<div class="row mb-10">
+			<div style="min-width:144px">
+				<strong data-translate="Locked pristine weapons">Locked pristine weapons</strong>
+			</div>
+			<div id="experience-pristine-weapons"></div>
 		</div>
 	</div>
 	
@@ -444,8 +755,9 @@
 	<div id="tab-weapons">
 		<h3 data-translate="Weapons">Weapons</h3><div id="container-weapons"></div>
 		<div class="text-center">
-			<button onclick="SavegameEditor.restoreDurability('weapons')" data-translate="Restore durability">Restore durability</button>
-			<button class="with-icon icon1" onclick="SavegameEditor.addItem('weapons')" data-translate="Add weapon">Add weapon</button>
+			<button class="btn" onclick="SavegameEditor.restoreDecayAll()" data-translate="Restore decay">Restore decay</button>
+			<button class="btn" onclick="SavegameEditor.restoreDurabilityAll('weapons')" data-translate="Restore durability">Restore durability</button>
+			<button class="btn" onclick="SavegameEditor.addItem('weapons')"><img src="assets/octicons/octicon_plus_circle.svg" loading="lazy" class="octicon" /> <span data-translate="Add weapon">Add weapon</span></button>
 		</div>
 	</div>
 
@@ -453,12 +765,12 @@
 	<div id="tab-bows">
 		<h3 data-translate="Bows">Bows</h3><div id="container-bows"></div>
 		<div class="text-center">
-			<button onclick="SavegameEditor.restoreDurability('bows')" data-translate="Restore durability">Restore durability</button>
-			<button class="with-icon icon1" onclick="SavegameEditor.addItem('bows')" data-translate="Add bow">Add bow</button>
+			<button class="btn" onclick="SavegameEditor.restoreDurabilityAll('bows')" data-translate="Restore durability">Restore durability</button>
+			<button class="btn" onclick="SavegameEditor.addItem('bows')"><img src="assets/octicons/octicon_plus_circle.svg" loading="lazy" class="octicon" /> <span data-translate="Add bow">Add bow</span></button>
 		</div>
 		<h3 data-translate="Arrows">Arrows</h3><div id="container-arrows"></div>
 		<div class="text-center">
-			<button id="button-add-arrows" class="with-icon icon1" onclick="SavegameEditor.addItem('arrows')" data-translate="Add arrows">Add arrows</button>
+			<button id="button-add-arrows" class="btn" onclick="SavegameEditor.addItem('arrows')"><img src="assets/octicons/octicon_plus_circle.svg" loading="lazy" class="octicon" /> <span data-translate="Add arrows">Add arrows</span></button>
 		</div>
 	</div>
 
@@ -466,8 +778,8 @@
 	<div id="tab-shields">
 		<h3 data-translate="Shields">Shields</h3><div id="container-shields"></div>
 		<div class="text-center">
-			<button onclick="SavegameEditor.restoreDurability('shields')" data-translate="Restore durability">Restore durability</button>
-			<button class="with-icon icon1" onclick="SavegameEditor.addItem('shields')" data-translate="Add shield">Add shield</button>
+			<button class="btn" onclick="SavegameEditor.restoreDurabilityAll('shields')" data-translate="Restore durability">Restore durability</button>
+			<button class="btn" onclick="SavegameEditor.addItem('shields')"><img src="assets/octicons/octicon_plus_circle.svg" loading="lazy" class="octicon" /> <span data-translate="Add shield">Add shield</span></button>
 		</div>
 	</div>
 
@@ -475,7 +787,8 @@
 	<div id="tab-armors">
 		<h3 data-translate="Armors">Armors</h3><div id="container-armors"></div>
 		<div class="text-center">
-			<button class="with-icon icon1" onclick="SavegameEditor.addItem('armors')" data-translate="Add armor">Add armor</button>
+			<button class="btn" onclick="SavegameEditor.upgradeArmorAll()"><span data-translate="Upgrade all">Upgrade all</span></button>
+			<button class="btn" onclick="SavegameEditor.addItem('armors')"><img src="assets/octicons/octicon_plus_circle.svg" loading="lazy" class="octicon" /> <span data-translate="Add armor">Add armor</span></button>
 		</div>
 	</div>
 
@@ -483,7 +796,7 @@
 	<div id="tab-materials">
 		<h3 data-translate="Materials">Materials</h3><div id="container-materials"></div>
 		<div class="text-center">
-			<button class="with-icon icon1" onclick="SavegameEditor.addItem('materials')" data-translate="Add material">Add material</button>
+			<button class="btn" onclick="SavegameEditor.addItem('materials')"><img src="assets/octicons/octicon_plus_circle.svg" loading="lazy" class="octicon" /> <span data-translate="Add material">Add material</span></button>
 		</div>
 	</div>
 
@@ -491,7 +804,7 @@
 	<div id="tab-food">
 		<h3 data-translate="Food">Food</h3><div id="container-food"></div>
 		<div class="text-center">
-			<button class="with-icon icon1" onclick="SavegameEditor.addItem('food')" data-translate="Add food">Add food</button>
+			<button class="btn" onclick="SavegameEditor.addItem('food')"><img src="assets/octicons/octicon_plus_circle.svg" loading="lazy" class="octicon" /> <span data-translate="Add food">Add food</span></button>
 		</div>
 	</div>
 
@@ -499,7 +812,7 @@
 	<div id="tab-devices">
 		<h3 data-translate="Zonai devices">Zonai devices</h3><div id="container-devices"></div>
 		<div class="text-center">
-			<button class="with-icon icon1" onclick="SavegameEditor.addItem('devices')" data-translate="Add zonai device">Add zonai device</button>
+			<button class="btn" onclick="SavegameEditor.addItem('devices')"><img src="assets/octicons/octicon_plus_circle.svg" loading="lazy" class="octicon" /> <span data-translate="Add zonai device">Add zonai device</span></button>
 		</div>
 	</div>
 
@@ -507,7 +820,7 @@
 	<div id="tab-key">
 		<h3 data-translate="Key items">Key items</h3><div id="container-key"></div>
 		<div class="text-center">
-			<button class="with-icon icon1" onclick="SavegameEditor.addItem('key')" data-translate="Add key item">Add key item</button>
+			<button class="btn" onclick="SavegameEditor.addItem('key')"><img src="assets/octicons/octicon_plus_circle.svg" loading="lazy" class="octicon" /> <span data-translate="Add key item">Add key item</span></button>
 		</div>
 	</div>
 
@@ -515,15 +828,15 @@
 	<div id="tab-horses">
 		<h3 data-translate="Horses" class="border-blue">Horses</h3>
 		<div id="container-horses"></div>
-		<!-- <div class="row"><div class="twelve columns">Untammed horse</div></div>
+		<!-- <div class="row"><div>Untammed horse</div></div>
 		<div class="row" id="row-horse10">
 			<div class="three columns end"><select id="select-horse10-type"></select></div>
 		</div>
 		<div class="row">
 			<div class="six columns"><label for="float-pos-x-horse">Current horse coordinates (XYZ)</label></div>
-			<div class="two columns"><input id="float-pos-x-horse" class="full-width" type="text" /></div>
-			<div class="two columns"><input id="float-pos-y-horse" class="full-width" type="text" /></div>
-			<div class="two columns"><input id="float-pos-z-horse" class="full-width" type="text" /></div>
+			<div class="col-right"><input id="float-pos-x-horse" class="full-width" type="text" /></div>
+			<div class="col-right"><input id="float-pos-y-horse" class="full-width" type="text" /></div>
+			<div class="col-right"><input id="float-pos-z-horse" class="full-width" type="text" /></div>
 		</div> -->
 	</div>
 
@@ -531,7 +844,7 @@
 	<div id="tab-master">
 		<h3 data-translate="Master editor">Master editor</h3>
 		<div id="master-editor-loading" class="text-center">Master editor is loading...</div>
-		<div id="master-editor-hidden" class="hidden">
+		<div id="master-editor-hidden" class="hide">
 			<div class="mb-10">
 				<label><span data-translate="Search">Search</span> <input id="input-custom-filter" type="text" list="knownHashes" placeholder="Search variables" style="width:400px" /></label>
 				<datalist id="knownHashes">
@@ -561,44 +874,61 @@
 			</div>
 		</div>
 	</div>
-
-	<!-- TAB: SETTINGS -->
-	<div id="tab-settings">
-		<h3 class="border-orange" data-translate="Settings">Settings</h3>
-		<div id="box-settings">
-			<div>
-				<label for="select-language">Item language</label>
-				<select id="select-language">
-					<option value="en">English</option>
-					<option value="fr">Français</option>
-					<option value="fr_alt">Français (Canada)</option>
-					<option value="de">Deutsch</option>
-					<option value="it">Italiano</option>
-					<option value="es">Español</option>
-					<option value="es_alt">Español latino</option>
-					<option value="nl">Dutch</option>
-					<option value="ru">Russian</option>
-					<option value="ja">Japanese</option>
-					<option value="ko">Korean</option>
-					<option value="zh">Chinese (simplified)</option>
-					<option value="zh_alt">Chinese (traditional)</option>
-				</select>
-			</div>
-			<div id="warning-language">*Requires the app to be <strong>restarted</strong> for changes take effect</div>
-			<div>
-				<label><input type="checkbox" id="checkbox-warning-delete" checked> Warn when deleting item</select>
-			</div>
-		</div>
-		<h3 class="border-blue">Troubleshooting</h3>
-
-		<p>Please read and check the <a href="https://github.com/marcrobledo/savegame-editors/wiki/TOTK-known-issues-&-FAQ" target="_blank">list of known issues</a> if you are having problems when loading/saving your edited savegame.</p>
-		<p><strong>Always remember to make backups of your savegames before editing. Use this savegame editor at your own risk. By using it, you are responsible of any data lost.</strong></p>		
-	</div>
 </div>
 
 <div id="dialog-caption" class="dialog text-center"></div>
 
 
-<div id="toast-loading" style="display:none"></div>
+<div id="toasts-container"></div>
+
+
+
+<ul id="dropdown-item" class="dropdown-menu">
+	<li><button id="dropdown-item-button-pristine" class="dropdown-item" type="button"><img src="assets/octicons/octicon_sparkle_fill.svg" loading="lazy" class="octicon invert" /> <span data-translate="Restore decay">Restore decay</span></button></li>
+	<li><button id="dropdown-item-button-durability" class="dropdown-item" type="button"><img src="assets/octicons/octicon_tools.svg" loading="lazy" class="octicon invert" /> <span data-translate="Restore durability">Restore durability</span></button></li>
+	<li><button id="dropdown-item-button-infinite" class="dropdown-item" type="button"><img src="assets/octicons/octicon_infinity.svg" loading="lazy" class="octicon invert" /> <span data-translate="Infinite durability">Infinite durability</span></button></li>
+	<li><button id="dropdown-item-button-upgrade" class="dropdown-item" type="button"><img src="assets/octicons/octicon_star_fill.svg" loading="lazy" class="octicon invert" /> <span data-translate="Upgrade">Upgrade</span></button></li>
+	<li><button id="dropdown-item-button-duplicate" class="dropdown-item" type="button"><img src="assets/octicons/octicon_copy.svg" loading="lazy" class="octicon invert" /> <span data-translate="Duplicate">Duplicate</span></button></li>
+	<li><button id="dropdown-item-button-export" class="dropdown-item" type="button"><img src="assets/octicons/octicon_download.svg" loading="lazy" class="octicon invert" /> <span data-translate="Export">Export</span></button></li>
+	<li><button id="dropdown-item-button-import" class="dropdown-item" type="button"><img src="assets/octicons/octicon_upload.svg" loading="lazy" class="octicon invert" /> <span data-translate="Import">Import</span></button></li>
+	<li><hr class="dropdown-divider"/></li>
+	<li><button id="dropdown-item-button-delete" class="dropdown-item btn-danger" type="button"><img src="assets/octicons/octicon_trash.svg" loading="lazy" class="octicon" /> <span data-translate="Delete">Delete</span></button></li>
+</ul>
+
+
+<input id="input-file-pouch-import" type="file" accept=".json" class="hide" />
+
+<dialog id="modal-hash-editor" class="modal">
+	<div id="modal-hash-editor-header" class="modal-header"></div>
+	<div id="modal-hash-editor-body" class="modal-body"></div>
+	<div id="modal-hash-editor-footer" class="modal-footer row">
+		<div id="modal-hash-editor-footer-left">
+			<button id="button-hash-editor-export" class="btn btn-sm" title="Export" data-translate-title="Export"><img src="assets/octicons/octicon_download.svg" loading="lazy" class="octicon" /></button>
+			<button id="button-hash-editor-import" class="btn btn-sm" title="Import" data-translate-title="Import"><img src="assets/octicons/octicon_upload.svg" loading="lazy" class="octicon" /></button>
+		</div>
+		<div id="modal-hash-editor-footer-right">
+		</div>
+	</div>
+	<input id="input-file-hash-editor-import" type="file" accept=".json" class="hide" />
+</dialog>
+
+
+
+<dialog id="modal-delete-item" class="modal">
+	<div class="modal-body">
+		<div class="text-center mb-10" id="modal-delete-item-text"></div>
+		<div class="text-center mb-10">
+			<label><input id="checkbox-delete-item-warning" type="checkbox" checked /> <span data-translate="Show this warning next time">Show this warning next time</span></label>
+		</div>
+	</div>
+	<div class="modal-footer">
+		<div class="text-center">
+			<button class="btn btn-sm" data-dismiss="modal" data-translate="Cancel">Cancel</button>
+			<button class="btn btn-sm btn-danger" data-dismiss="modal" id="btn-delete-item-confirm"><img src="assets/octicons/octicon_trash.svg" loading="lazy" class="octicon" /> <span data-translate="Delete">Delete</span></button>
+		</div>
+	</div>
+</dialog>
+
+
 </body>
 </html>
diff --git a/zelda-totk/lib/cash.min.js b/zelda-totk/lib/cash.min.js
new file mode 100644
index 0000000..ad056fb
--- /dev/null
+++ b/zelda-totk/lib/cash.min.js
@@ -0,0 +1,30 @@
+/*
+cash.js v8.1.5
+https://github.com/fabiospampinato/cash
+
+---
+
+The MIT License (MIT)
+
+Copyright (c) 2014-2020 Ken Wheeler, 2020-present Fabio Spampinato
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*/
+(function(){"use strict";var C=document,D=window,st=C.documentElement,L=C.createElement.bind(C),ft=L("div"),q=L("table"),Mt=L("tbody"),ot=L("tr"),H=Array.isArray,S=Array.prototype,Dt=S.concat,U=S.filter,at=S.indexOf,ct=S.map,Bt=S.push,ht=S.slice,z=S.some,_t=S.splice,Pt=/^#(?:[\w-]|\\.|[^\x00-\xa0])*$/,Ht=/^\.(?:[\w-]|\\.|[^\x00-\xa0])*$/,$t=/<.+>/,jt=/^\w+$/;function J(t,n){var r=It(n);return!t||!r&&!A(n)&&!c(n)?[]:!r&&Ht.test(t)?n.getElementsByClassName(t.slice(1).replace(/\\/g,"")):!r&&jt.test(t)?n.getElementsByTagName(t):n.querySelectorAll(t)}var dt=function(){function t(n,r){if(n){if(Y(n))return n;var i=n;if(g(n)){var e=r||C;if(i=Pt.test(n)&&A(e)?e.getElementById(n.slice(1).replace(/\\/g,"")):$t.test(n)?yt(n):Y(e)?e.find(n):g(e)?o(e).find(n):J(n,e),!i)return}else if(O(n))return this.ready(n);(i.nodeType||i===D)&&(i=[i]),this.length=i.length;for(var s=0,f=this.length;s<f;s++)this[s]=i[s]}}return t.prototype.init=function(n,r){return new t(n,r)},t}(),u=dt.prototype,o=u.init;o.fn=o.prototype=u,u.length=0,u.splice=_t,typeof Symbol=="function"&&(u[Symbol.iterator]=S[Symbol.iterator]);function Y(t){return t instanceof dt}function B(t){return!!t&&t===t.window}function A(t){return!!t&&t.nodeType===9}function It(t){return!!t&&t.nodeType===11}function c(t){return!!t&&t.nodeType===1}function Ft(t){return!!t&&t.nodeType===3}function Wt(t){return typeof t=="boolean"}function O(t){return typeof t=="function"}function g(t){return typeof t=="string"}function v(t){return t===void 0}function P(t){return t===null}function lt(t){return!isNaN(parseFloat(t))&&isFinite(t)}function G(t){if(typeof t!="object"||t===null)return!1;var n=Object.getPrototypeOf(t);return n===null||n===Object.prototype}o.isWindow=B,o.isFunction=O,o.isArray=H,o.isNumeric=lt,o.isPlainObject=G;function d(t,n,r){if(r){for(var i=t.length;i--;)if(n.call(t[i],i,t[i])===!1)return t}else if(G(t))for(var e=Object.keys(t),i=0,s=e.length;i<s;i++){var f=e[i];if(n.call(t[f],f,t[f])===!1)return t}else for(var i=0,s=t.length;i<s;i++)if(n.call(t[i],i,t[i])===!1)return t;return t}o.each=d,u.each=function(t){return d(this,t)},u.empty=function(){return this.each(function(t,n){for(;n.firstChild;)n.removeChild(n.firstChild)})};function $(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];var r=Wt(t[0])?t.shift():!1,i=t.shift(),e=t.length;if(!i)return{};if(!e)return $(r,o,i);for(var s=0;s<e;s++){var f=t[s];for(var a in f)r&&(H(f[a])||G(f[a]))?((!i[a]||i[a].constructor!==f[a].constructor)&&(i[a]=new f[a].constructor),$(r,i[a],f[a])):i[a]=f[a]}return i}o.extend=$,u.extend=function(t){return $(u,t)};var qt=/\S+/g;function j(t){return g(t)?t.match(qt)||[]:[]}u.toggleClass=function(t,n){var r=j(t),i=!v(n);return this.each(function(e,s){c(s)&&d(r,function(f,a){i?n?s.classList.add(a):s.classList.remove(a):s.classList.toggle(a)})})},u.addClass=function(t){return this.toggleClass(t,!0)},u.removeAttr=function(t){var n=j(t);return this.each(function(r,i){c(i)&&d(n,function(e,s){i.removeAttribute(s)})})};function Ut(t,n){if(t){if(g(t)){if(arguments.length<2){if(!this[0]||!c(this[0]))return;var r=this[0].getAttribute(t);return P(r)?void 0:r}return v(n)?this:P(n)?this.removeAttr(t):this.each(function(e,s){c(s)&&s.setAttribute(t,n)})}for(var i in t)this.attr(i,t[i]);return this}}u.attr=Ut,u.removeClass=function(t){return arguments.length?this.toggleClass(t,!1):this.attr("class","")},u.hasClass=function(t){return!!t&&z.call(this,function(n){return c(n)&&n.classList.contains(t)})},u.get=function(t){return v(t)?ht.call(this):(t=Number(t),this[t<0?t+this.length:t])},u.eq=function(t){return o(this.get(t))},u.first=function(){return this.eq(0)},u.last=function(){return this.eq(-1)};function zt(t){return v(t)?this.get().map(function(n){return c(n)||Ft(n)?n.textContent:""}).join(""):this.each(function(n,r){c(r)&&(r.textContent=t)})}u.text=zt;function T(t,n,r){if(c(t)){var i=D.getComputedStyle(t,null);return r?i.getPropertyValue(n)||void 0:i[n]||t.style[n]}}function E(t,n){return parseInt(T(t,n),10)||0}function gt(t,n){return E(t,"border".concat(n?"Left":"Top","Width"))+E(t,"padding".concat(n?"Left":"Top"))+E(t,"padding".concat(n?"Right":"Bottom"))+E(t,"border".concat(n?"Right":"Bottom","Width"))}var X={};function Jt(t){if(X[t])return X[t];var n=L(t);C.body.insertBefore(n,null);var r=T(n,"display");return C.body.removeChild(n),X[t]=r!=="none"?r:"block"}function vt(t){return T(t,"display")==="none"}function pt(t,n){var r=t&&(t.matches||t.webkitMatchesSelector||t.msMatchesSelector);return!!r&&!!n&&r.call(t,n)}function I(t){return g(t)?function(n,r){return pt(r,t)}:O(t)?t:Y(t)?function(n,r){return t.is(r)}:t?function(n,r){return r===t}:function(){return!1}}u.filter=function(t){var n=I(t);return o(U.call(this,function(r,i){return n.call(r,i,r)}))};function x(t,n){return n?t.filter(n):t}u.detach=function(t){return x(this,t).each(function(n,r){r.parentNode&&r.parentNode.removeChild(r)}),this};var Yt=/^\s*<(\w+)[^>]*>/,Gt=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,mt={"*":ft,tr:Mt,td:ot,th:ot,thead:q,tbody:q,tfoot:q};function yt(t){if(!g(t))return[];if(Gt.test(t))return[L(RegExp.$1)];var n=Yt.test(t)&&RegExp.$1,r=mt[n]||mt["*"];return r.innerHTML=t,o(r.childNodes).detach().get()}o.parseHTML=yt,u.has=function(t){var n=g(t)?function(r,i){return J(t,i).length}:function(r,i){return i.contains(t)};return this.filter(n)},u.not=function(t){var n=I(t);return this.filter(function(r,i){return(!g(t)||c(i))&&!n.call(i,r,i)})};function R(t,n,r,i){for(var e=[],s=O(n),f=i&&I(i),a=0,y=t.length;a<y;a++)if(s){var h=n(t[a]);h.length&&Bt.apply(e,h)}else for(var p=t[a][n];p!=null&&!(i&&f(-1,p));)e.push(p),p=r?p[n]:null;return e}function bt(t){return t.multiple&&t.options?R(U.call(t.options,function(n){return n.selected&&!n.disabled&&!n.parentNode.disabled}),"value"):t.value||""}function Xt(t){return arguments.length?this.each(function(n,r){var i=r.multiple&&r.options;if(i||Ot.test(r.type)){var e=H(t)?ct.call(t,String):P(t)?[]:[String(t)];i?d(r.options,function(s,f){f.selected=e.indexOf(f.value)>=0},!0):r.checked=e.indexOf(r.value)>=0}else r.value=v(t)||P(t)?"":t}):this[0]&&bt(this[0])}u.val=Xt,u.is=function(t){var n=I(t);return z.call(this,function(r,i){return n.call(r,i,r)})},o.guid=1;function w(t){return t.length>1?U.call(t,function(n,r,i){return at.call(i,n)===r}):t}o.unique=w,u.add=function(t,n){return o(w(this.get().concat(o(t,n).get())))},u.children=function(t){return x(o(w(R(this,function(n){return n.children}))),t)},u.parent=function(t){return x(o(w(R(this,"parentNode"))),t)},u.index=function(t){var n=t?o(t)[0]:this[0],r=t?this:o(n).parent().children();return at.call(r,n)},u.closest=function(t){var n=this.filter(t);if(n.length)return n;var r=this.parent();return r.length?r.closest(t):n},u.siblings=function(t){return x(o(w(R(this,function(n){return o(n).parent().children().not(n)}))),t)},u.find=function(t){return o(w(R(this,function(n){return J(t,n)})))};var Kt=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,Qt=/^$|^module$|\/(java|ecma)script/i,Vt=["type","src","nonce","noModule"];function Zt(t,n){var r=o(t);r.filter("script").add(r.find("script")).each(function(i,e){if(Qt.test(e.type)&&st.contains(e)){var s=L("script");s.text=e.textContent.replace(Kt,""),d(Vt,function(f,a){e[a]&&(s[a]=e[a])}),n.head.insertBefore(s,null),n.head.removeChild(s)}})}function kt(t,n,r,i,e){i?t.insertBefore(n,r?t.firstChild:null):t.nodeName==="HTML"?t.parentNode.replaceChild(n,t):t.parentNode.insertBefore(n,r?t:t.nextSibling),e&&Zt(n,t.ownerDocument)}function N(t,n,r,i,e,s,f,a){return d(t,function(y,h){d(o(h),function(p,M){d(o(n),function(b,W){var rt=r?M:W,it=r?W:M,m=r?p:b;kt(rt,m?it.cloneNode(!0):it,i,e,!m)},a)},f)},s),n}u.after=function(){return N(arguments,this,!1,!1,!1,!0,!0)},u.append=function(){return N(arguments,this,!1,!1,!0)};function tn(t){if(!arguments.length)return this[0]&&this[0].innerHTML;if(v(t))return this;var n=/<script[\s>]/.test(t);return this.each(function(r,i){c(i)&&(n?o(i).empty().append(t):i.innerHTML=t)})}u.html=tn,u.appendTo=function(t){return N(arguments,this,!0,!1,!0)},u.wrapInner=function(t){return this.each(function(n,r){var i=o(r),e=i.contents();e.length?e.wrapAll(t):i.append(t)})},u.before=function(){return N(arguments,this,!1,!0)},u.wrapAll=function(t){for(var n=o(t),r=n[0];r.children.length;)r=r.firstElementChild;return this.first().before(n),this.appendTo(r)},u.wrap=function(t){return this.each(function(n,r){var i=o(t)[0];o(r).wrapAll(n?i.cloneNode(!0):i)})},u.insertAfter=function(t){return N(arguments,this,!0,!1,!1,!1,!1,!0)},u.insertBefore=function(t){return N(arguments,this,!0,!0)},u.prepend=function(){return N(arguments,this,!1,!0,!0,!0,!0)},u.prependTo=function(t){return N(arguments,this,!0,!0,!0,!1,!1,!0)},u.contents=function(){return o(w(R(this,function(t){return t.tagName==="IFRAME"?[t.contentDocument]:t.tagName==="TEMPLATE"?t.content.childNodes:t.childNodes})))},u.next=function(t,n,r){return x(o(w(R(this,"nextElementSibling",n,r))),t)},u.nextAll=function(t){return this.next(t,!0)},u.nextUntil=function(t,n){return this.next(n,!0,t)},u.parents=function(t,n){return x(o(w(R(this,"parentElement",!0,n))),t)},u.parentsUntil=function(t,n){return this.parents(n,t)},u.prev=function(t,n,r){return x(o(w(R(this,"previousElementSibling",n,r))),t)},u.prevAll=function(t){return this.prev(t,!0)},u.prevUntil=function(t,n){return this.prev(n,!0,t)},u.map=function(t){return o(Dt.apply([],ct.call(this,function(n,r){return t.call(n,r,n)})))},u.clone=function(){return this.map(function(t,n){return n.cloneNode(!0)})},u.offsetParent=function(){return this.map(function(t,n){for(var r=n.offsetParent;r&&T(r,"position")==="static";)r=r.offsetParent;return r||st})},u.slice=function(t,n){return o(ht.call(this,t,n))};var nn=/-([a-z])/g;function K(t){return t.replace(nn,function(n,r){return r.toUpperCase()})}u.ready=function(t){var n=function(){return setTimeout(t,0,o)};return C.readyState!=="loading"?n():C.addEventListener("DOMContentLoaded",n),this},u.unwrap=function(){return this.parent().each(function(t,n){if(n.tagName!=="BODY"){var r=o(n);r.replaceWith(r.children())}}),this},u.offset=function(){var t=this[0];if(t){var n=t.getBoundingClientRect();return{top:n.top+D.pageYOffset,left:n.left+D.pageXOffset}}},u.position=function(){var t=this[0];if(t){var n=T(t,"position")==="fixed",r=n?t.getBoundingClientRect():this.offset();if(!n){for(var i=t.ownerDocument,e=t.offsetParent||i.documentElement;(e===i.body||e===i.documentElement)&&T(e,"position")==="static";)e=e.parentNode;if(e!==t&&c(e)){var s=o(e).offset();r.top-=s.top+E(e,"borderTopWidth"),r.left-=s.left+E(e,"borderLeftWidth")}}return{top:r.top-E(t,"marginTop"),left:r.left-E(t,"marginLeft")}}};var Et={class:"className",contenteditable:"contentEditable",for:"htmlFor",readonly:"readOnly",maxlength:"maxLength",tabindex:"tabIndex",colspan:"colSpan",rowspan:"rowSpan",usemap:"useMap"};u.prop=function(t,n){if(t){if(g(t))return t=Et[t]||t,arguments.length<2?this[0]&&this[0][t]:this.each(function(i,e){e[t]=n});for(var r in t)this.prop(r,t[r]);return this}},u.removeProp=function(t){return this.each(function(n,r){delete r[Et[t]||t]})};var rn=/^--/;function Q(t){return rn.test(t)}var V={},en=ft.style,un=["webkit","moz","ms"];function sn(t,n){if(n===void 0&&(n=Q(t)),n)return t;if(!V[t]){var r=K(t),i="".concat(r[0].toUpperCase()).concat(r.slice(1)),e="".concat(r," ").concat(un.join("".concat(i," "))).concat(i).split(" ");d(e,function(s,f){if(f in en)return V[t]=f,!1})}return V[t]}var fn={animationIterationCount:!0,columnCount:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0};function wt(t,n,r){return r===void 0&&(r=Q(t)),!r&&!fn[t]&&lt(n)?"".concat(n,"px"):n}function on(t,n){if(g(t)){var r=Q(t);return t=sn(t,r),arguments.length<2?this[0]&&T(this[0],t,r):t?(n=wt(t,n,r),this.each(function(e,s){c(s)&&(r?s.style.setProperty(t,n):s.style[t]=n)})):this}for(var i in t)this.css(i,t[i]);return this}u.css=on;function Ct(t,n){try{return t(n)}catch{return n}}var an=/^\s+|\s+$/;function St(t,n){var r=t.dataset[n]||t.dataset[K(n)];return an.test(r)?r:Ct(JSON.parse,r)}function cn(t,n,r){r=Ct(JSON.stringify,r),t.dataset[K(n)]=r}function hn(t,n){if(!t){if(!this[0])return;var r={};for(var i in this[0].dataset)r[i]=St(this[0],i);return r}if(g(t))return arguments.length<2?this[0]&&St(this[0],t):v(n)?this:this.each(function(e,s){cn(s,t,n)});for(var i in t)this.data(i,t[i]);return this}u.data=hn;function Tt(t,n){var r=t.documentElement;return Math.max(t.body["scroll".concat(n)],r["scroll".concat(n)],t.body["offset".concat(n)],r["offset".concat(n)],r["client".concat(n)])}d([!0,!1],function(t,n){d(["Width","Height"],function(r,i){var e="".concat(n?"outer":"inner").concat(i);u[e]=function(s){if(this[0])return B(this[0])?n?this[0]["inner".concat(i)]:this[0].document.documentElement["client".concat(i)]:A(this[0])?Tt(this[0],i):this[0]["".concat(n?"offset":"client").concat(i)]+(s&&n?E(this[0],"margin".concat(r?"Top":"Left"))+E(this[0],"margin".concat(r?"Bottom":"Right")):0)}})}),d(["Width","Height"],function(t,n){var r=n.toLowerCase();u[r]=function(i){if(!this[0])return v(i)?void 0:this;if(!arguments.length)return B(this[0])?this[0].document.documentElement["client".concat(n)]:A(this[0])?Tt(this[0],n):this[0].getBoundingClientRect()[r]-gt(this[0],!t);var e=parseInt(i,10);return this.each(function(s,f){if(c(f)){var a=T(f,"boxSizing");f.style[r]=wt(r,e+(a==="border-box"?gt(f,!t):0))}})}});var Rt="___cd";u.toggle=function(t){return this.each(function(n,r){if(c(r)){var i=vt(r),e=v(t)?i:t;e?(r.style.display=r[Rt]||"",vt(r)&&(r.style.display=Jt(r.tagName))):i||(r[Rt]=T(r,"display"),r.style.display="none")}})},u.hide=function(){return this.toggle(!1)},u.show=function(){return this.toggle(!0)};var xt="___ce",Z=".",k={focus:"focusin",blur:"focusout"},Nt={mouseenter:"mouseover",mouseleave:"mouseout"},dn=/^(mouse|pointer|contextmenu|drag|drop|click|dblclick)/i;function tt(t){return Nt[t]||k[t]||t}function nt(t){var n=t.split(Z);return[n[0],n.slice(1).sort()]}u.trigger=function(t,n){if(g(t)){var r=nt(t),i=r[0],e=r[1],s=tt(i);if(!s)return this;var f=dn.test(s)?"MouseEvents":"HTMLEvents";t=C.createEvent(f),t.initEvent(s,!0,!0),t.namespace=e.join(Z),t.___ot=i}t.___td=n;var a=t.___ot in k;return this.each(function(y,h){a&&O(h[t.___ot])&&(h["___i".concat(t.type)]=!0,h[t.___ot](),h["___i".concat(t.type)]=!1),h.dispatchEvent(t)})};function Lt(t){return t[xt]=t[xt]||{}}function ln(t,n,r,i,e){var s=Lt(t);s[n]=s[n]||[],s[n].push([r,i,e]),t.addEventListener(n,e)}function At(t,n){return!n||!z.call(n,function(r){return t.indexOf(r)<0})}function F(t,n,r,i,e){var s=Lt(t);if(n)s[n]&&(s[n]=s[n].filter(function(f){var a=f[0],y=f[1],h=f[2];if(e&&h.guid!==e.guid||!At(a,r)||i&&i!==y)return!0;t.removeEventListener(n,h)}));else for(n in s)F(t,n,r,i,e)}u.off=function(t,n,r){var i=this;if(v(t))this.each(function(s,f){!c(f)&&!A(f)&&!B(f)||F(f)});else if(g(t))O(n)&&(r=n,n=""),d(j(t),function(s,f){var a=nt(f),y=a[0],h=a[1],p=tt(y);i.each(function(M,b){!c(b)&&!A(b)&&!B(b)||F(b,p,h,n,r)})});else for(var e in t)this.off(e,t[e]);return this},u.remove=function(t){return x(this,t).detach().off(),this},u.replaceWith=function(t){return this.before(t).remove()},u.replaceAll=function(t){return o(t).replaceWith(this),this};function gn(t,n,r,i,e){var s=this;if(!g(t)){for(var f in t)this.on(f,n,r,t[f],e);return this}return g(n)||(v(n)||P(n)?n="":v(r)?(r=n,n=""):(i=r,r=n,n="")),O(i)||(i=r,r=void 0),i?(d(j(t),function(a,y){var h=nt(y),p=h[0],M=h[1],b=tt(p),W=p in Nt,rt=p in k;b&&s.each(function(it,m){if(!(!c(m)&&!A(m)&&!B(m))){var et=function(l){if(l.target["___i".concat(l.type)])return l.stopImmediatePropagation();if(!(l.namespace&&!At(M,l.namespace.split(Z)))&&!(!n&&(rt&&(l.target!==m||l.___ot===b)||W&&l.relatedTarget&&m.contains(l.relatedTarget)))){var ut=m;if(n){for(var _=l.target;!pt(_,n);)if(_===m||(_=_.parentNode,!_))return;ut=_}Object.defineProperty(l,"currentTarget",{configurable:!0,get:function(){return ut}}),Object.defineProperty(l,"delegateTarget",{configurable:!0,get:function(){return m}}),Object.defineProperty(l,"data",{configurable:!0,get:function(){return r}});var bn=i.call(ut,l,l.___td);e&&F(m,b,M,n,et),bn===!1&&(l.preventDefault(),l.stopPropagation())}};et.guid=i.guid=i.guid||o.guid++,ln(m,b,M,n,et)}})}),this):this}u.on=gn;function vn(t,n,r,i){return this.on(t,n,r,i,!0)}u.one=vn;var pn=/\r?\n/g;function mn(t,n){return"&".concat(encodeURIComponent(t),"=").concat(encodeURIComponent(n.replace(pn,`\r
+`)))}var yn=/file|reset|submit|button|image/i,Ot=/radio|checkbox/i;u.serialize=function(){var t="";return this.each(function(n,r){d(r.elements||[r],function(i,e){if(!(e.disabled||!e.name||e.tagName==="FIELDSET"||yn.test(e.type)||Ot.test(e.type)&&!e.checked)){var s=bt(e);if(!v(s)){var f=H(s)?s:[s];d(f,function(a,y){t+=mn(e.name,y)})}}})}),t.slice(1)},typeof exports<"u"?module.exports=o:D.cash=D.$=o})();
diff --git a/zelda-totk/murmurhash3js.min.js b/zelda-totk/lib/murmurhash3js.min.js
similarity index 100%
rename from zelda-totk/murmurhash3js.min.js
rename to zelda-totk/lib/murmurhash3js.min.js
diff --git a/zelda-totk/locale/zelda-totk.locale.en.js b/zelda-totk/locale/zelda-totk.locale.en.js
index 505b66c..67f4e01 100644
--- a/zelda-totk/locale/zelda-totk.locale.en.js
+++ b/zelda-totk/locale/zelda-totk.locale.en.js
@@ -23,7 +23,7 @@ Weapon_Sword_059:'Sea-Breeze Boomerang',
 Weapon_Sword_070:'Master Sword',
 Weapon_Sword_101:'Zonaite Sword',
 Weapon_Sword_103:'Wooden Stick',
-Weapon_Sword_105:'Boomerang',
+Weapon_Sword_105:'Boomerang (decayed)',
 Weapon_Sword_106:'Traveler\'s Sword (decayed)',
 Weapon_Sword_107:'Lizal Boomerang',
 Weapon_Sword_108:'Sturdy Wooden Stick',
@@ -1407,12 +1407,14 @@ GameRomHorseReins_02:'Royal Reins',
 GameRomHorseReins_03:'Knight\'s Bridle',
 GameRomHorseReins_04:'Monster Bridle',
 GameRomHorseReins_05:'Extravagant Bridle',
+GameRomHorseReins_06:'Epona Bridle',
 GameRomHorseSaddle_00:'Stable Saddle',
 GameRomHorseSaddle_01:'Traveler\'s Saddle',
 GameRomHorseSaddle_02:'Royal Saddle',
 GameRomHorseSaddle_03:'Knight\'s Saddle',
 GameRomHorseSaddle_04:'Monster Saddle',
 GameRomHorseSaddle_05:'Extravagant Saddle',
+GameRomHorseSaddle_06:'Epona Saddle',
 GameRomHorseSaddle_07:'Towing Harness',
 
 Obj_Camera:'Camera',
diff --git a/zelda-totk/zelda-totk.class.armor.js b/zelda-totk/zelda-totk.class.armor.js
index 477f6ed..44d7a2f 100644
--- a/zelda-totk/zelda-totk.class.armor.js
+++ b/zelda-totk/zelda-totk.class.armor.js
@@ -1,106 +1,80 @@
 /*
-	The legend of Zelda: Tears of the Kingdom Savegame Editor (Armor class) v20230605
+	The legend of Zelda: Tears of the Kingdom savegame editor - Armor class (last update 2023-07-08)
 
 	by Marc Robledo 2023
 	item names compiled by Echocolat, Exincracci, HylianLZ and Karlos007
 */
 
-function Armor(index, id, dyeColor){
+function Armor(itemData, overrideId){
 	this.category='armors';
-	this.index=index;
-	this.removable=false;
 
-	this.id=id;
-	this.dyeColor=dyeColor || Armor.DYE_NONE;
-
-	Armor.buildHtmlElements(this);
-	this.refreshHtmlColor();
+	this.id=overrideId || itemData.id;
+	this.dyeColor=Variable.enumToInt(itemData.dyeColor);
 }
-Armor.prototype.refreshHtmlColor=function(){
-	var colorIndex=this._htmlSelectDyeColor.selectedIndex;
-	var colors=['transparent','#2641ea','#ec3b18','#ffe13e','#f8f8f8','#080808','#b03af4','#4bf130','#78e7ff','#527abc','#ff9b2f','#ff85d0','#f62ba7','#ffef98','#8f3a20','#808080']
-	this._htmlSpanColor.style.backgroundColor=colors[colorIndex];
+Armor.prototype.getBaseId=function(){
+	return Armor.INFO[this.id].base;
+}
+Armor.prototype.canBeUpgraded=function(){
+	return Armor.INFO[this.id].upgradeable;
+}
+Armor.prototype.upgrade=function(){
+	var upgradeId=this.canBeUpgraded();
+	if(upgradeId)
+		this.id=upgradeId;
+
+	return upgradeId;
+}
+Armor.prototype.canBeDyed=function(){
+	return Armor.INFO[this.id].dyeable;
 }
 Armor.prototype.getItemTranslation=function(){
-	return Locale._(this.id);
+	return _(this.id);
 }
-Armor.prototype.copy=function(index, newId){
-	return new Armor(
-		index,
-		typeof newId==='string'? newId : this.id,
-		this.dyeColor
-	);
+Armor.prototype.export=function(){
+	return{
+		totkStruct:Pouch.getCategoryItemStructId(this.category),
+		id:this.id,
+		dyeColor:this.dyeColor
+	}
 }
-Armor.prototype.save=function(){
-	SavegameEditor.writeString64('Pouch.Armor.Content.Name', this.index, this.id);
-	SavegameEditor.writeU32('Pouch.Armor.Content.ColorVariation', this.index, this.dyeColor);
+Armor.prototype.refreshHtmlInputs=function(fixValues){
+	if(fixValues){
+		if(!this.canBeDyed())
+			this.dyeColor=hash('None');
+	}
+
+	this._htmlInputs.dyeColor.disabled=!this.canBeDyed();
+	Pouch.updateItemIcon(this);
 }
 
 
+
 Armor.buildHtmlElements=function(item){
-	//build html elements
-	var dyeColors=[
-		{name:Locale._('Default color'), value:Armor.DYE_NONE},
-		{name:Locale._('Blue'), value:Armor.DYE_BLUE},
-		{name:Locale._('Red'), value:Armor.DYE_RED},
-		{name:Locale._('Yellow'), value:Armor.DYE_YELLOW},
-		{name:Locale._('White'), value:Armor.DYE_WHITE},
-		{name:Locale._('Black'), value:Armor.DYE_BLACK},
-		{name:Locale._('Purple'), value:Armor.DYE_PURPLE},
-		{name:Locale._('Green'), value:Armor.DYE_GREEN},
-		{name:Locale._('Light blue'), value:Armor.DYE_LIGHT_BLUE},
-		{name:Locale._('Navy'), value:Armor.DYE_NAVY},
-		{name:Locale._('Orange'), value:Armor.DYE_ORANGE},
-		{name:Locale._('Pink'), value:Armor.DYE_PINK},
-		{name:Locale._('Crimson'), value:Armor.DYE_CRIMSON},
-		{name:Locale._('Light yellow'), value:Armor.DYE_LIGHT_YELLOW},
-		{name:Locale._('Brown'), value:Armor.DYE_BROWN},
-		{name:Locale._('Gray'), value:Armor.DYE_GRAY}
-	];
-	item._htmlSelectDyeColor=select('armor-dye-'+item.category+'-'+item.index, dyeColors, function(){
-		item.dyeColor=parseInt(this.value);
-		item.refreshHtmlColor();
-	}, item.dyeColor);
-	item._htmlSelectDyeColor.dataset.translateTitle='Dye color';
-	item._htmlSelectDyeColor.title=Locale._('Dye color');
-
-	item._htmlSpanColor=document.createElement('span');
-	item._htmlSpanColor.className='dye-color';
-}
-
-Armor.readAll=function(){
-	var armorIds=SavegameEditor.readString64Array('Pouch.Armor.Content.Name');
-	var validArmors=[];
-	for(var i=0; i<armorIds.length; i++){
-		if(armorIds[i]){
-			validArmors.push(new Armor(
-				i,
-				armorIds[i],
-				SavegameEditor.readU32Array('Pouch.Armor.Content.ColorVariation', i)
-			));
-		}
-	}
-	return validArmors;
+	item._htmlInputs={
+		dyeColor:Pouch.createItemInput(item, 'dyeColor', 'Enum', {enumValues:Armor.OPTIONS_DYE_COLORS, label:_('Dye color')})
+	};
 }
 
 
-Armor.DYE_NONE=0xb6eede09; //None
-Armor.DYE_BLUE=0xe2911aba; //Blue
-Armor.DYE_RED=0x6e1a9181; //Red
-Armor.DYE_YELLOW=0xc03f6678; //Yellow
-Armor.DYE_WHITE=0x4402060c; //White
-Armor.DYE_BLACK=0x6cbc3cb4; //Black
-Armor.DYE_PURPLE=0x7f0ae256; //Purple
-Armor.DYE_GREEN=0x7c9b6ddb; //Green
-Armor.DYE_LIGHT_BLUE=0x01666931; //LightBlue
-Armor.DYE_NAVY=0xadfd3a1; //Navy
-Armor.DYE_ORANGE=0x619ec353; //Orange
-Armor.DYE_PINK=0xeaf26a09; //Pink
-Armor.DYE_CRIMSON=0xf8bdf528; //Crimson
-Armor.DYE_LIGHT_YELLOW=0xdf26c6da; //LightYellow
-Armor.DYE_BROWN=0xb364bb2c; //Brown
-Armor.DYE_GRAY=0x762266bf; //Gray
 
+Armor.OPTIONS_DYE_COLORS=[
+	{name:_('Default color'), value:hash('None')},
+	{name:_('Blue'), value:hash('Blue')},
+	{name:_('Red'), value:hash('Red')},
+	{name:_('Yellow'), value:hash('Yellow')},
+	{name:_('White'), value:hash('White')},
+	{name:_('Black'), value:hash('Black')},
+	{name:_('Purple'), value:hash('Purple')},
+	{name:_('Green'), value:hash('Green')},
+	{name:_('Light blue'), value:hash('LightBlue')},
+	{name:_('Navy'), value:hash('Navy')},
+	{name:_('Orange'), value:hash('Orange')},
+	{name:_('Pink'), value:hash('Pink')},
+	{name:_('Crimson'), value:hash('Crimson')},
+	{name:_('Light yellow'), value:hash('LightYellow')},
+	{name:_('Brown'), value:hash('Brown')},
+	{name:_('Gray'), value:hash('Gray')}
+];
 Armor.AVAILABILITY=[
 	'Armor_001_Head','Armor_002_Head','Armor_003_Head','Armor_004_Head','Armor_015_Head', //Hylian Hood
 	'Armor_1152_Head','Armor_1153_Head','Armor_1154_Head','Armor_1155_Head','Armor_1156_Head', //Hylian Hood (lowered)
@@ -302,74 +276,121 @@ Armor.AVAILABILITY=[
 	'Armor_1150_Upper' //*Tunic of memories (intro, unused)
 ];
 
-Armor.UPGRADEABLE=[
+Armor.INFO=(function(upgrades, dyeables){
+	var info={};
+	Armor.AVAILABILITY.forEach(function(itemId){
+		var numberId=itemId.replace(/[^\d]/g,'');
+
+		var level=null;
+		var base=itemId;
+		var upgradeable=false;
+		for(var i=0; i<upgrades.length; i++){
+			var index=upgrades[i].indexOf(numberId);
+			if(index!==-1){
+				level=index;
+				base=itemId.replace(/\d+/, upgrades[i][0]);
+				if(index<4)
+					upgradeable=itemId.replace(/\d+/, upgrades[i][index+1]);
+				break;
+			}
+		}
+
+		var dyeable=dyeables.indexOf(base.replace(/[^\d]/g,''))!==-1;
+
+		info[itemId]={
+			base:base,
+			level:level,
+			upgradeable:upgradeable,
+			dyeable:dyeable
+		}
+	});
+	return info;
+}([
+	/* upgrades */
+	['1152','1153','1154','1155','1156'], //Hylian Hood (lowered)
+	['001','002','003','004','015'], //Hylian Hood/Tunic/Hylian Trousers
+	['005','035','039','060','061'], //Cap/Tunic/Trousers of the Wild
+	['006','007','062','063','064'], //Zora Helm/Armor/Greaves
+	['008','040','065','066','067'], //Desert Voe Headband/Spaulder/Trousers
+	['009','036','071','072','073'], //Snowquill Headdress/Tunic/Trousers
+	['011','037','074','075','076'], //Flamebreaker Helm/Armor/Boots
+	['012','042','077','078','079'], //Stealth Mask/Chest Guard/Tights
+	['014','083','084','085','086'], //Climbers Bandanna/Gear/Boots
+	['017','087','088','089','090'], //Radiant Mask/Shirt/Tights
+	['020','095','096','097','098'], //Soldiers Helm/Armor/Greaves
+	['021','099','100','101','102'], //Ancient Helm/Cuirass/Greaves
+	['024','117','118','119','120'], //Diamond Circlet
+	['025','121','122','123','124'], //Ruby Circlet
+	['026','125','126','127','128'], //Sapphire Circlet
+	['027','129','130','131','132'], //Topaz Earrings
+	['028','133','134','135','136'], //Opal Earrings
+	['029','137','138','139','140'], //Amber Earrings
+	['046','103','104','105','106'], //Rubber Helm/Armor/Tights
+	['048','111','112','113','114'], //Barbarian Helm/Armor/Leg Wraps
+	['049','152','153','154','155'], //Sand Boots
+	['116','148','149','150','151'], //Tunic of Memories
+	['141','156','157','158','159'], //Snow Boots
+	['179','1146','1147','1148','1149'], //Royal Guard Cap/Uniform/Boots
+	['181','186','187','188','189'], //Vah Ruta Divine Helm
+	['182','190','191','192','193'], //Vah Medoh Divine Helm
+	['183','194','195','196','197'], //Vah Rudania Divine Helm
+	['184','198','199','168','169'], //Vah Naboris Divine Helm
+	['200','201','202','203','204'], //Cap/Tunic/Trousers of Time
+	['205','206','207','208','209'], //Cap/Tunic/Trousers of the Wind
+	['210','211','212','213','214'], //Cap/Tunic/Trousers of Twilight
+	['215','216','217','218','219'], //Cap/Tunic/Trousers of the Sky
+	['220','221','222','223','224'], //Sheiks Mask
+	['225','226','227','228','229'], //Fierce Deity Mask/Armor/Boots
+	['230','231','232','233','234'], //Cap/Tunic/Trousers of the Hero
+	['1006','1007','1008','1009','1010'], //Glide Mask/Shirt/Tights
+	['1036','1037','1038','1039','1040'], //Ancient Heros Aspect
+	['1046','1047','1048','1049','1050'], //Froggy Hood/Sleeve/Leggings
+	['1051','1052','1053','1054','1055'], //Miners Mask/Top/Trousers
+	['1061','1062','1063','1064','1065'], //Ember Headdress/Shirt/Trousers
+	['1066','1067','1068','1069','1070'], //Charged Headdress/Shirt/Trousers
+	['1071','1072','1073','1074','1075'], //Frostbite Headdress/Shirt/Trousers
+	['1091','1092','1093','1094','1095'], //Zonaite Helm/Waistguard/Shin Guards
+	['1096','1097','1098','1099','1100'], //Mask/Tunic/Trousers of Awakening
+	['1106','1107','1108','1109','1110'], //Champions Leather
+	['1141','1142','1143','1144','1145'], //Hood/Tunic/Gaiters of the Depths
+	['1300','1301','1302','1303','1304'] //Yiga Mask/Armor/Tight
+], [
+	/* dyeable */
+	'1043', //Archaic Tunic/Legwear
+	'1044', //Archaic Warm Greaves
+
+	'1152', //Hylian Hood (lowered)
 	'001', //Hylian Hood/Tunic/Trousers
-	'005', //Cap/Tunic/Trousers of the Wild
-	'006', //Zora Helm/Armor/Greaves
-	'008', //Desert Voe Headband/Spaulder/Trousers
+
+	'020', //Soldier's Helm/Armor/Greaves
 	'009', //Snowquill Headdress/Tunic/Trousers
 	'011', //Flamebreaker Helm/Armor/Boots
+	'006', //Zora Helm/Armor/Greaves
+	'008', //Desert Voe Headband/Spaulde/Trousers
+	'046', //Rubber Helm/Armor/Tights
 	'012', //Stealth Mask/Chest Guard/Tights
 	'014', //Climber's Bandanna/Gear/Boots
-	'017', //Radiant Mask/Shirt/Tights
-	'020', //Soldier's Helm/Armor/Greaves
-	'021', //Ancient Helm/Cuirass/Greaves
-	'046', //Rubber Helm/Armor/Tights
 	'048', //Barbarian Helm/Armor/Leg Wraps
-	'179', //Royal Guard Cap/Uniform/Boots
-	'200', //Cap/Tunic/Trousers of Time
-	'205', //Cap/Tunic/Trousers of the Wind
-	'210', //Cap/Tunic/Trousers of Twilight
-	'215', //Cap/Tunic/Trousers of the Sky
-	'225', //Fierce Deity Mask/Armor/Boots
-	'230', //Cap/Tunic/Trousers of the Hero
-	'1006', //Glide Mask/Shirt/Tights
+	'017', //Radiant Mask/Shirt/Tights
 	'1046', //Froggy Hood/Sleeve/Leggings
+	'1006', //Glide Mask/Shirt/Tights
+	'1141', //Hood/Tunic/Gaiters of the Depths
 	'1051', //Miner's Mask/Top/Trousers
+	'1086', //Mystic Headpiece/Robe/Trousers
 	'1061', //Ember Headdress/Shirt/Trousers
 	'1066', //Charged Headdress/Shirt/Trousers
 	'1071', //Frostbite Headdress/Shirt/Trousers
-	'1091', //Zonaite Helm/Waistguard/Shin Guards
-	'1096', //Mask/Tunic/Trousers of Awakening
-	'1141', //Hood/Tunic/Gaiters of the Depths
-	'1300', //Yiga Mask/Armor/Tight
+	'1300', //Yiga Mask/Armor/Tights
 
-	'1152', //Hylian Hood (lowered)
-	'024', //Diamond Circlet
-	'025', //Ruby Circlet
-	'026', //Sapphire Circlet
-	'027', //Topaz Earrings
-	'028', //Opal Earrings
-	'029', //Amber Earrings
 	'181', //Vah Ruta Divine Helm
 	'182', //Vah Medoh Divine Helm
 	'183', //Vah Rudania Divine Helm
 	'184', //Vah Naboris Divine Helm
-	'220', //Sheik's Mask
-	'1036', //Ancient Hero's Aspect
 
-	'116', //Tunic of Memories
-	'1106', //Champion's Leather
+	'1091', //Zonaite Helm/Waistguard/Shin Guards
 
 	'049', //Sand Boots
-	'141' //Snow Boots
-];
-Armor.ICONS=(function(){
-	/* for this to work correctly, upgradeable armor ids in Armor.AVAILABILITY must be always next to the base one */
-	var stars=0;
-	var icons={};
-	var lastUpgradeableArmorId;
-	Armor.AVAILABILITY.forEach(function(armorId, i){
-		if(stars){
-			icons[armorId]=lastUpgradeableArmorId;
-			stars--;
-		}else{
-			icons[armorId]=armorId;
-			if(Armor.UPGRADEABLE.indexOf(armorId.replace(/[^\d]/g, ''))!==-1){
-				lastUpgradeableArmorId=armorId;
-				stars=4;
-			}
-		}
-	});
-	return icons;
-}());
+	'141', //Snow Boots
+
+	'005' //Cap/Tunic/Trousers of the Wild
+]));
\ No newline at end of file
diff --git a/zelda-totk/zelda-totk.class.autobuilder.js b/zelda-totk/zelda-totk.class.autobuilder.js
index 4e507e2..9a9abe3 100644
--- a/zelda-totk/zelda-totk.class.autobuilder.js
+++ b/zelda-totk/zelda-totk.class.autobuilder.js
@@ -1,5 +1,5 @@
 /*
-	The legend of Zelda: Tears of the Kingdom Savegame Editor (Autobuilder class) v20230604
+	The legend of Zelda: Tears of the Kingdom savegame editor - Autobuilder class (last update 2023-07-08)
 
 	by Marc Robledo 2023
 	thanks to SuperSpazzy's hash crack
@@ -13,43 +13,39 @@ function AutoBuilder(_index, index, combinedActorInfo, cameraPos, cameraAt, isFa
 	this.isFavorite=isFavorite;
 }
 AutoBuilder.prototype.export=function(){
-	var file=new MarcFile(AutoBuilder.FILE_SIZE + this.combinedActorInfo.length);
-	file.fileName='my_autobuilder_'+(this.index+1)+'.totkab';
-	var offset=0;
-	file.writeString(offset, AutoBuilder.EXPORTED_HEADER, AutoBuilder.EXPORTED_HEADER.length);
-	offset+=AutoBuilder.EXPORTED_HEADER.length;
-	file.writeU32(offset, this.index);
-	offset+=4;
-	file.writeF32(offset+0, this.cameraPos.x);
-	file.writeF32(offset+4, this.cameraPos.y);
-	file.writeF32(offset+8, this.cameraPos.z);
-	offset+=12;
-	file.writeF32(offset+0, this.cameraAt.x);
-	file.writeF32(offset+4, this.cameraAt.y);
-	file.writeF32(offset+8, this.cameraAt.z);
-	offset+=12;
-	file.writeS32(offset, this.isFavorite);
-	offset+=4;
-	file.writeBytes(offset, this.combinedActorInfo);
+	var file=new MarcFile(AutoBuilder.CAI_EDITOR_SIZE);
+	file.fileName='my_autobuilder_'+(this.index+1)+'.cai';
+	file.littleEndian=true;
+	file.writeBytes(0, this.combinedActorInfo);
+	file.writeF32(AutoBuilder.CAI_SIZE+0, this.cameraPos.x);
+	file.writeF32(AutoBuilder.CAI_SIZE+4, this.cameraPos.y);
+	file.writeF32(AutoBuilder.CAI_SIZE+8, this.cameraPos.z);
+	file.writeF32(AutoBuilder.CAI_SIZE+12, this.cameraAt.x);
+	file.writeF32(AutoBuilder.CAI_SIZE+16, this.cameraAt.y);
+	file.writeF32(AutoBuilder.CAI_SIZE+20, this.cameraAt.z);
 
 	return file;
 }
 AutoBuilder.prototype.save=function(){
 	SavegameEditor.writeU32('AutoBuilder.Draft.Content.Index', this._index, this.index);
-	SavegameEditor.writeDynamicData('AutoBuilder.Draft.Content.CombinedActorInfo', this._index, this.combinedActorInfo);
+	SavegameEditor.writeBinary('AutoBuilder.Draft.Content.CombinedActorInfo', this._index, this.combinedActorInfo);
 	SavegameEditor.writeVector3F('AutoBuilder.Draft.Content.CameraPos', this._index, this.cameraPos);
 	SavegameEditor.writeVector3F('AutoBuilder.Draft.Content.CameraAt', this._index, this.cameraAt);
 	SavegameEditor.writeS32('AutoBuilder.Draft.Content.IsFavorite', this._index, this.isFavorite);
 }
 
-AutoBuilder.EXPORTED_HEADER='TOTKAutoBuilder1';
-AutoBuilder.FILE_SIZE=(AutoBuilder.EXPORTED_HEADER.length + 4 + 12 + 12 + 4);
+AutoBuilder.CAI_HEADER='CmbAct';
+AutoBuilder.CAI_SIZE=6688;
+AutoBuilder.CAI_DRAFT_SIZE=AutoBuilder.CAI_SIZE + 1152; //yiga schematic + schema stones internal files
+AutoBuilder.CAI_EDITOR_SIZE=AutoBuilder.CAI_SIZE + 12 + 12; //cameraPos + cameraAt
+
+
 AutoBuilder.readSingle=function(autobuilderIndex){
 	var _index=AutoBuilder.getIndexByAutobuilderIndex(autobuilderIndex);
 	if(_index===-1)
 		return null;
 	var index=SavegameEditor.readU32Array('AutoBuilder.Draft.Content.Index', _index);
-	var combinedActorInfo=SavegameEditor.readDynamicDataArray('AutoBuilder.Draft.Content.CombinedActorInfo', _index);
+	var combinedActorInfo=SavegameEditor.readBinaryArray('AutoBuilder.Draft.Content.CombinedActorInfo', _index);
 	var cameraPos=SavegameEditor.readVector3FArray('AutoBuilder.Draft.Content.CameraPos', _index);
 	var cameraAt=SavegameEditor.readVector3FArray('AutoBuilder.Draft.Content.CameraAt', _index);
 	var isFavorite=SavegameEditor.readS32Array('AutoBuilder.Draft.Content.IsFavorite', _index);
@@ -63,39 +59,35 @@ AutoBuilder.readSingle=function(autobuilderIndex){
 	);
 }
 AutoBuilder.fromFile=function(file){
-	if(file.length<AutoBuilder.FILE_SIZE){
-		return null;
-	}else if(file.readString(0, AutoBuilder.EXPORTED_HEADER.length)!==AutoBuilder.EXPORTED_HEADER){
-		return null;
-	}
+	file.littleEndian=true;
+	if((file.fileSize===AutoBuilder.CAI_SIZE || file.fileSize===AutoBuilder.CAI_DRAFT_SIZE || file.fileSize===AutoBuilder.CAI_EDITOR_SIZE) && file.readString(0, 6)===AutoBuilder.CAI_HEADER){
+		var cameraPos={x:0,y:0,z:0};
+		var cameraAt={x:0,y:0,z:0};
+		var caiData=file.readBytes(0, AutoBuilder.CAI_SIZE);
+		
+		if(file.fileSize===AutoBuilder.CAI_EDITOR_SIZE){
+			cameraPos={
+				x:file.readF32(AutoBuilder.CAI_SIZE+0),
+				y:file.readF32(AutoBuilder.CAI_SIZE+4),
+				z:file.readF32(AutoBuilder.CAI_SIZE+8),
+			}
+			cameraAt={
+				x:file.readF32(AutoBuilder.CAI_SIZE+12),
+				y:file.readF32(AutoBuilder.CAI_SIZE+16),
+				z:file.readF32(AutoBuilder.CAI_SIZE+20),
+			}
+		}
 
-	var offset=AutoBuilder.EXPORTED_HEADER.length;
-	var index=file.readU32(offset);
-	offset+=4;
-	var cameraPos={
-		x:file.readF32(offset+0),
-		y:file.readF32(offset+4),
-		z:file.readF32(offset+8),
+		return new AutoBuilder(
+			null,
+			null,
+			caiData,
+			cameraPos,
+			cameraAt,
+			-1
+		);
 	}
-	offset+=12;
-	var cameraAt={
-		x:file.readF32(offset+0),
-		y:file.readF32(offset+4),
-		z:file.readF32(offset+8),
-	}
-	offset+=12;
-	var isFavorite=file.readS32(offset);
-	offset+=4;
-	var combinedActorInfo=file.readBytes(offset, file.fileSize - AutoBuilder.FILE_SIZE);
-
-	return new AutoBuilder(
-		0,
-		index,
-		combinedActorInfo,
-		cameraPos,
-		cameraAt,
-		isFavorite
-	);
+	return null;
 }
 AutoBuilder.getIndexByAutobuilderIndex=function(autobuilderIndex){
 	return SavegameEditor.readU32Array('AutoBuilder.Draft.Content.Index').indexOf(autobuilderIndex);
@@ -103,7 +95,7 @@ AutoBuilder.getIndexByAutobuilderIndex=function(autobuilderIndex){
 
 /*AutoBuilder.readAll=function(){
 	var index=SavegameEditor.readU32Array('AutoBuilder.Draft.Content.Index');
-	var combinedActorInfo=SavegameEditor.readDynamicDataArray('AutoBuilder.Draft.Content.CombinedActorInfo');
+	var combinedActorInfo=SavegameEditor.readBinaryArray('AutoBuilder.Draft.Content.CombinedActorInfo');
 	var cameraPos=SavegameEditor.readVector3FArray('AutoBuilder.Draft.Content.CameraPos');
 	var cameraAt=SavegameEditor.readVector3FArray('AutoBuilder.Draft.Content.CameraAt');
 	var isFavorite=SavegameEditor.readS32Array('AutoBuilder.Draft.Content.IsFavorite');
diff --git a/zelda-totk/zelda-totk.class.equipment.js b/zelda-totk/zelda-totk.class.equipment.js
index ce4b398..14a4587 100644
--- a/zelda-totk/zelda-totk.class.equipment.js
+++ b/zelda-totk/zelda-totk.class.equipment.js
@@ -1,37 +1,69 @@
 /*
-	The legend of Zelda: Tears of the Kingdom Savegame Editor (Equipment class) v20230608
+	The legend of Zelda: Tears of the Kingdom savegame editor - Equipment class (last update 2023-07-08)
 
 	by Marc Robledo 2023
 	research and item names compiled by Echocolat, Exincracci, HylianLZ, Karlos007 and ApacheThunder
 */
 
-function Equipment(catId, index, id, durability, modifier, modifierValue, fuseId){ //Weapon, Bow or Shield
+function Equipment(catId, itemData, overrideId){ //Weapon, Bow or Shield
 	this.category=catId;
-	this.index=index;
-	this.removable=false;
 
-	this.id=id;
-	this.durability=durability || 70;
-	this.modifier=modifier || Equipment.MODIFIER_NO_BONUS;
-	this.modifierValue=modifierValue || 0;
+	this.id=overrideId || itemData.id;
+	this.durability=itemData.durability || 70;
+	this.modifier=Variable.enumToInt(itemData.modifier);
+	this.modifierValue=itemData.modifierValue || 0;
 	if(this.isFusable()){
-		this.fuseId=fuseId || '';
+		this.fuseId=itemData.fuseId || '';
+		this.fuseDurability=itemData.fuseDurability || 0;
+		this.extraDurability=itemData.extraDurability || 0;
+		this.recordExtraDurability=itemData.recordExtraDurability || 0;
 	}
-
-	Equipment.buildHtmlElements(this);
 }
 Equipment.prototype.getItemTranslation=function(){
-	return Locale._(this.id);
+	return _(this.id);
 }
 Equipment.prototype.isFusable=function(){
 	return (this.category==='weapons' || this.category==='shields')
 }
-Equipment.prototype.fixValues=function(){
-	this._htmlInputDurability.maxValue=this.getMaximumDurability();
+Equipment.prototype.canBeUndecayed=function(){
+	return Equipment.WEAPONS_DECAYED_TO_PRISTINE[this.id];
+}
+Equipment.prototype.canBeRestored=function(){
+	return this.durability !== this.getMaximumDurability();
+}
+Equipment.prototype.canBeSetToInfiniteDurability=function(){
+	return this.id!=='Weapon_Sword_070' && (this.modifier!==hash('DurabilityUpPlus') || this.modifierValue!==2100000000);
 }
 Equipment.prototype.restoreDurability=function(){
-	this.durability=this.getMaximumDurability();
-	this._htmlInputDurability.value=this.durability;
+	if(this.canBeRestored()){
+		this.durability=this.getMaximumDurability();
+		return this.durability;
+	}
+	return false;
+}
+Equipment.prototype.restoreDecay=function(){
+	if(this.category!=='weapons')
+		return false;
+
+	if(Equipment.WEAPONS_DECAYED_TO_PRISTINE[this.id]){
+		this.id=Equipment.WEAPONS_DECAYED_TO_PRISTINE[this.id];
+		return true;
+	}
+	if(Equipment.WEAPONS_DECAYED_TO_PRISTINE[this.fuseId]){
+		this.fuseId=Equipment.WEAPONS_DECAYED_TO_PRISTINE[this.fuseId];
+		return true;
+	}
+
+	return false;
+}
+Equipment.prototype.setInfiniteDurability=function(){
+	if(this.canBeSetToInfiniteDurability()){
+		this.modifier=hash('DurabilityUpPlus');
+		this.modifierValue=2100000000;
+		this.restoreDurability();
+		return true;
+	}
+	return false;
 }
 Equipment.prototype.getMaximumDurability=function(){
 	var defaultDurability=Equipment.DEFAULT_DURABILITY[this.id] || 70;
@@ -43,167 +75,128 @@ Equipment.prototype.getMaximumDurability=function(){
 		}
 	}
 
-	if(this.modifier===Equipment.MODIFIER_DURABILITY || this.modifier===Equipment.MODIFIER_DURABILITY2) //Durability ↑/↑↑
+	if(this.modifier===hash('DurabilityUp') || this.modifier===hash('DurabilityUpPlus'))
 		return defaultDurability + this.modifierValue;
 	return defaultDurability;
 }
-Equipment.prototype.copy=function(index, newId){
-	return new Equipment(
-		this.category,
-		index,
-		typeof newId==='string'? newId : this.id,
-		this.durability,
-		this.modifier,
-		this.modifierValue,
-		this.isFusable()? this.fuseId : null
-	);
+Equipment.prototype.export=function(){
+	if(this.isFusable()){
+		return{
+			totkStruct:Pouch.getCategoryItemStructId(this.category),
+			id:this.id,
+			durability:this.durability,
+			modifier:Variable.enumToString(this.modifier),
+			modifierValue:this.modifierValue,
+			fuseId:this.fuseId,
+			fuseDurability:this.fuseDurability,
+			extraDurability:this.extraDurability,
+			recordExtraDurability:this.recordExtraDurability
+		}
+	}else{
+		return{
+			totkStruct:Pouch.getCategoryItemStructId(this.category),
+			id:this.id,
+			durability:this.durability,
+			modifier:Variable.enumToString(this.modifier),
+			modifierValue:this.modifierValue
+		}
+	}
 }
-Equipment.prototype.save=function(){
-	var categoryHash=getInternalCategoryId(this.category);
-	SavegameEditor.writeString64('Pouch.'+categoryHash+'.Content.Name', this.index, this.id);
-	SavegameEditor.writeU32('Pouch.'+categoryHash+'.Content.Life', this.index, this.durability);
-	SavegameEditor.writeU32('Pouch.'+categoryHash+'.Content.Effect.Type', this.index, this.modifier);
-	SavegameEditor.writeU32('Pouch.'+categoryHash+'.Content.Effect.Value', this.index, this.modifierValue);
+Equipment.prototype.refreshHtmlInputs=function(fixValues){
+	if(fixValues){
+		this._htmlInputs.durability.maxValue=this.getMaximumDurability();
+		if(this.durability>this._htmlInputs.durability.maxValue)
+			this.durability=this._htmlInputs.durability.maxValue;
 
-	if(this.isFusable())
-		SavegameEditor.writeString64('Pouch.'+categoryHash+'.Content.Combined.Name', this.index, this.fuseId);
+		if(this.lastInputChanged==='modifier'){
+			if(this.modifier===hash('None')){
+				this.modifierValue=0;
+				this.restoreDurability();
+			}else if(this.modifierValue<1){
+				this.modifierValue=1;
+			}
+		}
+
+
+		if(this.category==='weapons'){
+			if(this.id==='Weapon_Sword_070'){
+				this.modifier=hash('None');
+				this.modifierValue=-1;
+			}else{
+				if(this.modifierValue===-1)
+					this.modifierValue=0;
+			}
+		}
+	}
+
+
+	this._htmlInputs.modifier.disabled=(this.category==='weapons' && this.id==='Weapon_Sword_070');
+	this._htmlInputs.modifierValue.disabled=this.modifier===hash('None');
+
+
+
+	var modifierText;
+	try{
+		modifierText=hashReverse(this.modifier);
+	}catch(err){
+		modifierText='None';
+	}
+	if(/AttackUp/.test(modifierText))
+		modifierText=this.category+'_'+modifierText;	
+	if(modifierText && modifierText!=='None')
+		this._htmlInputs.modifierValue.style.backgroundImage='url(assets/tokt_ui_icons/bonus_'+modifierText+'.svg)';
+	else
+		this._htmlInputs.modifierValue.style.backgroundImage='none';
 }
 
 
 Equipment.buildHtmlElements=function(item){
-	//build html elements
-	item._htmlInputDurability=inputNumber('item-durability-'+item.category+'-'+item.index, 1, 70, item.durability);
-	item._htmlInputDurability.addEventListener('change', function(){
-		var newVal=parseInt(this.value);
-		if(!isNaN(newVal) && newVal>0)
-			item.durability=newVal;
-	});
-	item._htmlInputDurability.dataset.translateTitle='Durability';
-	item._htmlInputDurability.title=Locale._('Durability');
-	item._htmlInputDurability.maxValue=item.getMaximumDurability();
-	item._htmlInputDurability.value=item.durability;
+	item._htmlInputs={
+		durability:Pouch.createItemInput(item, 'durability', 'Int', {min:1, max:item.getMaximumDurability(), label:_('Durability')}),
+		modifier:Pouch.createItemInput(item, 'modifier', 'Enum', {enumValues:Equipment.OPTIONS_MODIFIERS[item.category], label:_('Modifier')}),
+		modifierValue:Pouch.createItemInput(item, 'modifierValue', 'Int', {min:-1, max:2100000000, label:_('Modifier value')}),
+	};
+	if(item.isFusable())
+		item._htmlInputs.fuseId=Pouch.createItemInput(item, 'fuseId', 'String64', {enumValues:Equipment.FUSABLE_ITEMS, label:_('Fusion')});
 
-	//build html elements
-	var modifiers=[
-		{name:Locale._('No bonus'), value:Equipment.MODIFIER_NO_BONUS},
-		{name:Locale._('Attack')+' ↑', value:Equipment.MODIFIER_ATTACK},
-		{name:Locale._('Attack')+' ↑↑', value:Equipment.MODIFIER_ATTACK2},
-		{name:Locale._('Durability')+' ↑', value:Equipment.MODIFIER_DURABILITY},
-		{name:Locale._('Durability')+' ↑↑', value:Equipment.MODIFIER_DURABILITY2}
-	];
-	if(item.category==='weapons'){
-		modifiers.push({name:Locale._('Critical Hit')+' ↑', value:Equipment.MODIFIER_CRITICAL_HIT});
-		modifiers.push({name:Locale._('Throw')+' ↑↑', value:Equipment.MODIFIER_THROW});
-	}else if(item.category==='bows'){
-		modifiers.push({name:Locale._('Quick Shot'), value:Equipment.MODIFIER_QUICK_SHOT});
-		//modifiers.push({name:'Arrow Shot x3', value:Equipment.MODIFIER_ARROWX3}); //???
-		modifiers.push({name:Locale._('Arrow Shot')+' x5', value:Equipment.MODIFIER_ARROWX5});
-	}else if(item.category==='shields'){
-		modifiers.push({name:Locale._('Block')+' ↑', value:Equipment.MODIFIER_BLOCK});
-		modifiers.push({name:Locale._('Block')+' ↑↑', value:Equipment.MODIFIER_BLOCK2});
-	}
-	var unknownModifier=[
-		Equipment.MODIFIER_NO_BONUS,
-		Equipment.MODIFIER_ATTACK,
-		Equipment.MODIFIER_ATTACK2,
-		Equipment.MODIFIER_DURABILITY,
-		Equipment.MODIFIER_DURABILITY2,
-		Equipment.MODIFIER_CRITICAL_HIT,
-		Equipment.MODIFIER_THROW,
-		Equipment.MODIFIER_QUICK_SHOT,
-		Equipment.MODIFIER_ARROWX3,
-		Equipment.MODIFIER_ARROWX5,
-		Equipment.MODIFIER_BLOCK,
-		Equipment.MODIFIER_BLOCK2
-	].indexOf(item.modifier)===-1;
-	if(unknownModifier){
-		modifiers.push({name:'Unknown: '+SavegameEditor._toHexInt(item.modifier), value:item.modifier});
-	}
-	item._htmlSelectModifier=select('item-modifier-'+item.category+'-'+item.index, modifiers, function(){
-		var fromNoBonus=item.modifier===Equipment.MODIFIER_NO_BONUS;
-		var fromModifierDurability=item.modifier===Equipment.MODIFIER_DURABILITY || item.modifier===Equipment.MODIFIER_DURABILITY2;
-		item.modifier=parseInt(this.value);
 
-		item.fixValues();
 
-		if(item.modifier===Equipment.MODIFIER_NO_BONUS){
-			item.modifierValue=0;
-			item._htmlInputModifierValue.value=0;
-			item.restoreDurability();
-		}else if(fromNoBonus || fromModifierDurability){
-			if(fromNoBonus && (item.modifier===Equipment.MODIFIER_DURABILITY || item.modifier===Equipment.MODIFIER_DURABILITY2)){
-				item.modifierValue=2100000000;
-				item._htmlInputModifierValue.value=2100000000;
-			}
-			item.restoreDurability();
-		}
-	}, item.modifier);
-	item._htmlSelectModifier.dataset.translateTitle='Modifier';
-	item._htmlSelectModifier.title=Locale._('Modifier');
-	item._htmlSelectModifier.disabled=unknownModifier;
-
-	//build html elements
-	item._htmlInputModifierValue=inputNumber('item-modifier-value-'+item.category+'-'+item.index, 0, 2100000000, item.modifierValue);
-	item._htmlInputModifierValue.addEventListener('change', function(){
-		var newVal=parseInt(this.value);
-		if(!isNaN(newVal) && newVal>0){
-			item.modifierValue=newVal;
-			if((item.modifier===Equipment.MODIFIER_DURABILITY || item.modifier===Equipment.MODIFIER_DURABILITY2)){
-				item.restoreDurability();
-			}
-		}
-	});
-	item._htmlInputModifierValue.dataset.translateTitle='Modifier value';
-	item._htmlInputModifierValue.title=Locale._('Modifier value');
-
-	//build html elements
-	if(item.isFusable()){
-		item._htmlSelectFusion=select('item-fusion-'+item.category+'-'+item.index, Equipment.FUSABLE_ITEMS, function(){
-			item.fuseId=this.value;
-			item.restoreDurability();
-			item.fixValues();
-		}, item.fuseId);
-		item._htmlSelectFusion.dataset.translateTitle='Fusion';
-		item._htmlSelectFusion.title=Locale._('Fusion');
-	}
-}
-
-Equipment.readAll=function(catId){
-	var categoryHash=getInternalCategoryId(catId);
-	var equipmentIds=SavegameEditor.readString64Array('Pouch.'+categoryHash+'.Content.Name');
-	var isFusable=(catId==='weapons' || catId==='shields');
-	var validEquipment=[];
-	for(var i=0; i<equipmentIds.length; i++){
-		if(equipmentIds[i]){
-			validEquipment.push(new Equipment(
-				catId,
-				i,
-				equipmentIds[i],
-				SavegameEditor.readU32('Pouch.'+categoryHash+'.Content.Life', i),
-				SavegameEditor.readU32('Pouch.'+categoryHash+'.Content.Effect.Type', i),
-				SavegameEditor.readU32('Pouch.'+categoryHash+'.Content.Effect.Value', i),
-				isFusable? SavegameEditor.readString64('Pouch.'+categoryHash+'.Content.Combined.Name', i) : null
-			));
-		}
-	}
-	return validEquipment;
+	item._htmlInputs.modifierValue.className+=' with-icon';
+	item._htmlInputs.modifierValue.backgroundImage='none';
 }
 
 
 
-Equipment.MODIFIER_NO_BONUS=0xb6eede09;
-Equipment.MODIFIER_ATTACK=0xa9384c6c;
-Equipment.MODIFIER_ATTACK2=0xdad10617;
-Equipment.MODIFIER_DURABILITY=0xd5cad39b;
-Equipment.MODIFIER_DURABILITY2=0xb2c943ee;
-Equipment.MODIFIER_CRITICAL_HIT=0xd0efac53; //Weapon only
-Equipment.MODIFIER_THROW=0x9659c804; //Weapon only
-Equipment.MODIFIER_QUICK_SHOT=0x7d505bc4; //Bow only
-Equipment.MODIFIER_ARROWX3=0x54535b3c; //Bow only
-Equipment.MODIFIER_ARROWX5=0x934069cd; //Bow only
-Equipment.MODIFIER_BLOCK=0x37eae30f; //Shield only
-Equipment.MODIFIER_BLOCK2=0xb3c94e5; //Shield only
 
+
+Equipment.OPTIONS_MODIFIERS={
+	'weapons':[
+		{name:_('No bonus'), value:hash('None')},
+		{name:_('Durability')+' ↑', value:hash('DurabilityUp')},
+		{name:_('Durability')+' ↑↑', value:hash('DurabilityUpPlus')},
+		{name:_('Attack')+' ↑', value:hash('AttackUp')},
+		{name:_('Attack')+' ↑↑', value:hash('AttackUpPlus')},
+		{name:_('Critical Hit')+' ↑', value:hash('FinishBlow')},
+		{name:_('Throw')+' ↑↑', value:hash('LongThrow')}
+	],
+	'bows':[
+		{name:_('No bonus'), value:hash('None')},
+		{name:_('Durability')+' ↑', value:hash('DurabilityUp')},
+		{name:_('Durability')+' ↑↑', value:hash('DurabilityUpPlus')},
+		{name:_('Attack')+' ↑', value:hash('AttackUp')},
+		{name:_('Attack')+' ↑↑', value:hash('AttackUpPlus')},
+		{name:_('Quick Shot'), value:hash('RapidFire')},
+		//{name:'Arrow Shot x3', value:hash('ThreeWayZoom')}, //???
+		{name:_('Arrow Shot')+' x5', value:hash('FiveWay')}
+	],
+	'shields':[
+		{name:_('No bonus'), value:hash('None')},
+		{name:_('Durability')+' ↑', value:hash('DurabilityUp')},
+		{name:_('Durability')+' ↑↑', value:hash('DurabilityUpPlus')},
+		{name:_('Block')+' ↑', value:hash('GuardUp')},
+		{name:_('Block')+' ↑↑', value:hash('GuardUpPlus')}
+	],
+};
 Equipment.DEFAULT_DURABILITY={
 	Weapon_Sword_001:20,
 	Weapon_Sword_002:23,
@@ -393,166 +386,183 @@ Equipment.DEFAULT_DURABILITY={
 
 Equipment.AVAILABILITY={
 	'weapons':[
-		'Weapon_Sword_001', //Traveler's Sword
-		'Weapon_Sword_002', //Soldier's Broadsword
-		'Weapon_Sword_003', //Knight's Broadsword
-		'Weapon_Sword_019', //Bokoblin Arm
-		'Weapon_Sword_020', //Lizalfos Arm
-		'Weapon_Sword_021', //Rusty Broadsword
-		'Weapon_Sword_022', //Soup Ladle
-		'Weapon_Sword_024', //Royal Broadsword
-		'Weapon_Sword_025', //Forest Dweller's Sword
-		'Weapon_Sword_027', //Zora Sword
-		'Weapon_Sword_029', //Gerudo Scimitar
-		'Weapon_Sword_031', //Feathered Edge
-		'Weapon_Sword_041', //Eightfold Blade
-		'Weapon_Sword_043', //Torch
-		'Weapon_Sword_044', //Tree Branch
-		'Weapon_Sword_047', //Royal Guard's Sword
-		'Weapon_Sword_051', //Boomerang
-		'Weapon_Sword_052', //Scimitar of the Seven
-		'Weapon_Sword_057', //White Sword of the Sky
-		'Weapon_Sword_058', //Sword of the Hero
-		'Weapon_Sword_059', //Sea-Breeze Boomerang
 		'Weapon_Sword_070', //Master Sword
-		'Weapon_Sword_101', //Zonaite Sword
-		'Weapon_Sword_103', //Wooden Stick
-		'Weapon_Sword_105', //Boomerang
 		'Weapon_Sword_106', //Traveler's Sword (decayed)
-		'Weapon_Sword_107', //Lizal Boomerang
+		'Weapon_Sword_001', //Traveler's Sword
+		'Weapon_Sword_112', //Soldier's Broadsword (decayed)
+		'Weapon_Sword_002', //Soldier's Broadsword
+		'Weapon_Sword_113', //Knight's Broadsword (decayed)
+		'Weapon_Sword_003', //Knight's Broadsword
+		'Weapon_Sword_124', //Royal Broadsword (decayed)
+		'Weapon_Sword_024', //Royal Broadsword
+		'Weapon_Sword_125', //Forest Dweller's Sword (decayed)
+		'Weapon_Sword_025', //Forest Dweller's Sword
+		'Weapon_Sword_127', //Zora Sword (decayed)
+		'Weapon_Sword_027', //Zora Sword
+		'Weapon_Sword_131', //Feathered Edge (decayed)
+		'Weapon_Sword_031', //Feathered Edge
+		'Weapon_Sword_129', //Gerudo Scimitar (decayed)
+		'Weapon_Sword_029', //Gerudo Scimitar
+		'Weapon_Sword_052', //Scimitar of the Seven
+		'Weapon_Sword_114', //Eightfold Blade (decayed)
+		'Weapon_Sword_041', //Eightfold Blade
+		'Weapon_Sword_021', //Rusty Broadsword
+		'Weapon_Sword_058', //Sword of the Hero
+		'Weapon_Sword_147', //Royal Guard's Sword (decayed)
+		'Weapon_Sword_047', //Royal Guard's Sword
+		'Weapon_Sword_057', //White Sword of the Sky
+		'Weapon_Sword_168', //Wooden Stick (decayed)
+		'Weapon_Sword_103', //Wooden Stick
 		'Weapon_Sword_108', //Sturdy Wooden Stick
 		'Weapon_Sword_109', //Gnarled Wooden Stick
-		'Weapon_Sword_112', //Soldier's Broadsword (decayed)
-		'Weapon_Sword_113', //Knight's Broadsword (decayed)
-		'Weapon_Sword_114', //Eightfold Blade (decayed)
-		'Weapon_Sword_124', //Royal Broadsword (decayed)
-		'Weapon_Sword_125', //Forest Dweller's Sword (decayed)
-		'Weapon_Sword_127', //Zora Sword (decayed)
-		'Weapon_Sword_129', //Gerudo Scimitar (decayed)
-		'Weapon_Sword_131', //Feathered Edge (decayed)
-		'Weapon_Sword_147', //Royal Guard's Sword (decayed)
-		'Weapon_Sword_161', //Magic Rod
+		'Weapon_Sword_101', //Zonaite Sword
 		'Weapon_Sword_163', //Strong Zonaite Sword
 		'Weapon_Sword_164', //Mighty Zonaite Sword
+		'Weapon_Sword_161', //Magic Rod
+		'Weapon_Sword_019', //Bokoblin Arm
+		'Weapon_Sword_020', //Lizalfos Arm
 		'Weapon_Sword_166', //Gloom Sword
+		'Weapon_Sword_105', //Boomerang (decayed)
+		'Weapon_Sword_051', //Boomerang
+		'Weapon_Sword_107', //Lizal Boomerang
+		'Weapon_Sword_059', //Sea-Breeze Boomerang
+		'Weapon_Sword_044', //Tree Branch
 		'Weapon_Sword_167', //Tree Branch (sky)
-		'Weapon_Sword_168', //Wooden Stick (decayed)
+		'Weapon_Sword_022', //Soup Ladle
+		'Weapon_Sword_043', //Torch
 		'Weapon_Sword_077', //Master Sword (glitched)
 
 		'Weapon_Sword_070_Broken', //*Decayed Master Sword (unused)
 		'Npc_Zelda_Torch', //*Zelda's intro torch (unused)
 
-		'Weapon_Lsword_001', //Traveler's Claymore
-		'Weapon_Lsword_002', //Soldier's Claymore
-		'Weapon_Lsword_003', //Knight's Claymore
-		'Weapon_Lsword_019', //Moblin Arm
-		'Weapon_Lsword_020', //Rusty Claymore
-		'Weapon_Lsword_024', //Royal Claymore
-		'Weapon_Lsword_027', //Zora Longsword
-		'Weapon_Lsword_029', //Gerudo Claymore
-		'Weapon_Lsword_036', //Cobble Crusher
-		'Weapon_Lsword_038', //Boat Oar
-		'Weapon_Lsword_041', //Eightfold Longblade
-		'Weapon_Lsword_045', //Farming Hoe
-		'Weapon_Lsword_047', //Royal Guard's Claymore
+		'Weapon_Lsword_174', //Giant Boomerang (decayed)
 		'Weapon_Lsword_051', //Giant Boomerang
-		'Weapon_Lsword_054', //Boulder Breaker
-		'Weapon_Lsword_057', //Dusk Claymore
-		'Weapon_Lsword_059', //Biggoron's Sword
-		'Weapon_Lsword_060', //Fierce Deity Sword
-		'Weapon_Lsword_101', //Zonaite Longsword
-		'Weapon_Lsword_103', //Thick Stick
 		'Weapon_Lsword_106', //Traveler's Claymore (decayed)
+		'Weapon_Lsword_001', //Traveler's Claymore
+		'Weapon_Lsword_112', //Soldier's Claymore (decayed)
+		'Weapon_Lsword_002', //Soldier's Claymore
+		'Weapon_Lsword_113', //Knight's Claymore (decayed)
+		'Weapon_Lsword_003', //Knight's Claymore
+		'Weapon_Lsword_124', //Royal Claymore (decayed)
+		'Weapon_Lsword_024', //Royal Claymore
+		'Weapon_Lsword_127', //Zora Longsword (decayed)
+		'Weapon_Lsword_027', //Zora Longsword
+		'Weapon_Lsword_136', //Cobble Crusher (decayed)
+		'Weapon_Lsword_036', //Cobble Crusher
+		'Weapon_Lsword_054', //Boulder Breaker
+		'Weapon_Lsword_059', //Biggoron's Sword
+		'Weapon_Lsword_129', //Gerudo Claymore (decayed)
+		'Weapon_Lsword_029', //Gerudo Claymore
+		'Weapon_Lsword_114', //Eightfold Longblade (decayed)
+		'Weapon_Lsword_041', //Eightfold Longblade
+		'Weapon_Lsword_057', //Dusk Claymore
+		'Weapon_Lsword_060', //Fierce Deity Sword
+		'Weapon_Lsword_020', //Rusty Claymore
+		'Weapon_Lsword_147', //Royal Guard's Claymore (decayed)
+		'Weapon_Lsword_047', //Royal Guard's Claymore
+		'Weapon_Lsword_168', //Thick Stick (decayed)
+		'Weapon_Lsword_103', //Thick Stick
 		'Weapon_Lsword_108', //Sturdy Thick Stick
 		'Weapon_Lsword_109', //Gnarled Thick Stick
-		'Weapon_Lsword_112', //Soldier's Claymore (decayed)
-		'Weapon_Lsword_113', //Knight's Claymore (decayed)
-		'Weapon_Lsword_114', //Eightfold Longblade (decayed)
-		'Weapon_Lsword_124', //Royal Claymore (decayed)
-		'Weapon_Lsword_127', //Zora Longsword (decayed)
-		'Weapon_Lsword_129', //Gerudo Claymore (decayed)
-		'Weapon_Lsword_136', //Cobble Crusher (decayed)
-		'Weapon_Lsword_147', //Royal Guard's Claymore (decayed)
-		'Weapon_Lsword_161', //Magic Scepter
+		'Weapon_Lsword_101', //Zonaite Longsword
 		'Weapon_Lsword_163', //Strong Zonaite Longsword
 		'Weapon_Lsword_164', //Mighty Zonaite Longsword
+		'Weapon_Lsword_161', //Magic Scepter
+		'Weapon_Lsword_019', //Moblin Arm
 		'Weapon_Lsword_166', //Gloom Club
-		'Weapon_Lsword_168', //Thick Stick (decayed)
-		'Weapon_Lsword_174', //Giant Boomerang (decayed)
+		'Weapon_Lsword_045', //Farming Hoe
+		'Weapon_Lsword_038', //Boat Oar
 
-		'Weapon_Spear_001', //Traveler's Spear
-		'Weapon_Spear_002', //Soldier's Spear
-		'Weapon_Spear_003', //Knight's Halberd
-		'Weapon_Spear_021', //Rusty Halberd
-		'Weapon_Spear_022', //Farmer's Pitchfork
-		'Weapon_Spear_024', //Royal Halberd
-		'Weapon_Spear_025', //Forest Dweller's Spear
-		'Weapon_Spear_027', //Zora Spear
-		'Weapon_Spear_029', //Gerudo Spear
-		'Weapon_Spear_030', //Throwing Spear
-		'Weapon_Spear_032', //Feathered Spear
-		'Weapon_Spear_036', //Wooden Mop
 		'Weapon_Spear_038', //Fishing Harpoon
-		'Weapon_Spear_047', //Royal Guard's Spear
-		'Weapon_Spear_050', //Lightscale Trident
-		'Weapon_Spear_101', //Zonaite Spear
-		'Weapon_Spear_103', //Long Stick
+		'Weapon_Spear_173', //Throwing Spear (decayed)
+		'Weapon_Spear_030', //Throwing Spear
 		'Weapon_Spear_106', //Traveler's Spear (decayed)
+		'Weapon_Spear_001', //Traveler's Spear
+		'Weapon_Spear_112', //Soldier's Spear (decayed)
+		'Weapon_Spear_002', //Soldier's Spear
+		'Weapon_Spear_113', //Knight's Halberd (decayed)
+		'Weapon_Spear_003', //Knight's Halberd
+		'Weapon_Spear_124', //Royal Halberd (decayed)
+		'Weapon_Spear_024', //Royal Halberd
+		'Weapon_Spear_125', //Forest Dweller's Spear (decayed)
+		'Weapon_Spear_025', //Forest Dweller's Spear
+		'Weapon_Spear_127', //Zora Spear (decayed)
+		'Weapon_Spear_027', //Zora Spear
+		'Weapon_Spear_050', //Lightscale Trident
+		'Weapon_Spear_132', //Feathered Spear (decayed)
+		'Weapon_Spear_032', //Feathered Spear
+		'Weapon_Spear_129', //Gerudo Spear (decayed)
+		'Weapon_Spear_029', //Gerudo Spear
+		'Weapon_Spear_021', //Rusty Halberd
+		'Weapon_Spear_147', //Royal Guard's Spear (decayed)
+		'Weapon_Spear_047', //Royal Guard's Spear
+		'Weapon_Spear_168', //Long Stick (decayed)
+		'Weapon_Spear_103', //Long Stick
 		'Weapon_Spear_108', //Sturdy Long Stick
 		'Weapon_Spear_109', //Gnarled Long Stick
-		'Weapon_Spear_112', //Soldier's Spear (decayed)
-		'Weapon_Spear_113', //Knight's Halberd (decayed)
-		'Weapon_Spear_124', //Royal Halberd (decayed)
-		'Weapon_Spear_125', //Forest Dweller's Spear (decayed)
-		'Weapon_Spear_127', //Zora Spear (decayed)
-		'Weapon_Spear_129', //Gerudo Spear (decayed)
-		'Weapon_Spear_132', //Feathered Spear (decayed)
-		'Weapon_Spear_147', //Royal Guard's Spear (decayed)
-		'Weapon_Spear_161', //Magic Staff
+		'Weapon_Spear_101', //Zonaite Spear
 		'Weapon_Spear_163', //Strong Zonaite Spear
 		'Weapon_Spear_164', //Mighty Zonaite Spear
+		'Weapon_Spear_161', //Magic Staff
 		'Weapon_Spear_166', //Gloom Spear
-		'Weapon_Spear_168', //Long Stick (decayed)
-		'Weapon_Spear_173', //Throwing Spear (decayed)
+		'Weapon_Spear_036', //Wooden Mop
+		'Weapon_Spear_022' //Farmer's Pitchfork
 	],
 
 	'bows':[
+		'Weapon_Bow_107', //Old Wooden Bow
+		'Weapon_Bow_038', //Wooden Bow
 		'Weapon_Bow_001', //Traveler's Bow
 		'Weapon_Bow_002', //Soldier's Bow
-		'Weapon_Bow_003', //Spiked Boko Bow
-		'Weapon_Bow_004', //Boko Bow
-		'Weapon_Bow_006', //Lizal Bow
-		'Weapon_Bow_009', //Lynel Bow
-		'Weapon_Bow_011', //Strengthened Lizal Bow
-		'Weapon_Bow_013', //Forest Dweller's Bow
-		'Weapon_Bow_014', //Zora Bow
-		'Weapon_Bow_015', //Gerudo Bow
-		'Weapon_Bow_016', //Swallow Bow
-		'Weapon_Bow_017', //Falcon Bow
-		'Weapon_Bow_026', //Mighty Lynel Bow
-		'Weapon_Bow_027', //Dragonbone Boko Bow
-		'Weapon_Bow_028', //Great Eagle Bow
-		'Weapon_Bow_029', //Phrenic Bow
-		'Weapon_Bow_030', //Steel Lizal Bow
-		'Weapon_Bow_032', //Savage Lynel Bow
-		'Weapon_Bow_033', //Royal Guard's Bow
 		'Weapon_Bow_035', //Knight's Bow
 		'Weapon_Bow_036', //Royal Bow
-		'Weapon_Bow_038', //Wooden Bow
-		'Weapon_Bow_040', //Duplex Bow
+		'Weapon_Bow_013', //Forest Dweller's Bow
+		'Weapon_Bow_014', //Zora Bow
+		'Weapon_Bow_016', //Swallow Bow
+		'Weapon_Bow_017', //Falcon Bow
+		'Weapon_Bow_028', //Great Eagle Bow
+		'Weapon_Bow_015', //Gerudo Bow
+		'Weapon_Bow_029', //Phrenic Bow
+		'Weapon_Bow_033', //Royal Guard's Bow
 		'Weapon_Bow_072', //Dusk Bow
-		'Weapon_Bow_101', //Zonaite Bow
+		'Weapon_Bow_004', //Boko Bow
+		'Weapon_Bow_003', //Spiked Boko Bow
+		'Weapon_Bow_027', //Dragonbone Boko Bow
+		'Weapon_Bow_006', //Lizal Bow
+		'Weapon_Bow_011', //Strengthened Lizal Bow
+		'Weapon_Bow_030', //Steel Lizal Bow
+		'Weapon_Bow_009', //Lynel Bow
+		'Weapon_Bow_032', //Savage Lynel Bow
+		'Weapon_Bow_026', //Mighty Lynel Bow
+		'Weapon_Bow_040', //Duplex Bow
 		'Weapon_Bow_104', //Construct Bow
 		'Weapon_Bow_105', //Strong Construct Bow
 		'Weapon_Bow_106', //Mighty Construct Bow
-		'Weapon_Bow_107', //Old Wooden Bow
-		'Weapon_Bow_166', //Demon King's Bow
+		'Weapon_Bow_101', //Zonaite Bow
+		'Weapon_Bow_166' //Demon King's Bow
 	],
 
 	'shields':[
+		'Weapon_Shield_030', //Hylian Shield
+		'Weapon_Shield_107', //Old Wooden Shield
 		'Weapon_Shield_001', //Wooden Shield
+		'Weapon_Shield_034', //Emblazoned Shield
+		'Weapon_Shield_031', //Hunter's Shield
+		'Weapon_Shield_032', //Fisherman's Shield
+		'Weapon_Shield_035', //Traveler's Shield
 		'Weapon_Shield_002', //Soldier's Shield
 		'Weapon_Shield_003', //Knight's Shield
+		'Weapon_Shield_022', //Royal Shield
+		'Weapon_Shield_023', //Forest Dweller's Shield
+		'Weapon_Shield_025', //Zora Shield
+		'Weapon_Shield_042', //Kite Shield
+		'Weapon_Shield_026', //Gerudo Shield
+		'Weapon_Shield_036', //Radiant Shield
+		'Weapon_Shield_037', //Daybreaker
+		'Weapon_Shield_041', //Shield of the Mind's Eye
+		'Weapon_Shield_057', //Sea-Breeze Shield
+		'Weapon_Shield_021', //Rusty Shield
+		'Weapon_Shield_033', //Royal Guard's Shield
 		'Weapon_Shield_004', //Boko Shield
 		'Weapon_Shield_005', //Spiked Boko Shield
 		'Weapon_Shield_006', //Dragonbone Boko Shield
@@ -562,53 +572,72 @@ Equipment.AVAILABILITY={
 		'Weapon_Shield_016', //Lynel Shield
 		'Weapon_Shield_017', //Mighty Lynel Shield
 		'Weapon_Shield_018', //Savage Lynel Shield
-		'Weapon_Shield_021', //Rusty Shield
-		'Weapon_Shield_022', //Royal Shield
-		'Weapon_Shield_023', //Forest Dweller's Shield
-		'Weapon_Shield_025', //Zora Shield
-		'Weapon_Shield_026', //Gerudo Shield
-		'Weapon_Shield_030', //Hylian Shield
-		'Weapon_Shield_031', //Hunter's Shield
-		'Weapon_Shield_032', //Fisherman's Shield
-		'Weapon_Shield_033', //Royal Guard's Shield
-		'Weapon_Shield_034', //Emblazoned Shield
-		'Weapon_Shield_035', //Traveler's Shield
-		'Weapon_Shield_036', //Radiant Shield
-		'Weapon_Shield_037', //Daybreaker
-		'Weapon_Shield_040', //Pot Lid
-		'Weapon_Shield_041', //Shield of the Mind's Eye
-		'Weapon_Shield_042', //Kite Shield
-		'Weapon_Shield_057', //Sea-Breeze Shield
 		'Weapon_Shield_101', //Zonaite Shield
 		'Weapon_Shield_102', //Strong Zonaite Shield
 		'Weapon_Shield_103', //Mighty Zonaite Shield
-		'Weapon_Shield_107', //Old Wooden Shield
+		'Weapon_Shield_040' //Pot Lid
 	]
 };
+Equipment.WEAPONS_DECAYED_TO_PRISTINE={
+	'Weapon_Sword_106':'Weapon_Sword_001', //Traveler's Sword
+	'Weapon_Sword_112':'Weapon_Sword_002', //Soldier's Broadsword
+	'Weapon_Sword_113':'Weapon_Sword_003', //Knight's Broadsword
+	'Weapon_Sword_124':'Weapon_Sword_024', //Royal Broadsword
+	'Weapon_Sword_125':'Weapon_Sword_025', //Forest Dweller's Sword
+	'Weapon_Sword_127':'Weapon_Sword_027', //Zora Sword
+	'Weapon_Sword_129':'Weapon_Sword_029', //Gerudo Scimitar
+	'Weapon_Sword_131':'Weapon_Sword_031', //Feathered Edge
+	'Weapon_Sword_114':'Weapon_Sword_041', //Eightfold Blade
+	'Weapon_Sword_147':'Weapon_Sword_047', //Royal Guard's Sword
+	'Weapon_Sword_168':'Weapon_Sword_103', //Wooden Stick
 
+	'Weapon_Lsword_106':'Weapon_Lsword_001', //Traveler's Claymore
+	'Weapon_Lsword_112':'Weapon_Lsword_002', //Soldier's Claymore
+	'Weapon_Lsword_113':'Weapon_Lsword_003', //Knight's Claymore
+	'Weapon_Lsword_124':'Weapon_Lsword_024', //Royal Claymore
+	'Weapon_Lsword_127':'Weapon_Lsword_027', //Zora Longsword
+	'Weapon_Lsword_129':'Weapon_Lsword_029', //Gerudo Claymore
+	'Weapon_Lsword_136':'Weapon_Lsword_036', //Cobble Crusher
+	'Weapon_Lsword_114':'Weapon_Lsword_041', //Eightfold Longblade
+	'Weapon_Lsword_147':'Weapon_Lsword_047', //Royal Guard's Claymore
+	'Weapon_Lsword_168':'Weapon_Lsword_103', //Thick Stick
+	'Weapon_Lsword_174':'Weapon_Lsword_051', //Giant Boomerang
+
+	'Weapon_Spear_106':'Weapon_Spear_001', //Traveler's Spear
+	'Weapon_Spear_112':'Weapon_Spear_002', //Soldier's Spear
+	'Weapon_Spear_113':'Weapon_Spear_003', //Knight's Halberd
+	'Weapon_Spear_124':'Weapon_Spear_024', //Royal Halberd
+	'Weapon_Spear_125':'Weapon_Spear_025', //Forest Dweller's Spear
+	'Weapon_Spear_127':'Weapon_Spear_027', //Zora Spear
+	'Weapon_Spear_129':'Weapon_Spear_029', //Gerudo Spear
+	'Weapon_Spear_173':'Weapon_Spear_030', //Throwing Spear
+	'Weapon_Spear_132':'Weapon_Spear_032', //Feathered Spear
+	'Weapon_Spear_147':'Weapon_Spear_047', //Royal Guard's Spear
+	'Weapon_Spear_168':'Weapon_Spear_103' //Long Stick
+};
 
 Equipment.buildFusableItemsOptions=function(){
 	Equipment.FUSABLE_ITEMS=[
-		{value:'', name:Locale._('No fusion')}
+		{value:'', name:_('No fusion')}
 	];
 
 	Equipment.KNOWN_FUSABLE_MATERIALS.forEach(function(itemId){
-		Equipment.FUSABLE_ITEMS.push({value:itemId,name:'*'+Locale._('Material')+': '+Locale._(itemId)})
+		Equipment.FUSABLE_ITEMS.push({value:itemId,name:'*'+_('Material')+': '+_(itemId)})
 	});
 	Equipment.KNOWN_FUSABLE_OBJECTS.forEach(function(itemId){
-		Equipment.FUSABLE_ITEMS.push({value:itemId,name:Locale._('Environment')+': '+Locale._(itemId)})
+		Equipment.FUSABLE_ITEMS.push({value:itemId,name:_('Environment')+': '+_(itemId)})
 	});
 	Equipment.AVAILABILITY.weapons.forEach(function(itemId){
-		Equipment.FUSABLE_ITEMS.push({value:itemId,name:Locale._('Weapon')+': '+Locale._(itemId)})
+		Equipment.FUSABLE_ITEMS.push({value:itemId,name:_('Weapon')+': '+_(itemId)})
 	});
 	Equipment.AVAILABILITY.shields.forEach(function(itemId){
-		Equipment.FUSABLE_ITEMS.push({value:itemId,name:Locale._('Shield')+': '+Locale._(itemId)})
+		Equipment.FUSABLE_ITEMS.push({value:itemId,name:_('Shield')+': '+_(itemId)})
 	});
 	Item.AVAILABILITY.materials.forEach(function(itemId){
-		Equipment.FUSABLE_ITEMS.push({value:itemId,name:Locale._('Material')+': '+Locale._(itemId)})
+		Equipment.FUSABLE_ITEMS.push({value:itemId,name:_('Material')+': '+_(itemId)})
 	});
 	Item.AVAILABILITY.devices.forEach(function(itemId){
-		Equipment.FUSABLE_ITEMS.push({value:itemId.replace('_Capsule',''),name:Locale._('Zonai device')+': '+Locale._(itemId)})
+		Equipment.FUSABLE_ITEMS.push({value:itemId.replace('_Capsule',''),name:_('Zonai device')+': '+_(itemId)})
 	});
 }
 Equipment.KNOWN_FUSABLE_MATERIALS=[
diff --git a/zelda-totk/zelda-totk.class.horse.js b/zelda-totk/zelda-totk.class.horse.js
index 5f72f89..b035244 100644
--- a/zelda-totk/zelda-totk.class.horse.js
+++ b/zelda-totk/zelda-totk.class.horse.js
@@ -1,224 +1,154 @@
 /*
-	The legend of Zelda: Tears of the Kingdom Savegame Editor (Horse class) v20230610
+	The legend of Zelda: Tears of the Kingdom savegame editor - Horse class (last update 2023-07-08)
 
 	by Marc Robledo 2023
 	horse data thanks to JonJaded, Ozymandias07 and Karlos007
 */
 
-function Horse(index, id, name, mane, saddles, reins, bond, specialType, statsStrength, statsSpeed, statsStamina, statsPull, iconPattern, iconEyeColor){
+function Horse(itemData, overrideId){
 	this.category='horses';
-	this.index=index;
 
-	this.id=id;
-	this.name=name;
-	this.mane=mane;
-	this.saddles=saddles;
-	this.reins=reins;
-	this.bond=bond;
-	this.specialType=specialType;
-	this.statsStrength=statsStrength;
-	this.statsSpeed=statsSpeed;
-	this.statsStamina=statsStamina;
-	this.statsPull=statsPull;
-	this.iconPattern=iconPattern;
-	this.iconEyeColor=iconEyeColor;
+	this.id=itemData.id;
+	this.name=itemData.name;
+	this.mane=typeof itemData.mane==='string'? hash(itemData.mane): itemData.mane;
+	this.saddles=typeof itemData.saddles==='string'? hash(itemData.saddles): itemData.saddles;
+	this.reins=typeof itemData.reins==='string'? hash(itemData.reins): itemData.reins;
+	this.bond=itemData.bond;
+	this.bondChecked=itemData.bondChecked;
+	this.statsStrength=itemData.statsStrength;
+	this.statsSpeed=itemData.statsSpeed;
+	this.statsStamina=itemData.statsStamina;
+	this.statsPull=itemData.statsPull;
+	this.horseType=itemData.horseType;
+	this.colorType=itemData.colorType;
+	this.footType=itemData.footType;
+	this.amiiboUidHash=typeof itemData.amiiboUidHash==='string'? BigInt(itemData.amiiboUidHash) : itemData.amiiboUidHash;
+	this.roomId=itemData.roomId;
 
+	this.iconPattern=itemData.iconPattern;
+	this.iconEyeColor=itemData.iconEyeColor;
+	this.iconPrimaryColorRed=itemData.iconPrimaryColorRed;
+	this.iconPrimaryColorGreen=itemData.iconPrimaryColorGreen;
+	this.iconPrimaryColorBlue=itemData.iconPrimaryColorBlue;
+	this.iconSecondaryColorRed=itemData.iconSecondaryColorRed;
+	this.iconSecondaryColorGreen=itemData.iconSecondaryColorGreen;
+	this.iconSecondaryColorBlue=itemData.iconSecondaryColorBlue;
+	this.iconNoseColorRed=itemData.iconNoseColorRed;
+	this.iconNoseColorGreen=itemData.iconNoseColorGreen;
+	this.iconNoseColorBlue=itemData.iconNoseColorBlue;
+	this.iconHairPrimaryColorRed=itemData.iconHairPrimaryColorRed;
+	this.iconHairPrimaryColorGreen=itemData.iconHairPrimaryColorGreen;
+	this.iconHairPrimaryColorBlue=itemData.iconHairPrimaryColorBlue;
+	this.iconHairSecondaryColorRed=itemData.iconHairSecondaryColorRed;
+	this.iconHairSecondaryColorGreen=itemData.iconHairSecondaryColorGreen;
+	this.iconHairSecondaryColorBlue=itemData.iconHairSecondaryColorBlue;
+	
 	if(
-		specialType!==Horse.TYPE_NORMAL && 
-		specialType!==Horse.TYPE_ZELDA &&
-		specialType!==Horse.TYPE_EPONA &&
-		specialType!==Horse.TYPE_GIANT_BLACK &&
-		specialType!==Horse.TYPE_GIANT_WHITE &&
-		specialType!==Horse.TYPE_SPOT &&
-		specialType!==Horse.TYPE_GOLD
+		this.horseType!==Horse.TYPE_NORMAL && 
+		this.horseType!==Horse.TYPE_ZELDA &&
+		this.horseType!==Horse.TYPE_EPONA &&
+		this.horseType!==Horse.TYPE_GIANT_BLACK &&
+		this.horseType!==Horse.TYPE_GIANT_WHITE &&
+		this.horseType!==Horse.TYPE_SPOT &&
+		this.horseType!==Horse.TYPE_GOLD
 	)
-		console.warn('unknown horse['+index+'].specialType value: '+specialType);
-
-	Horse.buildHtmlElements(this);
-	this.fixValues(true);
+		console.warn('unknown horse horseType value: '+this.horseType);
 }
 
 
-Horse.prototype.fixValues=function(ignoreEquipment){
-	if(this.id==='GameRomHorseZelda'){
-		this.specialType=Horse.TYPE_ZELDA;
-		this._htmlSelectIconPattern.disabled=true;
-		this._htmlSelectIconEyeColor.disabled=true;
-		//this.temperament='wild';
-	}else if(this.id==='GameRomHorse00L'){
-		this.specialType=Horse.TYPE_GIANT_BLACK;
-		if(!ignoreEquipment){
-			this.mane=this._htmlSelectMane.value=0x9cd4f27b;
-			this.saddles=this._htmlSelectSaddles.value=0xf1435392;
-			this.reins=this._htmlSelectReins.value=0x4dbf2061;
-		}
-		this._htmlSelectIconPattern.disabled=true;
-		this._htmlSelectIconEyeColor.disabled=true;
-		//this.temperament='wild';
-	}else if(this.id==='GameRomHorse01L'){
-		this.specialType=Horse.TYPE_GIANT_WHITE;
-		if(!ignoreEquipment){
-			this.mane=this._htmlSelectMane.value=0x55365b10;
-			this.saddles=this._htmlSelectSaddles.value=0xf1435392;
-			this.reins=this._htmlSelectReins.value=0x4dbf2061;
-		}
-		this._htmlSelectIconPattern.disabled=true;
-		this._htmlSelectIconEyeColor.disabled=true;
-		//this.temperament='wild';
-	}else if(this.id==='GameRomHorseSpPattern'){
-		this.specialType=Horse.TYPE_SPOT;
-		this._htmlSelectIconPattern.disabled=true;
-		this._htmlSelectIconEyeColor.disabled=true;
-		//this.temperament='wild'; //???
-	}else if(this.id==='GameRomHorseGold'){
-		this.specialType=Horse.TYPE_GOLD;
-		this._htmlSelectIconPattern.disabled=true;
-		this._htmlSelectIconEyeColor.disabled=true;
-		//this.temperament='wild'; //???
-	}else if(this.id==='GameRomHorseEpona'){
-		this.specialType=Horse.TYPE_EPONA;
-		this._htmlSelectIconPattern.disabled=true;
-		this._htmlSelectIconEyeColor.disabled=true;
-		//this.temperament='wild'; //???
-	}else{
-		this.specialType=Horse.TYPE_NORMAL;
-		if(!ignoreEquipment && this.id==='GameRomHorse00S'){
-			this.mane=this._htmlSelectMane.value=0xbad4c4a9;
-			this.saddles=this._htmlSelectSaddles.value=0x8c5bd272;
-			this.reins=this._htmlSelectReins.value=0xe8fe6ab7;
-		}
-		this._htmlSelectIconPattern.disabled=false;
-		this._htmlSelectIconEyeColor.disabled=false;
-		//this.temperament='gentle'; //???
+Horse.prototype.getItemTranslation=function(){
+	return _(this.id);
+}
+Horse.prototype.export=function(){
+	return{
+		totkStruct:Pouch.getCategoryItemStructId(this.category),
+		id:this.id,
+		name:this.name,
+		mane:this.mane,
+		saddles:this.saddles,
+		reins:this.reins,
+		bond:this.bond,
+		bondChecked:this.bondChecked,
+		statsStrength:this.statsStrength,
+		statsSpeed:this.statsSpeed,
+		statsStamina:this.statsStamina,
+		statsPull:this.statsPull,
+		horseType:this.horseType,
+		colorType:this.colorType,
+		footType:this.footType,
+		amiiboUidHash:this.amiiboUidHash.toString(),
+		roomId:this.roomId,
+
+		iconPattern:this.iconPattern,
+		iconEyeColor:this.iconEyeColor,
+		iconPrimaryColorRed:this.iconPrimaryColorRed,
+		iconPrimaryColorGreen:this.iconPrimaryColorGreen,
+		iconPrimaryColorBlue:this.iconPrimaryColorBlue,
+		iconSecondaryColorRed:this.iconSecondaryColorRed,
+		iconSecondaryColorGreen:this.iconSecondaryColorGreen,
+		iconSecondaryColorBlue:this.iconSecondaryColorBlue,
+		iconNoseColorRed:this.iconNoseColorRed,
+		iconNoseColorGreen:this.iconNoseColorGreen,
+		iconNoseColorBlue:this.iconNoseColorBlue,
+		iconHairPrimaryColorRed:this.iconHairPrimaryColorRed,
+		iconHairPrimaryColorGreen:this.iconHairPrimaryColorGreen,
+		iconHairPrimaryColorBlue:this.iconHairPrimaryColorBlue,
+		iconHairSecondaryColorRed:this.iconHairSecondaryColorRed,
+		iconHairSecondaryColorGreen:this.iconHairSecondaryColorGreen,
+		iconHairSecondaryColorBlue:this.iconHairSecondaryColorBlue
 	}
 }
-Horse.prototype.getItemTranslation=function(){
-	return Locale._(this.id);
-}
-Horse.prototype.save=function(){
-	SavegameEditor.writeString64('OwnedHorseList.ActorName', this.index, this.id);
-	SavegameEditor.writeStringUTF8('OwnedHorseList.Name', this.index, this.name);
-	SavegameEditor.writeU32('OwnedHorseList.Mane', this.index, this.mane);
-	SavegameEditor.writeU32('OwnedHorseList.Saddle', this.index, this.saddles);
-	SavegameEditor.writeU32('OwnedHorseList.Rein', this.index, this.reins);
-	SavegameEditor.writeF32('OwnedHorseList.Familiarity', this.index, this.bond);
-	SavegameEditor.writeU32('OwnedHorseList.HorseType', this.index, this.specialType);
-	SavegameEditor.writeU32('OwnedHorseList.Toughness', this.index, this.statsStrength);
-	SavegameEditor.writeU32('OwnedHorseList.Speed', this.index, this.statsSpeed);
-	SavegameEditor.writeU32('OwnedHorseList.ChargeNum', this.index, this.statsStamina);
-	SavegameEditor.writeU32('OwnedHorseList.HorsePower', this.index, this.statsPull);
-	SavegameEditor.writeU32('OwnedHorseList.Body.Pattern', this.index, this.iconPattern);
-	SavegameEditor.writeU32('OwnedHorseList.Body.EyeColor', this.index, this.iconEyeColor);
+Horse.prototype.refreshHtmlInputs=function(fixValues, ignoreEquipment){
+	if(fixValues){
+		var defaultValues=Horse.DEFAULT_VALUES[this.id] || Horse.DEFAULT_VALUES['GameRomHorse'];
+		if(defaultValues.horseType)
+			this.horseType=defaultValues.horseType;
+		if(defaultValues.mane)
+			this.mane=defaultValues.mane;
+		if(defaultValues.saddles)
+			this.saddles=defaultValues.saddles;
+		if(defaultValues.reins)
+			this.reins=defaultValues.reins;
+	}
+	this._htmlInputs.colorType.disabled=(this.horseType!==Horse.TYPE_NORMAL);
+	this._htmlInputs.footType.disabled=(this.horseType!==Horse.TYPE_NORMAL);
 }
 
+
+
 Horse.buildHtmlElements=function(item){
-	//build html elements
-	item._htmlInputName=input('name-'+item.category+'-'+item.index, item.name);
-	item._htmlInputName.addEventListener('change', function(){
-		var newVal=this.value;
-		if(newVal.length>9)
-			newVal=newVal.substr(0,9);
-		if(!newVal)
-			newVal='a';
-		item.name=newVal;
-	});
-	item._htmlInputName.title=Locale._('Horse name');
-	item._htmlInputName.maxLength=9;
-
-	item._htmlSelectMane=select('horse-mane-'+item.index, Horse.MANES, function(){
-		item.mane=this.value;
-	}, item.mane);
-	item._htmlSelectMane.title=Locale._('Mane');
-
-	item._htmlSelectSaddles=select('horse-saddles-'+item.index, Horse.SADDLES, function(){
-		item.saddles=this.value;
-	}, item.saddles);
-	item._htmlSelectSaddles.title=Locale._('Saddle');
-
-	item._htmlSelectReins=select('horse-reins-'+item.index, Horse.REINS, function(){
-		item.reins=this.value;
-	}, item.reins);
-	item._htmlSelectReins.title=Locale._('Reins');
-
-	item._htmlInputBond=inputFloat('bond-'+item.category+'-'+item.index,0,100,item.bond*100);
-	item._htmlInputBond.addEventListener('change', function(){
-		item.bond=parseFloat(this.value) / 100;
-	});
-	item._htmlInputBond.title=Locale._('Bond');
-
-
-	var stats=[
-		{value:1, name:'★★'},
-		{value:2, name:'★★★'},
-		{value:3, name:'★★★★'},
-		{value:4, name:'★★★★★'}
-	];
-	var statsStamina=[
-		{value:2, name:'★★'},
-		{value:3, name:'★★★'},
-		{value:4, name:'★★★★'},
-		{value:5, name:'★★★★★'},
-		{value:0, name:'Infinite'}
-	];
-	item._htmlInputStatsStrength=inputNumber('horse-stats-strength-'+item.index,100,350,item.statsStrength);
-	item._htmlInputStatsStrength.addEventListener('change', function(){
-		item.statsStrength=parseInt(this.value);
-	});
-	item._htmlInputStatsStrength.title=Locale._('Stats: Strength');
-	item._htmlSelectStatsSpeed=select('horse-stats-speed-'+item.index, stats, function(){
-		item.statsSpeed=parseInt(this.value);
-	}, item.statsSpeed);
-	item._htmlSelectStatsSpeed.title=Locale._('Stats: Speed');
-	item._htmlSelectStatsStamina=select('horse-stats-stamina-'+item.index, statsStamina, function(){
-		item.statsStamina=parseInt(this.value);
-	}, item.statsStamina);
-	item._htmlSelectStatsStamina.title=Locale._('Stats: Stamina');
-	item._htmlSelectStatsPull=select('horse-stats-pull-'+item.index, stats, function(){
-		item.statsPull=parseInt(this.value);
-	}, item.statsPull);
-	item._htmlSelectStatsPull.title=Locale._('Stats: Pull');
-
-
-
-
-	item._htmlSelectIconPattern=select('horse-icon-pattern-'+item.index, Horse.ICON_PATTERNS, function(){
-		item.iconPattern=parseInt(this.value);
-	}, item.iconPattern);
-	item._htmlSelectIconPattern.title=Locale._('Icon: pattern');
-
-	item._htmlSelectIconEyeColor=select('horse-icon-eye-color-'+item.index, Horse.ICON_EYE_COLORS, function(){
-		item.iconEyeColor=parseInt(this.value);
-	}, item.iconEyeColor);
-	item._htmlSelectIconEyeColor.title=Locale._('Icon: eye color');
+	item._htmlInputs={
+		name:Pouch.createItemInput(item, 'name', 'WString16', {maxLength:9, label:_('Horse name')}),
+		mane:Pouch.createItemInput(item, 'mane', 'Enum', {enumValues:Horse.MANES, label:_('Mane')}),
+		saddles:Pouch.createItemInput(item, 'saddles', 'Enum', {enumValues:Horse.SADDLES, label:_('Saddle')}),
+		reins:Pouch.createItemInput(item, 'reins', 'Enum', {enumValues:Horse.REINS, label:_('Reins')}),
+		bond:Pouch.createItemInput(item, 'bond', 'Float', {min:0, max:100, label:_('Bond')}),
+		statsStrength:Pouch.createItemInput(item, 'statsStrength', 'Int', {min:100, max:350, label:_('Stats: Strength')}),
+		statsSpeed:Pouch.createItemInput(item, 'statsSpeed', 'Int', {enumValues:Horse.OPTIONS_STATS, label:_('Stats: Speed')}),
+		statsStamina:Pouch.createItemInput(item, 'statsStamina', 'Int', {enumValues:Horse.OPTIONS_STATS_STAMINA, label:_('Stats: Stamina')}),
+		statsPull:Pouch.createItemInput(item, 'statsPull', 'Int', {enumValues:Horse.OPTIONS_STATS, label:_('Stats: Pull')}),
+		//horseType:Pouch.createItemInput(item, 'horseType', 'Int', {min:1, max:100, label:_('Horse type')}),
+		colorType:Pouch.createItemInput(item, 'colorType', 'Int', {min:1, max:100, label:_('Horse color')}),
+		footType:Pouch.createItemInput(item, 'footType', 'Int', {min:0, max:1, label:_('Foot type')})
+	};
 }
 
-Horse.readAll=function(){
-	var horsesIds=SavegameEditor.readString64Array('OwnedHorseList.ActorName');
-	var validHorses=[];
-	for(var i=0; i<horsesIds.length; i++){
-		if(horsesIds[i]){
-			validHorses.push(new Horse(
-				i,
-				horsesIds[i],
-				SavegameEditor.readStringUTF8('OwnedHorseList.Name', i),
-				SavegameEditor.readU32('OwnedHorseList.Mane', i),
-				SavegameEditor.readU32('OwnedHorseList.Saddle', i),
-				SavegameEditor.readU32('OwnedHorseList.Rein', i),
-				SavegameEditor.readF32('OwnedHorseList.Familiarity', i),
-				SavegameEditor.readU32('OwnedHorseList.HorseType', i),
-				SavegameEditor.readU32('OwnedHorseList.Toughness', i),
-				SavegameEditor.readU32('OwnedHorseList.Speed', i),
-				SavegameEditor.readU32('OwnedHorseList.ChargeNum', i),
-				SavegameEditor.readU32('OwnedHorseList.HorsePower', i),
-				SavegameEditor.readU32('OwnedHorseList.Body.Pattern', i),
-				SavegameEditor.readU32('OwnedHorseList.Body.EyeColor', i)
-			));
-		}
-	}
-	return validHorses;
-}
 
+Horse.OPTIONS_STATS=[
+	{value:1, name:'★★'},
+	{value:2, name:'★★★'},
+	{value:3, name:'★★★★'},
+	{value:4, name:'★★★★★'}
+];
+Horse.OPTIONS_STATS_STAMINA=[
+	{value:2, name:'★★'},
+	{value:3, name:'★★★'},
+	{value:4, name:'★★★★'},
+	{value:5, name:'★★★★★'},
+	{value:0, name:_('Infinite')}
+];
 Horse.AVAILABILITY=[
+	'GameRomHorse',
 	'GameRomHorse00',
 	'GameRomHorse01',
 	'GameRomHorse02',
@@ -257,11 +187,10 @@ Horse.AVAILABILITY=[
 	'GameRomHorseBone_AllDay',
 	'GameRomHorseForStreetVender',
 	'GameRomHorseNushi'
-	//'Animal_Bear_A',
-	//'Animal_Bear_B'
 ];
 
 
+
 Horse.TYPE_NORMAL=1; //normal
 Horse.TYPE_ZELDA=3; //Royal White Stallion
 Horse.TYPE_EPONA=4; //Epona
@@ -270,63 +199,112 @@ Horse.TYPE_GIANT_WHITE=13; //01L (Giant White Stallion)
 Horse.TYPE_GOLD=12; //Gold
 Horse.TYPE_SPOT=8; //SpPattern
 
-Horse.ICON_PATTERNS=[
-	{value:0x8ff7b62d, name:'00'}, //00
-	{value:0x61ec6600, name:'01'}, //01
-	{value:0x43caa47b, name:'02'}, //02
-	{value:0xb8872476, name:'03'}, //03
-	{value:0xfdcaa775, name:'04'}, //04
-	{value:0xb28f2118, name:'05'}, //05
-	{value:0xe7fc193e, name:'06 (Special: Gold)'}, //06	
-];
-Horse.ICON_EYE_COLORS=[
-	{value:0x6cbc3cb4, name:'Black'},
-	{value:0xe2911aba, name:'Blue'}
-];
+Horse.TYPE_DEER=0; //deer
+Horse.TYPE_DONKEY=7; //Donkey
+Horse.TYPE_STALHORSE=5; //Stalhorse
+Horse.TYPE_LORD=9; //Lord of the mountain
+Horse.TYPE_BEAR=10; //Bear
+
+Horse.DEFAULT_VALUES={
+	GameRomHorse:{
+		horseType:Horse.TYPE_NORMAL
+	},
+	GameRomHorseZelda:{
+		horseType:Horse.TYPE_ZELDA
+	},
+	GameRomHorseSpPattern:{
+		horseType:Horse.TYPE_SPOT
+	},
+	GameRomHorseGold:{
+		horseType:Horse.TYPE_GOLD
+	},
+	GameRomHorseEpona:{
+		horseType:Horse.TYPE_EPONA
+	},
+	GameRomHorse00L:{
+		horseType:Horse.TYPE_GIANT_BLACK,
+		mane:hash('Horse_Link_Mane_00L'),
+		saddles:hash('GameRomHorseSaddle_00L'),
+		reins:hash('GameRomHorseReins_00L')
+	},
+	GameRomHorse01L:{
+		horseType:Horse.TYPE_GIANT_WHITE,
+		mane:hash('Horse_Link_Mane_01L'),
+		saddles:hash('GameRomHorseSaddle_00L'),
+		reins:hash('GameRomHorseReins_00L')
+	},
+	GameRomHorse00S:{
+		//horseType:Horse.TYPE_DONKEY,
+		horseType:Horse.TYPE_NORMAL,
+		mane:hash('Horse_Link_Mane_00S'),
+		saddles:hash('GameRomHorseSaddle_00S'),
+		reins:hash('GameRomHorseReins_00S')
+	},
+	GameRomHorseBone:{
+		horseType:Horse.TYPE_STALHORSE
+	},
+	GameRomHorseBone_AllDay:{
+		horseType:Horse.TYPE_STALHORSE
+	},
+	GameRomHorseNushi:{
+		horseType:Horse.TYPE_LORD
+	}
+}
+
+
+/*Horse.ICON_PATTERNS=[
+	{value:hash('00'), name:'00'},
+	{value:hash('01'), name:'01'},
+	{value:hash('02'), name:'02'},
+	{value:hash('03'), name:'03'},
+	{value:hash('04'), name:'04'},
+	{value:hash('05'), name:'05'},
+	{value:hash('06'), name:'06 (Special: Gold)'}
+];*/
 Horse.MANES=[
-	{value:0xb6eede09, name:'None'}, //None
-	{value:0xb93d9e3b, name:'Normal Mane'}, //Horse_Link_Mane
-	{value:0x3a84d601, name:'Mane 01'}, //Horse_Link_Mane_01
-	{value:0x0bffd92a, name:'Mane 02'}, //Horse_Link_Mane_02
-	{value:0xe8125091, name:'Mane 03'}, //Horse_Link_Mane_03
-	{value:0xfdb103b2, name:'Mane 04'}, //Horse_Link_Mane_04
-	{value:0x75677ada, name:'Mane 05'}, //Horse_Link_Mane_05
-	{value:0x9cbf81f2, name:'Mane 06'}, //Horse_Link_Mane_06
-	{value:0x8140f2f9, name:'Mane 07'}, //Horse_Link_Mane_07
-	{value:0xd749201c, name:'Mane 08'}, //Horse_Link_Mane_08
-	{value:0xac2a896d, name:'Mane 09'}, //Horse_Link_Mane_09
-	{value:0x87d9391f, name:'Mane 10'}, //Horse_Link_Mane_10
-	{value:0xd6a61738, name:'Mane 11'}, //Horse_Link_Mane_11
-	{value:0x12dd95d6, name:'Mane 12'}, //Horse_Link_Mane_12
-	{value:0x9cd4f27b, name:'Giant black mane'}, //Horse_Link_Mane_00L
-	{value:0x55365b10, name:'Giant white mane'}, //Horse_Link_Mane_01L
-	{value:0xbad4c4a9, name:'*Donkey mane'} //Horse_Link_Mane_00S
-];
-Horse.SADDLES=[
-	//{value:0xb6eede09, name:'None'}, //None
-	{value:0x8573ae34, name:'Stable Saddle'}, //GameRomHorseSaddle_00
-	{value:0x04c6c17b, name:'Traveler\'s Saddle'}, //GameRomHorseSaddle_01
-	{value:0x47d0c84e, name:'Royal Saddle'}, //GameRomHorseSaddle_02
-	{value:0xaeab565a, name:'Knight\'s Saddle'}, //GameRomHorseSaddle_03
-	{value:0xcf167805, name:'Monster Saddle'}, //GameRomHorseSaddle_04
-	{value:0x6e2db559, name:'Extravagant Saddle'}, //GameRomHorseSaddle_05
-	{value:0xb926ed8b, name:'Towing Harness'}, //GameRomHorseSaddle_07
-	{value:0xf1435392, name:'Giant Saddle'}, //GameRomHorseSaddle_00L
-	{value:0x7feaa5c0, name:'*Saddle 06'}, //GameRomHorseSaddle_06
-	{value:0x8c5bd272, name:'*Donkey Saddle'} //GameRomHorseSaddle_00S
-	//{value:0xdeadbeef, name:'*Saddle 07_ExternalCoupler'}, //GameRomHorseSaddle_07_ExternalCoupler
-	//{value:0xdeadbeef, name:'*Towing Harness (+ wagon)'}, //GameRomHorseSaddle_07_WithWagon
-	//{value:0xdeadbeef, name:'*Saddle 00S_AncientAssistant'} //GameRomHorseSaddle_00S_AncientAssistant
-];
-Horse.REINS=[
-	//{value:0xb6eede09, name:'None'}, //None
-	{value:0x1864234b, name:'Stable Bridle'}, //GameRomHorseReins_00
-	{value:0x094f807a, name:'Traveler\'s Bridle'}, //GameRomHorseReins_01
-	{value:0xe54abe55, name:'Royal Reins'}, //GameRomHorseReins_02
-	{value:0x0200441d, name:'Knight\'s Bridle'}, //GameRomHorseReins_03
-	{value:0x85610de7, name:'Monster Bridle'}, //GameRomHorseReins_04
-	{value:0xbdc6a58b, name:'Extravagant Bridle'}, //GameRomHorseReins_05
-	{value:0x4dbf2061, name:'Giant Bridle'}, //GameRomHorseReins_00L
-	{value:0x79c2c72f, name:'*Bridle 06'}, //GameRomHorseReins_06
-	{value:0xe8fe6ab7, name:'*Donkey Bridle'} //GameRomHorseReins_00S
+	{value:hash('None'), name:'None'},
+	{value:hash('Horse_Link_Mane'), name:'Normal Mane'},
+	{value:hash('Horse_Link_Mane_01'), name:'Mane 01'},
+	{value:hash('Horse_Link_Mane_02'), name:'Mane 02'},
+	{value:hash('Horse_Link_Mane_03'), name:'Mane 03'},
+	{value:hash('Horse_Link_Mane_04'), name:'Mane 04'},
+	{value:hash('Horse_Link_Mane_05'), name:'Mane 05'},
+	{value:hash('Horse_Link_Mane_06'), name:'Mane 06'},
+	{value:hash('Horse_Link_Mane_07'), name:'Mane 07'},
+	{value:hash('Horse_Link_Mane_08'), name:'Mane 08'},
+	{value:hash('Horse_Link_Mane_09'), name:'Mane 09'},
+	{value:hash('Horse_Link_Mane_10'), name:'Mane 10'},
+	{value:hash('Horse_Link_Mane_11'), name:'Mane 11'},
+	{value:hash('Horse_Link_Mane_12'), name:'Mane 12'},
+	{value:hash('Horse_Link_Mane_00L'), name:'Giant black mane'},
+	{value:hash('Horse_Link_Mane_01L'), name:'Giant white mane'},
+	{value:hash('Horse_Link_Mane_00S'), name:'*Donkey mane'}
 ];
+
+Horse.buildHorseOptions=function(){
+	Horse.SADDLES=[
+		{value:hash('None'), name:_('None')},
+		{value:hash('GameRomHorseSaddle_00'), name:_('GameRomHorseSaddle_00')},
+		{value:hash('GameRomHorseSaddle_01'), name:_('GameRomHorseSaddle_01')},
+		{value:hash('GameRomHorseSaddle_02'), name:_('GameRomHorseSaddle_02')},
+		{value:hash('GameRomHorseSaddle_03'), name:_('GameRomHorseSaddle_03')},
+		{value:hash('GameRomHorseSaddle_04'), name:_('GameRomHorseSaddle_04')},
+		{value:hash('GameRomHorseSaddle_05'), name:_('GameRomHorseSaddle_05')},
+		{value:hash('GameRomHorseSaddle_06'), name:_('GameRomHorseSaddle_06')},
+		{value:hash('GameRomHorseSaddle_07'), name:_('GameRomHorseSaddle_07')},
+		{value:hash('GameRomHorseSaddle_00L'), name:_('GameRomHorseSaddle_00L')},
+		{value:hash('GameRomHorseSaddle_00S'), name:_('GameRomHorseSaddle_00S')}
+	];
+	Horse.REINS=[
+		{value:hash('None'), name:_('None')},
+		{value:hash('GameRomHorseReins_00'), name:_('GameRomHorseReins_00')},
+		{value:hash('GameRomHorseReins_01'), name:_('GameRomHorseReins_01')},
+		{value:hash('GameRomHorseReins_02'), name:_('GameRomHorseReins_02')},
+		{value:hash('GameRomHorseReins_03'), name:_('GameRomHorseReins_03')},
+		{value:hash('GameRomHorseReins_04'), name:_('GameRomHorseReins_04')},
+		{value:hash('GameRomHorseReins_05'), name:_('GameRomHorseReins_05')},
+		{value:hash('GameRomHorseReins_06'), name:_('GameRomHorseReins_06')},
+		{value:hash('GameRomHorseReins_00L'), name:_('GameRomHorseReins_00L')},
+		{value:hash('GameRomHorseReins_00S'), name:_('GameRomHorseReins_00S')}
+	];
+}
\ No newline at end of file
diff --git a/zelda-totk/zelda-totk.class.item.js b/zelda-totk/zelda-totk.class.item.js
index f755613..fe0e124 100644
--- a/zelda-totk/zelda-totk.class.item.js
+++ b/zelda-totk/zelda-totk.class.item.js
@@ -1,152 +1,136 @@
 /*
-	The legend of Zelda: Tears of the Kingdom Savegame Editor (Item class) v20230612
+	The legend of Zelda: Tears of the Kingdom savegame editor - Item class (last update 2023-07-08)
 
 	by Marc Robledo 2023
 	item names compiled by Echocolat, Exincracci, HylianLZ and Karlos007
 */
 
-function Item(catId, index, id, quantity, foodEffect, foodEffectHearts, foodEffectMultiplier, foodEffectTime, foodPrice){
+function Item(catId, itemData, overrideId){
 	this.category=catId;
-	this.index=index;
-	this.removable=catId!=='arrows';
 
-	this.id=id;
-	this.quantity=typeof quantity==='number'? quantity : 1;
+	this.id=overrideId || itemData.id;
+	this.quantity=typeof itemData.quantity==='number'? itemData.quantity : 1;
 
-	if(catId==='food'){
-		this.foodEffect=typeof foodEffect==='number'? foodEffect : Item.FOOD_EFFECTS[0].value;
-		this.foodEffectHearts=typeof foodEffectHearts==='number'? foodEffectHearts : 4;
-		this.foodEffectMultiplier=typeof foodEffectMultiplier==='number'? foodEffectMultiplier : 0;
-		this.foodEffectTime=typeof foodEffectTime==='number'? foodEffectTime : 0;
-		this.foodPrice=typeof foodPrice==='number'? foodPrice : 1;
+	if(catId==='materials'){
+		this.getOrder=typeof itemData.getOrder==='number'? itemData.getOrder : 0;
+		this.useOrder=typeof itemData.useOrder==='number'? itemData.useOrder : 0;
+	}else if(catId==='devices'){
+		this.useOrder=typeof itemData.useOrder==='number'? itemData.useOrder : 0;
+	}else if(catId==='food'){
+		this.heartsHeal=typeof itemData.heartsHeal==='number'? itemData.heartsHeal : 4;
+		this.effect=Variable.enumToInt(itemData.effect);
+		this.effectMultiplier=typeof itemData.effectMultiplier==='number'? itemData.effectMultiplier : 0;
+		this.effectTime=typeof itemData.effectTime==='number'? itemData.effectTime : 0;
+		this.price=typeof itemData.price==='number'? itemData.price : 1;
+		this.recipe=typeof itemData.recipe==='object' && itemData.recipe.length===5? itemData.recipe : ['','','','',''];
 	}
-	Item.buildHtmlElements(this);
 }
 
 Item.prototype.getItemTranslation=function(){
-	return Locale._(this.id);
+	return _(this.id);
 }
-Item.prototype.copy=function(index, newId){
-	var quantity;
-	if(this.category==='key'){
-		if(Item.KEY_COUNTABLE.indexOf(newId)===-1){
-			quantity=0xffffffff; //-1
-		}else{
-			quantity=1;
+Item.prototype.export=function(){
+	if(this.category==='materials'){
+		return{
+			totkStruct:Pouch.getCategoryItemStructId(this.category),
+			id:this.id,
+			quantity:this.quantity,
+			getOrder:this.getOrder,
+			useOrder:this.useOrder
+		}
+	}else if(this.category==='devices'){
+		return{
+			totkStruct:Pouch.getCategoryItemStructId(this.category),
+			id:this.id,
+			quantity:this.quantity,
+			useOrder:this.useOrder
+		}
+	}else if(this.category==='arrows' || this.category==='key'){
+		return{
+			totkStruct:Pouch.getCategoryItemStructId(this.category),
+			id:this.id,
+			quantity:this.quantity
+		}
+	}else if(this.category==='food'){
+		return{
+			totkStruct:Pouch.getCategoryItemStructId(this.category),
+			id:this.id,
+			quantity:this.quantity,
+			heartsHeal:this.heartsHeal,
+			effect:this.effect,
+			effectMultiplier:this.effectMultiplier,
+			effectTime:this.effectTime,
+			price:this.price,
+			recipe:this.recipe
 		}
 	}else{
-		quantity=this.quantity;
+		throw new Error('Invalid item category');
+	}
+}
+Item.prototype.refreshHtmlInputs=function(fixValues){
+	var isCountable=this.category !== 'key' || Item.KEY_COUNTABLE.indexOf(this.id)!==-1;
+	if(fixValues){
+		if(this.category==='food'){
+			if(this.lastInputChanged==='effect'){
+				if(this.id==='Item_Cook_C_17' && Item.VALID_ELIXIR_EFFECTS.indexOf(hashReverse(this.effect))!==-1)
+					Pouch.updateItemIcon(this);
+				if(this.effect===hash('None')){
+					this.effectMultiplier=0;
+					this.effectTime=0;
+				}
+			}
+		}else if(this.category==='key'){
+			if(isCountable && this.quantity<1)
+				this.quantity=1;
+			else if(!isCountable && this.lastInputChanged==='id')
+				this.quantity=-1;
+		}
+	}
+
+
+	this._htmlInputs.quantity.disabled=!isCountable;
+	//this._htmlInputs.quantity.style.visibility=this._htmlInputs.quantity.disabled? 'hidden':'visible';
+
+	if(this.category==='food' && (!fixValues || this.lastInputChanged==='effect')){
+		var effectText;
+		try{
+			effectText=hashReverse(this.effect);
+		}catch(err){
+			effectText='None';
+		}
+
+		if(effectText && effectText!=='None')
+			this._htmlInputs.effectMultiplier.style.backgroundImage='url(assets/tokt_ui_icons/bonus_'+effectText+'.svg)';
+		else
+			this._htmlInputs.effectMultiplier.style.backgroundImage='none';
+
+		this._htmlInputs.effectMultiplier.disabled=this._htmlInputs.effectTime.disabled=(!effectText || effectText==='None');
 	}
-	return new Item(
-		this.category,
-		index,
-		typeof newId==='string'? newId : this.id,
-		quantity,
-		this.category==='food'? this.foodEffect : null,
-		this.category==='food'? this.foodEffectHearts : null,
-		this.category==='food'? this.foodEffectMultiplier : null,
-		this.category==='food'? this.foodEffectTime : null,
-		this.category==='food'? this.foodPrice : null
-	);
 }
 
-Item.prototype.save=function(){
-	var categoryHash=getInternalCategoryId(this.category);
-	SavegameEditor.writeString64('Pouch.'+categoryHash+'.Content.Name', this.index, this.id);
-	SavegameEditor.writeU32('Pouch.'+categoryHash+'.Content.StockNum', this.index, this.quantity);
-	if(this.category==='food'){
-		SavegameEditor.writeU32('Pouch.Food.Content.Effect.Type', this.index, this.foodEffect);
-		SavegameEditor.writeU32('Pouch.Food.Content.LifeRecover', this.index, this.foodEffectHearts);
-		SavegameEditor.writeU32('Pouch.Food.Content.Effect.Level', this.index, this.foodEffectMultiplier);
-		SavegameEditor.writeU32('Pouch.Food.Content.Effect.Time', this.index, this.foodEffectTime);
-		SavegameEditor.writeU32('Pouch.Food.Content.Price', this.index, this.foodPrice);
-	}
-}
 
 
 
 Item.buildHtmlElements=function(item){
-	//build html elements
-	var maxValue=Item.MAXIMUM_QUANTITY[item.id] || 999;
-	item._htmlInputQuantity=inputNumber('item-quantity-'+item.category+'-'+item.index, 1, maxValue, item.quantity);
-	item._htmlInputQuantity.addEventListener('change', function(){
-		var newVal=parseInt(this.value);
-		if(!isNaN(newVal) && newVal>0)
-			item.quantity=newVal;
-	});
-	item._htmlInputQuantity.dataset.translateTitle='Quantity';
-	item._htmlInputQuantity.title=Locale._('Quantity');
-
+	var maxQuantity=Item.MAXIMUM_QUANTITY[item.id] || 999;
 
 	if(item.category==='food'){
-		item._htmlSelectFoodEffect=select('item-food-effects-'+item.category+'-'+item.index, Item.FOOD_EFFECTS, function(){
-			item.foodEffect=parseInt(this.value);
-		}, item.foodEffect);
-		item._htmlSelectFoodEffect.dataset.translateTitle='Food effect';
-		item._htmlSelectFoodEffect.title=Locale._('Food effect');
-
-		item._htmlInputFoodEffectHearts=inputNumber('item-food-effects-hearts-'+item.category+'-'+item.index, 0, 40*4, item.foodEffectHearts);
-		item._htmlInputFoodEffectHearts.addEventListener('change', function(){
-			var newVal=parseInt(this.value);
-			if(!isNaN(newVal) && newVal>0)
-				item.foodEffectHearts=newVal;
-		});
-		item._htmlInputFoodEffectHearts.dataset.translateTitle='Heart quarters heal';
-		item._htmlInputFoodEffectHearts.title=Locale._('Heart quarters heal');
-
-		item._htmlInputFoodEffectMultiplier=inputNumber('item-food-effects-multiplier-'+item.category+'-'+item.index, 1, 250, item.foodEffectMultiplier);
-		item._htmlInputFoodEffectMultiplier.addEventListener('change', function(){
-			var newVal=parseInt(this.value);
-			if(!isNaN(newVal) && newVal>0)
-				item.foodEffectMultiplier=newVal;
-		});
-		item._htmlInputFoodEffectMultiplier.dataset.translateTitle='Multiplier';
-		item._htmlInputFoodEffectMultiplier.title=Locale._('Multiplier');
-
-		item._htmlInputFoodEffectTime=inputNumber('item-food-effects-time-'+item.category+'-'+item.index, 0, 59999, item.foodEffectTime);
-		item._htmlInputFoodEffectTime.addEventListener('change', function(){
-			var newVal=parseInt(this.value);
-			if(!isNaN(newVal) && newVal>=0)
-				item.foodEffectTime=newVal;
-		});
-		item._htmlInputFoodEffectTime.dataset.translateTitle='Duration (in seconds)';
-		item._htmlInputFoodEffectTime.title=Locale._('Duration (in seconds)');
-
-
-		item._htmlInputFoodPrice=inputNumber('item-food-price-'+item.category+'-'+item.index, 1, 999999, item.foodPrice);
-		item._htmlInputFoodPrice.addEventListener('change', function(){
-			var newVal=parseInt(this.value);
-			if(!isNaN(newVal) && newVal>0)
-				item.foodPrice=newVal;
-		});
-		item._htmlInputFoodPrice.dataset.translateTitle='Price';
-		item._htmlInputFoodPrice.title=Locale._('Price');
+		item._htmlInputs={
+			quantity:Pouch.createItemInput(item, 'quantity', 'Int', {min:1, max:maxQuantity, label:_('Quantity')}),
+			heartsHeal:Pouch.createItemInput(item, 'heartsHeal', 'Int', {min:-1, max:40*4, label:_('Heart quarters heal')}),
+			effect:Pouch.createItemInput(item, 'effect', 'Enum', {enumValues:Item.FOOD_EFFECTS, label:_('Food effect')}),
+			effectMultiplier:Pouch.createItemInput(item, 'effectMultiplier', 'Int', {min:-1, max:250, label:_('Multiplier')}),
+			effectTime:Pouch.createItemInput(item, 'effectTime', 'Int', {min:-1, max:59999, label:_('Duration (in seconds)')}),
+			price:Pouch.createItemInput(item, 'price', 'Int', {min:1, max:999999, label:_('Price')})
+		};
+		item._htmlInputs.effectMultiplier.className+=' with-icon';
+	}else{
+		item._htmlInputs={
+			quantity:Pouch.createItemInput(item, 'quantity', 'Int', {min:-1, max:maxQuantity, label:_('Quantity')})
+		};
 	}
 }
 
-Item.readAll=function(catId){
-	var categoryHash=getInternalCategoryId(catId);
-	var itemIds=SavegameEditor.readString64Array('Pouch.'+categoryHash+'.Content.Name');
-	var isFood=(catId==='food');
-	var validItems=[];
-	for(var i=0; i<itemIds.length; i++){
-		if(itemIds[i]){
-			validItems.push(new Item(
-				catId,
-				i,
-				itemIds[i],
-				SavegameEditor.readU32('Pouch.'+categoryHash+'.Content.StockNum', i),
-				isFood? SavegameEditor.readU32('Pouch.Food.Content.Effect.Type', i) : null,
-				isFood? SavegameEditor.readU32('Pouch.Food.Content.LifeRecover', i) : null,
-				isFood? SavegameEditor.readU32('Pouch.Food.Content.Effect.Level', i) : null,
-				isFood? SavegameEditor.readU32('Pouch.Food.Content.Effect.Time', i) : null,
-				isFood? SavegameEditor.readU32('Pouch.Food.Content.Price', i) : null
-			));
-		}
-	}
-	return validItems;
-}
-
 
 Item.MAXIMUM_QUANTITY={
 	Item_Ore_L:999999, //Zonaite
@@ -173,179 +157,46 @@ Item.KEY_COUNTABLE=[
 
 
 
-Item.FOOD_EFFECTS=[
-{name:'None', value:0xb6eede09}, //None
-{name:'Heat Resistance', value:0x1df7a011}, //ResistHot
-{name:'Flame Guard', value:0x11383afd}, //ResistBurn
-{name:'Cold Resistance', value:0x9b6d98fb}, //ResistCold
-{name:'Shock Resistance', value:0x183cd822}, //ResistElectric
-{name:'Lightning Proof', value:0x25293142}, //ResitLightning
-{name:'UnFreezable', value:0xf5e2a20c}, //ResistFreeze
-//{name:'*ResistAncient', value:0xe53962df},
-{name:'Swim Speed Up', value:0x67866c6d}, //SwimSpeedUp
-{name:'Swim Dash Stamina Up', value:0x87645022}, //DecreaseSwimStamina
-//{name:'*SpinAttack', value:0x1e082215},
-//{name:'*ClimbWaterfall', value:0x9119b797},
-{name:'Climb Speed Up', value:0xdc7faf6e}, //ClimbSpeedUp
-//{name:'*ClimbSpeedUpOnlyHorizontaly', value:0x81e9dab0},
-{name:'Attack Up', value:0xa9384c6c}, //AttackUp
-{name:'Cold Weather Attack Up', value:0x4a3e58f6}, //AttackUpCold
-{name:'Hot Weather Attack Up', value:0x4c6a85d2}, //AttackUpHot
-{name:'Stormy Weather Attack Up', value:0xff347a38}, //AttackUpThunderstorm
-//{name:'*AttackUpDark', value:0xa2d97a77},
-//{name:'*AttackUpBone', value:0x51f5ed93},
-{name:'Stealth Up', value:0x74141898}, //QuietnessUp
-{name:'Sand Speed Up', value:0x9add92a3}, //SandMoveUp
-{name:'Snow Speed Up', value:0x33261e44}, //SnowMoveUp
-//{name:'*WakeWind', value:0x29e7073a},
-//{name:'*TwiceJump', value:0xca81b8ab},
-//{name:'*EmergencyAvoid', value:0x8674a913},
-{name:'Defense Up', value:0xa0a00c0e}, //DefenseUp
-{name:'Speed Up', value:0xb3f6b87a}, //AllSpeed
-{name:'Gloom Resistance', value:0x4d1e8af4}, //MiasmaGuard
-//{name:'*MaskBokoblin', value:0x6b9c735f},
-//{name:'*MaskMoriblin', value:0xcd1c7892},
-//{name:'*MaskLizalfos', value:0x18c0a6f1},
-//{name:'*MaskLynel', value:0x4d70d744},
-//{name:'*YigaDisguise', value:0x2c403cd2},
-//{name:'*StalDisguise', value:0x4d91c91b},
-//{name:'*LifeRecover', value:0x515632a9},
-{name:'Extra Heart', value:0xc1db0965}, //LifeMaxUp
-{name:'Stamina Recovery', value:0xe9a30056}, //StaminaRecover
-{name:'Extra Stamina', value:0x60d8315d}, //ExStaminaMaxUp
-{name:'Gloom Recovery', value:0x03459853}, //LifeRepair
-{name:'Skydive Mobility Up', value:0x6775f470}, //DivingMobilityUp
-{name:'Slip Resistance', value:0x2b0cb1e9}, //NotSlippy
-//{name:'*Moisturizing', value:0x994b605e},
-{name:'Glow', value:0x4939dca1}, //LightEmission
-{name:'Rupee Padding', value:0xcfd032db}, //RupeeGuard
-//{name:'*FallResist', value:0x8b6e916c},
-{name:'Master Sword Beam Up', value:0x59be2cc3}, //SwordBeamUp
-//{name:'*VisualizeLife', value:0x5d85e03c},
-{name:'Night Speed Up', value:0x82638f9d}, //NightMoveSpeedUp
-//{name:'*NightGlow', value:0x7d5014ab},
-{name:'Climbing Jump Stamina Up', value:0x0d1d9ef3}, //DecreaseWallJumpStamina
-{name:' Charge Atk. Stamina Up', value:0x48aa5ddf}, //DecreaseChargeAttackStamina
-//{name:'*EmitTerror', value:0xe6202c76},
-{name:'Fireproof', value:0x2f3b7069}, //NoBurning
-{name:'Impact Proof', value:0xc5def427}, //NoFallDamage
-{name:'Slip Proof', value:0x346a7abc}, //NoSlip
-//{name:'*RupeeGuardRate', value:0x56b27b1f},
-//{name:'*MaskAll', value:0xc03cbd09},
-{name:'Energy Up', value:0xa3b0355e}, //DecreaseZonauEnergy
-{name:'Energy Recharge Up', value:0x52fad704}, //ZonauEnergyHealUp
-//{name:'*MaskHorablin', value:0x719be063},
-{name:'Gloom Attack Resist', value:0x671dbe0d}, //MiasmaDefenseUp
-{name:'Cold Weather Charge', value:0xf563b129}, //ChargePowerUpCold
-{name:'Hot Weather Charge', value:0x4fb7ed09}, //ChargePowerUpHot
-{name:'Stormy Weather Charge', value:0x8f4fdaf4}, //ChargePowerUpThunderstorm
-{name:'Shining Steps', value:0x1d249847} //LightFootprint
-//{name:'*SoulPowerUpLightning', value:0xfbfc055b},
-//{name:'*SoulPowerUpWater', value:0x77b8c024},
-//{name:'*SoulPowerUpWind', value:0xc4cf428c},
-//{name:'*SoulPowerUpFire', value:0xf149c0c0},
-//{name:'*SoulPowerUpSpirit', value:0xf9c555e6},
-//{name:'*EnableUseSwordBeam', value:0xaa04e165}
+Item.FOOD_EFFECTS_RAW=[
+'ResistHot', 'ResistBurn', 'ResistCold', 'ResistElectric', 'ResitLightning', 'ResistFreeze', 'SwimSpeedUp',
+'ClimbSpeedUp', 'AttackUp', 'AttackUpCold', 'AttackUpHot', 'AttackUpThunderstorm', 'QuietnessUp', 'SandMoveUp',
+'SnowMoveUp', 'DefenseUp', 'AllSpeed', 'MiasmaGuard', 'LifeMaxUp', 'StaminaRecover', 'ExStaminaMaxUp', 'LifeRepair',
+'DivingMobilityUp', 'NotSlippy', 'LightEmission', 'RupeeGuard', 'SwordBeamUp', 'NightMoveSpeedUp', 'DecreaseWallJumpStamina', 'DecreaseChargeAttackStamina',
+'NoBurning', 'NoFallDamage', 'NoSlip', 'DecreaseZonauEnergy', 'ZonauEnergyHealUp', 'MiasmaDefenseUp', 'ChargePowerUpCold', 'ChargePowerUpHot',
+'ChargePowerUpThunderstorm', 'LightFootprint'
+//unusable in food?
+//ResistFreeze, ResitLightning, RupeeGuard
+//ResistAncient, SpinAttack, ClimbWaterfall, ClimbSpeedUpOnlyHorizontaly, AttackUpDark, AttackUpBone, WakeWind, TwiceJump
+//EmergencyAvoid, MaskBokoblin, MaskMoriblin, MaskLizalfos, MaskLynel, YigaDisguise, StalDisguise, LifeRecover
+//Moisturizing, FallResist, VisualizeLife, NightGlow, EmitTerror, RupeeGuardRate, MaskAll, MaskHorablin
+//SoulPowerUpLightning, SoulPowerUpWater, SoulPowerUpWind, SoulPowerUpFire, SoulPowerUpSpirit, EnableUseSwordBeam
+];
+Item.FOOD_EFFECTS=[
+{name:'None', value:hash('None')},
+{name:'Heat Resistance', value:hash('ResistHot')},
+{name:'Flame Guard', value:hash('ResistBurn')},
+{name:'Cold Resistance', value:hash('ResistCold')},
+{name:'Shock Resistance', value:hash('ResistElectric')},
+{name:'Swim Speed Up', value:hash('SwimSpeedUp')},
+{name:'Climb Speed Up', value:hash('ClimbSpeedUp')},
+{name:'Attack Up', value:hash('AttackUp')},
+{name:'Cold Weather Attack Up', value:hash('AttackUpCold')},
+{name:'Hot Weather Attack Up', value:hash('AttackUpHot')},
+{name:'Stormy Weather Attack Up', value:hash('AttackUpThunderstorm')},
+{name:'Stealth Up', value:hash('QuietnessUp')},
+{name:'Sand Speed Up', value:hash('SandMoveUp')},
+{name:'Snow Speed Up', value:hash('SnowMoveUp')},
+{name:'Defense Up', value:hash('DefenseUp')},
+{name:'Speed Up', value:hash('AllSpeed')},
+{name:'Gloom Resistance', value:hash('MiasmaGuard')},
+{name:'Extra Heart', value:hash('LifeMaxUp')},
+{name:'Stamina Recovery', value:hash('StaminaRecover')},
+{name:'Extra Stamina', value:hash('ExStaminaMaxUp')},
+{name:'Gloom Recovery', value:hash('LifeRepair')},
+{name:'Skydive Mobility Up', value:hash('DivingMobilityUp')},
+{name:'Slip Resistance', value:hash('NotSlippy')},
+{name:'Glow', value:hash('LightEmission')}
 ];
-
-
-
-
-Item.fixKeyAvailabilityFlags=function(){
-	var changes=0;
-	SavegameEditor.currentItems.key.forEach(function(item, i){
-		if(Item.AvailabilityFlags[item.id]){
-			var offset=SavegameEditor._getOffsetsByHashes([Item.AvailabilityFlags[item.id]], true);
-			if(offset){
-				var originalValue=tempFile.readU32(offset);
-				if(originalValue===0){
-					tempFile.writeU32(offset, 1);
-					changes++;
-				}
-			}
-		}
-	});
-
-	if(changes){
-		MarcDialogs.alert(changes+' some key flags have been fixed');
-		if(currentTab==='master' && TOTKMasterEditor.isLoaded())
-			TOTKMasterEditor.refreshResults();
-	}
-	return changes;
-}
-
-Item.AvailabilityFlags={
-	/* paraglider fabrics (OwnedParasailPattern.*) */
-	Obj_SubstituteCloth_Default:0x7ff848d1,
-	Obj_SubstituteCloth_00:0xb65bc9d7,
-	Obj_SubstituteCloth_01:0x41929f49,
-	Obj_SubstituteCloth_02:0x084da01f,
-	Obj_SubstituteCloth_03:0x31a2d1cc,
-	Obj_SubstituteCloth_04:0x865f713d,
-	Obj_SubstituteCloth_05:0x30669b55,
-	Obj_SubstituteCloth_06:0x022aef11,
-	Obj_SubstituteCloth_07:0x112734b9,
-	Obj_SubstituteCloth_08:0xdbc821f2,
-	Obj_SubstituteCloth_09:0x1ecc8c93,
-	Obj_SubstituteCloth_10:0x405203b9,
-	Obj_SubstituteCloth_11:0x7c38e018,
-	Obj_SubstituteCloth_12:0x0636a9e7,
-	Obj_SubstituteCloth_13:0x09865592,
-	Obj_SubstituteCloth_14:0x57129d72,
-	Obj_SubstituteCloth_15:0xf4035866,
-	Obj_SubstituteCloth_16:0xc80d0bf1,
-	Obj_SubstituteCloth_17:0x96427113,
-	Obj_SubstituteCloth_18:0x8ef713e8,
-	Obj_SubstituteCloth_19:0x92754bbd,
-	Obj_SubstituteCloth_20:0x94d2472d,
-	Obj_SubstituteCloth_21:0xe6cacf83,
-	Obj_SubstituteCloth_22:0x85a4e8e3,
-	Obj_SubstituteCloth_23:0xca1847dd,
-	Obj_SubstituteCloth_24:0x8c007dbc,
-	Obj_SubstituteCloth_25:0xa2aec992,
-	Obj_SubstituteCloth_26:0x7c552e01,
-	Obj_SubstituteCloth_27:0xca76a631,
-	Obj_SubstituteCloth_28:0xd9c206b1,
-	Obj_SubstituteCloth_29:0x6443f768,
-	Obj_SubstituteCloth_30:0x397217b2,
-	Obj_SubstituteCloth_31:0x6fb24dcc,
-	Obj_SubstituteCloth_32:0x38267d74,
-	Obj_SubstituteCloth_33:0xca2baf8b,
-	Obj_SubstituteCloth_34:0x500ce8e9,
-	Obj_SubstituteCloth_35:0x861db450,
-	Obj_SubstituteCloth_36:0x8dbea34c,
-	Obj_SubstituteCloth_37:0xd552e642,
-	Obj_SubstituteCloth_38:0x6199467d,
-	Obj_SubstituteCloth_39:0x6625f898,
-	Obj_SubstituteCloth_40:0x63452b97,
-	Obj_SubstituteCloth_41:0x53e2da50,
-	Obj_SubstituteCloth_43:0xee3f78e3,
-	Obj_SubstituteCloth_45:0xf2d50ecf,
-	Obj_SubstituteCloth_46:0xa4bf8025,
-	Obj_SubstituteCloth_48:0x0f1e166d,
-	Obj_SubstituteCloth_49:0xc9ab8463,
-	Obj_SubstituteCloth_51:0x21170251,
-	Obj_SubstituteCloth_52:0xeaae73a3,
-	Obj_SubstituteCloth_53:0xa5ecfeec,
-	Obj_SubstituteCloth_55:0x93e7260f,
-	Obj_SubstituteCloth_56:0x6688319b,
-
-	/* horse reins (OwnedCustomizableHorseTack_Reins.*) */
-	GameRomHorseReins_01:0x4a5fd1ed, //Traveler's Bridle
-	GameRomHorseReins_02:0x2ab85fc5, //Royal Reins
-	GameRomHorseReins_03:0x7ed8afec, //Knight's Bridle
-	GameRomHorseReins_04:0x02b23771, //Monster Bridle
-	GameRomHorseReins_05:0xeee51703, //Extravagant Bridle
-	/* horse saddles (OwnedCustomizableHorseTack_Saddle.*) */
-	GameRomHorseSaddle_01:0xac64346a, //Traveler's Saddle
-	GameRomHorseSaddle_02:0x5e6d9a72, //Royal Saddle
-	GameRomHorseSaddle_03:0x7a50263f, //Knight's Saddle
-	GameRomHorseSaddle_04:0x38033224, //Monster Saddle
-	GameRomHorseSaddle_05:0xe9220149, //Extravagant Saddle
-	GameRomHorseSaddle_07:0x9dda81a1 //Towing Harness
-	//GameRomHorseSaddle_07:0xecbbc704, //GameRomHorseSaddle_07_ExternalCoupler
-	//GameRomHorseSaddle_07:0x663f0238 //GameRomHorseSaddle_07_WithWagon
-}
 
 
 
@@ -849,33 +700,33 @@ Item.AVAILABILITY={
 	],
 
 	'devices':[
-		'SpObj_EnergyBank_Capsule_A_01', //Battery
-		'SpObj_EnergyBank_Capsule_A_02', //Big Battery
+		'SpObj_WindGenerator_Capsule_A_01', //Fan
+		'SpObj_LiftGeneratorWing_Capsule_A_01', //Wing
+		'SpObj_Cart_Capsule_A_01', //Cart
+		'SpObj_BalloonEnvelope_Capsule_A_01', //Balloon
+		'SpObj_Rocket_Capsule_A_01', //Rocket
+		'SpObj_TimerBomb_Capsule_A_01', //Time Bomb
 		'SpObj_CookSet_Capsule_A_01', //Portable Pot
-		'SpObj_Beamos_Capsule_A_01', //Beam Emitter
 		'SpObj_FlameThrower_Capsule_A_01', //Flame Emitter
 		'SpObj_SnowMachine_Capsule_A_01', //Frost Emitter
 		'SpObj_ElectricBoxGenerator_Capsule_A_01', //Shock Emitter
-		'SpObj_BalloonEnvelope_Capsule_A_01', //Balloon
-		'SpObj_Cannon_Capsule_A_01', //Cannon
-		'SpObj_Cart_Capsule_A_01', //Cart
-		'SpObj_Chaser_Capsule_A_01', //Homing Cart
-		'SpObj_ControlStick_Capsule_A_01', //Steering Stick
-		'SpObj_GolemHead_Capsule_A_01', //Construct Head
-		'SpObj_WindGenerator_Capsule_A_01', //Fan
-		'SpObj_FloatingStone_Capsule_A_01', //Hover Stone
+		'SpObj_Beamos_Capsule_A_01', //Beam Emitter
 		'SpObj_LiftableWaterPump_Capsule_A_01', //Hydrant
-		'SpObj_FlashLight_Capsule_A_01', //Light
-		'SpObj_LightMirror_Capsule_A_01', //Mirror
-		'SpObj_Rocket_Capsule_A_01', //Rocket
-		'SpObj_SlipBoard_Capsule_A_01', //Sled
-		'SpObj_SpringPiston_Capsule_A_01', //Spring
-		'SpObj_TiltingDoll_Capsule_A_01', //Stabilizer
-		'SpObj_Pile_Capsule_A_01', //Stake
-		'SpObj_FastWheel_Capsule_A_01', //Small Wheel
+		'SpObj_ControlStick_Capsule_A_01', //Steering Stick
 		'SpObj_FastWheel_Capsule_B_01', //Big Wheel
-		'SpObj_LiftGeneratorWing_Capsule_A_01', //Wing
-		'SpObj_TimerBomb_Capsule_A_01', //Time Bomb
+		'SpObj_FastWheel_Capsule_A_01', //Small Wheel
+		'SpObj_SlipBoard_Capsule_A_01', //Sled
+		'SpObj_EnergyBank_Capsule_A_01', //Battery
+		'SpObj_EnergyBank_Capsule_A_02', //Big Battery
+		'SpObj_SpringPiston_Capsule_A_01', //Spring
+		'SpObj_Cannon_Capsule_A_01', //Cannon
+		'SpObj_TiltingDoll_Capsule_A_01', //Stabilizer
+		'SpObj_FloatingStone_Capsule_A_01', //Hover Stone
+		'SpObj_FlashLight_Capsule_A_01', //Light
+		'SpObj_Pile_Capsule_A_01', //Stake
+		'SpObj_LightMirror_Capsule_A_01', //Mirror
+		'SpObj_Chaser_Capsule_A_01', //Homing Cart
+		'SpObj_GolemHead_Capsule_A_01' //Construct Head
 	],
 
 	'key':[
@@ -993,3 +844,7 @@ Item.AVAILABILITY={
 		'Obj_SubstituteCloth_56' //Addison's Fabric
 	]
 };
+
+
+Item.VALID_ELIXIR_EFFECTS=['AllSpeed','AttackUp','DefenseUp','ExStaminaMaxUp','LifeMaxUp','LightEmission','NotSlippy','QuietnessUp','ResistBurn','ResistCold','ResistElectric','ResistHot','StaminaRecover'];
+Item.VALID_ELIXIR_EFFECTS.forEach(hash);
\ No newline at end of file
diff --git a/zelda-totk/zelda-totk.class.pouch.js b/zelda-totk/zelda-totk.class.pouch.js
new file mode 100644
index 0000000..ea8d8f1
--- /dev/null
+++ b/zelda-totk/zelda-totk.class.pouch.js
@@ -0,0 +1,544 @@
+/*
+	The legend of Zelda: Tears of the Kingdom savegame editor - Pouch class (last update 2023-07-08)
+
+	by Marc Robledo 2023
+	item names compiled by Echocolat, Exincracci, HylianLZ and Karlos007
+*/
+
+
+function Pouch(catId){
+	this.category=catId;
+	this.read();
+}
+Pouch.prototype.read=function(){
+	var categoryItemStructId=Pouch.getCategoryItemStructId(this.category);
+	
+	this.struct=(new Struct(Pouch.getCategoryStructId(this.category), [{
+		structArray:categoryItemStructId,
+		variablesInfo:Pouch.getCategoryStruct(this.category)
+	}]));
+	
+	var structExported=this.struct.export();
+	this.items=[];
+	this.maxSize=structExported[categoryItemStructId].length;
+
+	for(var i=0; i<this.maxSize; i++){
+		if(structExported[categoryItemStructId][i].id)
+			this.add(structExported[categoryItemStructId][i]);
+		else
+			break;
+	}
+
+	return this.items;
+}
+Pouch.prototype.isEmpty=function(){
+	return !this.items.length;
+}
+Pouch.prototype.isFull=function(){
+	return this.items.length===this.maxSize;
+}
+Pouch.prototype.getLast=function(){
+	if(this.isEmpty())
+		return null;
+	return this.items[this.items.length-1];
+}
+Pouch.prototype.findItemById=function(itemId){
+	for(var i=0; i<this.items.length; i++){
+		if(this.items[i].id===itemId)
+			return this.items[i];
+	}
+	return null;
+}
+Pouch.prototype.add=function(pouchItemData){
+	if(this.isFull())
+		return null;
+
+	var newItem;
+	if(this.category==='weapons' || this.category==='bows' || this.category==='shields')
+		newItem=new Equipment(this.category, pouchItemData);
+	else if(this.category==='armors')
+		newItem=new Armor(pouchItemData);
+	else if(this.category==='arrows' || this.category==='materials' || this.category==='food' || this.category==='devices' || this.category==='key')
+		newItem=new Item(this.category, pouchItemData);
+	else if(this.category==='horses')
+		newItem=new Horse(pouchItemData);
+	else
+		throw new Error('Invalid pouch item category');
+
+	this.items.push(newItem);
+	return newItem;
+}
+Pouch.prototype.remove=function(index){
+	if(typeof index==='object'){
+		index=this.items.indexOf(index);
+		if(index===-1)
+			throw new Error('Item not found in pouch '+this.category);
+	}
+	if(this.items.length<2 || index>=this.items.length)
+		return false;
+
+	var removedItem=this.items[index];
+	this.items.splice(index,1);
+
+	return removedItem;
+}
+Pouch.prototype.save=function(){
+	for(var i=0; i<this.items.length; i++){
+		for(var j=0; j<this.struct._originalStructData[0].variablesInfo.length; j++){
+			var propertyName=this.struct._originalStructData[0].variablesInfo[j].propertyName;
+			if(this.struct._originalStructData[0].variablesInfo[j].arrayPartitionSize){
+				var arrayPartitionSize=this.struct._originalStructData[0].variablesInfo[j].arrayPartitionSize;
+				for(var k=0; k<arrayPartitionSize; k++){
+					this.struct.variables[0].variables[j].value[i * arrayPartitionSize + k]=this.items[i][propertyName][k];
+				}
+			}else{
+				this.struct.variables[0].variables[j].value[i]=this.items[i][propertyName];
+			}
+		}
+	}
+	for(; i<this.maxSize; i++){
+		this.struct.variables[0].variables[0].value[i]=''; //remove empty items
+	}
+
+	this.struct.saveAll();
+}
+Pouch.getCategoryStruct=function(catId){
+	if(catId==='weapons'){
+		return Pouch.Structs.WEAPONS;
+	}else if(catId==='bows'){
+		return Pouch.Structs.BOWS;
+	}else if(catId==='shields'){
+		return Pouch.Structs.SHIELDS;
+	}else if(catId==='armors'){
+		return Pouch.Structs.ARMORS;
+	}else if(catId==='arrows'){
+		return Pouch.Structs.ARROWS;
+	}else if(catId==='materials'){
+		return Pouch.Structs.MATERIALS;
+	}else if(catId==='food'){
+		return Pouch.Structs.FOOD;
+	}else if(catId==='devices'){
+		return Pouch.Structs.DEVICES;
+	}else if(catId==='key'){
+		return Pouch.Structs.KEY;
+	}else if(catId==='horses'){
+		return Pouch.Structs.HORSES;
+	}else{
+		throw new Error('Invalid pouch category: '+catId);
+	}
+}
+Pouch.getCategoryStructId=function(catId){
+	return 'pouch'+(catId.charAt(0).toUpperCase() +catId.slice(1));
+}
+Pouch.getCategoryItemStructId=function(catId){
+	return 'item'+(catId.charAt(0).toUpperCase() +catId.slice(1));
+}
+
+
+
+
+
+Pouch._onChangeSelect=function(evt){
+	var newVal=this.value;
+	if(this.isEnum){
+		newVal=parseInt(newVal);
+	}
+
+
+	this.item.lastInputChanged=this.propertyName;
+	this.item[this.propertyName]=newVal;
+	Pouch.updateItemRow(this.item);
+}
+Pouch._onChangeInputNumberFix=function(evt){
+	var newVal=this.value.replace(/[^0-9\-\.]/g, '');
+	if(this.floatValue)
+		newVal=parseFloat(newVal);
+	else
+		newVal=parseInt(newVal);
+
+	if(isNaN(newVal) || newVal<this.minValue)
+		newVal=this.minValue;
+	else if(newVal > this.maxValue)
+		newVal=this.maxValue;
+
+	if(newVal===-0)
+		newVal=0; //avoid negative zero
+
+
+	this.item.lastInputChanged=this.propertyName;
+	if(this.percentage)
+		this.item[this.propertyName]=newVal / 100;
+	else
+		this.item[this.propertyName]=newVal;
+	Pouch.updateItemRow(this.item);
+}
+Pouch._onChangeInputTextFix=function(evt){
+	var newVal=this.value.substr(0, this.maxLength);
+	if(!newVal)
+		newVal='a';
+
+	this.item.lastInputChanged=this.propertyName;
+	this.item[this.propertyName]=newVal;
+	Pouch.updateItemRow(this.item);
+}
+
+
+const ICON_PATH='./assets/item_icons/';
+Pouch.updateItemIcon=function(item){
+	if(item.category==='armors')
+		if(item.dyeColor===hash('None'))
+			item._htmlIcon.src=ICON_PATH+item.category+'/'+item.getBaseId()+'.png';
+		else
+			item._htmlIcon.src=ICON_PATH+item.category+'/dye/'+item.getBaseId()+'_'+hashReverse(item.dyeColor)+'.png';
+	else if(item.category==='food' && item.id==='Item_Cook_C_17' && Item.VALID_ELIXIR_EFFECTS.indexOf(hashReverse(item.effect))!==-1)
+		item._htmlIcon.src=ICON_PATH+item.category+'/Item_Cook_C_17_'+hashReverse(item.effect)+'.png';
+	else
+		item._htmlIcon.src=ICON_PATH+item.category+'/'+item.id+'.png';
+};
+Pouch.updateItemRow=function(item){
+	if(!item._htmlRow){
+		//create if item row does not exist
+		item._htmlIcon=new Image();
+		item._htmlIcon.id='icon-'+item.category+'-'+item.index;
+		item._htmlIcon.className='item-icon';
+		item._htmlIcon.loading='lazy';
+		item._htmlIcon.onerror=function(){
+			//$(this).off('error');
+			this.src=ICON_PATH+'unknown.png';
+		}
+
+
+		item._htmlItemId=document.createElement('span');
+		item._htmlItemId.className='item-name clickable';
+		item._htmlItemId.id='item-name-'+item.category+'-'+item.index;
+		item._htmlItemId.innerHTML=item.getItemTranslation();
+		if(item.getItemTranslation()===item.id)
+			item._htmlItemId.style.color='red';
+		item._htmlItemId.addEventListener('click', function(){
+			SavegameEditor.editItem(item);
+		}, false);
+
+
+		var lastColumn=document.createElement('div');
+		if(item.category==='weapons' || item.category==='shields' || item.category==='bows')
+			Equipment.buildHtmlElements(item);
+		else if(item.category==='armors')
+			Armor.buildHtmlElements(item);
+		else if(item.category==='food')
+			Item.buildHtmlElements(item);
+		else if(item.category==='horses')
+			Horse.buildHtmlElements(item);
+		else
+			Item.buildHtmlElements(item);		
+		$(lastColumn).append(Object.values(item._htmlInputs));
+		
+
+		item._htmlRow=document.createElement('div');
+		item._htmlRow.className='row row-item';
+		var columnLeft=document.createElement('div');
+		var columnRight=document.createElement('div');
+		item._htmlRow.appendChild(columnLeft);
+		item._htmlRow.appendChild(columnRight);
+		columnLeft.appendChild(item._htmlIcon);
+		columnLeft.appendChild(item._htmlItemId);
+		columnRight.appendChild(lastColumn);
+		columnLeft.className='row-item-left';
+		columnRight.className='row-item-right row-item-right-'+item.category;
+
+
+
+		item._htmlMenuButton=document.createElement('button');
+		item._htmlMenuButton.appendChild(UI.octicon('kebab_vertical'));
+		item._htmlMenuButton.className='btn-menu-floating';
+		item._htmlMenuButton.addEventListener('click', function(evt){
+			evt.stopPropagation();
+			currentEditingItem=item;
+
+			var showDivider=false;
+			if(item.category==='weapons'){
+				$('#dropdown-item-button-pristine').show().prop('disabled', !item.canBeUndecayed());
+				showDivider=true;
+			}else{
+				$('#dropdown-item-button-pristine').hide();
+			}
+
+			if(item.category==='weapons' || item.category==='bows' || item.category==='shields'){
+				$('#dropdown-item-button-durability').show().prop('disabled', !item.canBeRestored());
+				$('#dropdown-item-button-infinite').show().prop('disabled', !item.canBeSetToInfiniteDurability());
+				showDivider=true;
+			}else{
+				$('#dropdown-item-button-durability').hide();
+				$('#dropdown-item-button-infinite').hide();
+			}
+
+			if(item.category==='armors' && item.canBeUpgraded()){
+				$('#dropdown-item-button-upgrade').show();
+				showDivider=true;
+			}else{
+				$('#dropdown-item-button-upgrade').hide();
+			}
+
+			if(item.category==='weapons' || item.category==='bows' || item.category==='shields' || item.category==='food' || item.category==='horses'){
+				$('#dropdown-item-button-duplicate').show();
+				$('#dropdown-item-button-export').show();
+				$('#dropdown-item-button-import').show();
+				showDivider=true;
+			}else{
+				$('#dropdown-item-button-duplicate').hide();
+				$('#dropdown-item-button-export').hide();
+				$('#dropdown-item-button-import').hide();
+			}
+
+			if(showDivider){
+				$('#dropdown-item .dropdown-divider').show();
+			}else{
+				$('#dropdown-item .dropdown-divider').hide();
+			}
+
+			UI.dropdown('item', item._htmlRow);
+		});
+		item._htmlRow.appendChild(item._htmlMenuButton);
+
+		item.refreshHtmlInputs(false);
+		Pouch.updateItemIcon(item);
+	}else{
+		item.refreshHtmlInputs(true);
+	}
+
+	item._htmlItemId.innerHTML=item.getItemTranslation();
+
+	for(var prop in item._htmlInputs){
+		if(item._htmlInputs[prop].value!=item[prop])
+			if(item._htmlInputs[prop].percentage)
+				item._htmlInputs[prop].value=item[prop] * 100;
+			else
+				item._htmlInputs[prop].value=item[prop];
+	}
+
+	item.lastInputChanged=null;	
+	
+	return item._htmlRow;
+};
+
+Pouch.createItemInput=function(item, propertyName, type, options){
+	var elementTag=(typeof options.enumValues==='object')? 'select' : 'input';
+	var className='full-width';
+	if(type==='Int' || type==='UInt' || type==='Float')
+		className+=' text-right';
+
+
+	var input=document.createElement(elementTag);
+	input.item=item;
+	input.propertyName=propertyName;
+	input.className=className;
+	if(typeof options.label==='string')
+		input.title=options.label;
+
+	if(elementTag==='select'){
+		var unknownValue=true;
+		var intValue=typeof item[propertyName]==='string'? hash(item[propertyName]) : item[propertyName];
+		for(var i=0; i<options.enumValues.length; i++){
+			if(typeof options.enumValues[i] === 'number'){
+				var option=document.createElement('option');
+				option.value=options.enumValues[i];
+				option.innerHTML=options.enumValues[i];
+				input.appendChild(option);
+			}else if(typeof options.enumValues[i] === 'string'){
+				var option=document.createElement('option');
+				option.value=i;
+				option.innerHTML=options.enumValues[i];
+				input.appendChild(option);
+			}else if(typeof options.enumValues[i] === 'object' && typeof options.enumValues[i].value!=='undefined' && typeof options.enumValues[i].name!=='undefined'){
+				var option=document.createElement('option');
+				option.value=options.enumValues[i].value;
+				option.innerHTML=options.enumValues[i].name;
+				input.appendChild(option);
+			}else if(typeof options.enumValues[i] === 'object'){
+				input.appendChild(options.enumValues[i]);
+			}
+
+			if(unknownValue && options.enumValues[i].value==item[propertyName]){
+				unknownValue=false;
+			}
+		}
+		
+		if(unknownValue){
+			var option=document.createElement('option');
+			option.value=intValue;
+			option.innerHTML=Variable.toHexString(intValue);
+			input.appendChild(option);
+		}
+		
+		input.isEnum=(type==='Enum');
+		input.addEventListener('change', Pouch._onChangeSelect, false);
+	}else{
+		input.type=type==='Bool'? 'checkbox' : 'text';
+		
+
+		if(type==='Int' || type==='UInt' || type==='Float'){					
+			if(type==='Uint'){
+				input.minValue=0;
+				input.maxValue=4294967295;
+			}else{
+				input.minValue=-2147483648;
+				input.maxValue=2147483647;
+			}
+
+
+			if(typeof options.min==='number')
+				input.minValue=options.min;
+			if(typeof options.max==='number')
+				input.maxValue=options.max;
+			if(type==='Float' && options.min===0 && options.max===100)
+				input.percentage=true;
+
+			input.floatValue=type==='Float';
+			input.addEventListener('change', Pouch._onChangeInputNumberFix, false);
+		}else if(type==='String64' || type==='WString16'){
+			if(typeof options.maxLength==='number')
+				input.maxLength=options.maxLength;
+			else if(type==='WString16')
+				input.maxLength=16;
+			else
+				input.maxLength=64;
+			input.addEventListener('change', Pouch._onChangeInputTextFix, false);
+		}else{
+			throw new Error('Invalid input value');
+		}
+
+		if(type==='Bool')
+			input.checked=!!item[propertyName];
+		else if(input.percentage)
+			input.value=item[propertyName] * 100;
+		else
+			input.value=item[propertyName];
+	}
+
+	return input;
+};
+
+
+Pouch.scrollToItem=function(item){
+	item._htmlRow.scrollIntoView({behavior:'smooth',block:'start'});
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	
+Pouch.Structs=Object.freeze({
+	WEAPONS:[
+		{hash:'Pouch.Weapon.Content.Name', type:'String64Array', propertyName:'id'},
+		{hash:'Pouch.Weapon.Content.Life', type:'IntArray', propertyName:'durability'},
+		{hash:'Pouch.Weapon.Content.Effect.Type', type:'EnumArray', propertyName:'modifier', enumValues:['None','AttackUp','AttackUpPlus','DurabilityUp','DurabilityUpPlus','FinishBlow','LongThrow']},
+		{hash:'Pouch.Weapon.Content.Effect.Value', type:'IntArray', propertyName:'modifierValue'},
+		{hash:'Pouch.Weapon.Content.Combined.Name', type:'String64Array', propertyName:'fuseId'},
+		{hash:'Pouch.Weapon.Content.Combined.Life', type:'IntArray', propertyName:'fuseDurability'},
+		{hash:'Pouch.Weapon.Content.ExtraLife', type:'IntArray', propertyName:'extraDurability'},
+		{hash:'Pouch.Weapon.Content.RecordExtraLife', type:'IntArray', propertyName:'recordExtraDurability'}
+	],
+
+	BOWS:[
+		{hash:'Pouch.Bow.Content.Name', type:'String64Array', propertyName:'id'},
+		{hash:'Pouch.Bow.Content.Life', type:'IntArray', propertyName:'durability'},
+		{hash:'Pouch.Bow.Content.Effect.Type', type:'EnumArray', propertyName:'modifier', enumValues:['None','AttackUp','AttackUpPlus','DurabilityUp','DurabilityUpPlus','RapidFire','FiveWay']},
+		{hash:'Pouch.Bow.Content.Effect.Value', type:'IntArray', propertyName:'modifierValue'}
+	],
+
+	SHIELDS:[
+		{hash:'Pouch.Shield.Content.Name', type:'String64Array', propertyName:'id'},
+		{hash:'Pouch.Shield.Content.Life', type:'IntArray', propertyName:'durability'},
+		{hash:'Pouch.Shield.Content.Effect.Type', type:'EnumArray', propertyName:'modifier', enumValues:['None','DurabilityUp','DurabilityUpPlus','GuardUp','GuardUpPlus']},
+		{hash:'Pouch.Shield.Content.Effect.Value', type:'IntArray', propertyName:'modifierValue'},
+		{hash:'Pouch.Shield.Content.Combined.Name', type:'String64Array', propertyName:'fuseId'},
+		{hash:'Pouch.Shield.Content.Combined.Life', type:'IntArray', propertyName:'fuseDurability'},
+		{hash:'Pouch.Shield.Content.ExtraLife', type:'IntArray', propertyName:'extraDurability'}
+	],
+
+	ARMORS:[
+		{hash:'Pouch.Armor.Content.Name', type:'String64Array', propertyName:'id'},
+		{hash:'Pouch.Armor.Content.ColorVariation', type:'EnumArray', propertyName:'dyeColor', enumValues:['None','Blue','Red','Yellow','White','Black','Purple','Green','LightBlue','Navy','Orange','Pink','Crimson','LightYellow','Brown','Gray']}
+	],
+
+	ARROWS:[
+		{hash:'Pouch.Arrow.Content.Name', type:'String64Array', propertyName:'id'},
+		{hash:'Pouch.Arrow.Content.StockNum', type:'IntArray', propertyName:'quantity'}
+	],
+
+	MATERIALS:[
+		{hash:'Pouch.Material.Content.Name', type:'String64Array', propertyName:'id'},
+		{hash:'Pouch.Material.Content.StockNum', type:'IntArray', propertyName:'quantity'},
+		{hash:'Pouch.Material.Content.GetOrder', type:'IntArray', propertyName:'getOrder'},
+		{hash:'Pouch.Material.Content.UseOrder', type:'IntArray', propertyName:'useOrder'}
+	],
+
+	FOOD:[
+		{hash:'Pouch.Food.Content.Name', type:'String64Array', propertyName:'id'},
+		{hash:'Pouch.Food.Content.StockNum', type:'IntArray', propertyName:'quantity'},
+		{hash:'Pouch.Food.Content.LifeRecover', type:'IntArray', propertyName:'heartsHeal'},
+		{hash:'Pouch.Food.Content.Effect.Type', type:'EnumArray', propertyName:'effect', enumValues:['None','ResistHot','ResistBurn','ResistCold','ResistElectric','ResitLightning','ResistFreeze','SwimSpeedUp','DecreaseSwimStamina','ClimbSpeedUp','AttackUp','AttackUpCold','AttackUpHot','AttackUpThunderstorm','QuietnessUp','SandMoveUp','SnowMoveUp','DefenseUp','AllSpeed','MiasmaGuard','LifeMaxUp','StaminaRecover','ExStaminaMaxUp','LifeRepair','DivingMobilityUp','NotSlippy','LightEmission','RupeeGuard','SwordBeamUp','NightMoveSpeedUp','DecreaseWallJumpStamina','DecreaseChargeAttackStamina','NoBurning','NoFallDamage','NoSlip','DecreaseZonauEnergy','ZonauEnergyHealUp','MiasmaDefenseUp','ChargePowerUpCold','ChargePowerUpHot','ChargePowerUpThunderstorm','LightFootprint']},
+		{hash:'Pouch.Food.Content.Effect.Level', type:'IntArray', propertyName:'effectMultiplier'},
+		{hash:'Pouch.Food.Content.Effect.Time', type:'IntArray', propertyName:'effectTime'}, // in seconds
+		{hash:'Pouch.Food.Content.Price', type:'IntArray', propertyName:'price'},
+		{hash:'Pouch.Food.Content.MaterialName', type:'String64Array', propertyName:'recipe', arrayPartitionSize:5}
+	],
+
+	DEVICES:[
+		{hash:'Pouch.SpecialParts.Content.Name', type:'String64Array', propertyName:'id'},
+		{hash:'Pouch.SpecialParts.Content.StockNum', type:'IntArray', propertyName:'quantity'},
+		{hash:'Pouch.SpecialParts.Content.UseOrder', type:'IntArray', propertyName:'useOrder'}
+	],
+
+	KEY:[
+		{hash:'Pouch.KeyItem.Content.Name', type:'String64Array', propertyName:'id'},
+		{hash:'Pouch.KeyItem.Content.StockNum', type:'IntArray', propertyName:'quantity'}
+	],
+
+	HORSES:[
+		{hash:'OwnedHorseList.ActorName', type:'String64Array', propertyName:'id'},
+		{hash:'OwnedHorseList.Name', type:'WString16Array', propertyName:'name'},
+		{hash:'OwnedHorseList.Mane', type:'EnumArray', propertyName:'mane', enumValues:['None','Horse_Link_Mane','Horse_Link_Mane_01','Horse_Link_Mane_02','Horse_Link_Mane_03','Horse_Link_Mane_04','Horse_Link_Mane_05','Horse_Link_Mane_06','Horse_Link_Mane_07','Horse_Link_Mane_08','Horse_Link_Mane_09','Horse_Link_Mane_10','Horse_Link_Mane_11','Horse_Link_Mane_12','Horse_Link_Mane_00L','Horse_Link_Mane_01L','Horse_Link_Mane_00S']},
+		{hash:'OwnedHorseList.Saddle', type:'EnumArray', propertyName:'saddles', enumValues:['None','GameRomHorseSaddle_00','GameRomHorseSaddle_01','GameRomHorseSaddle_02','GameRomHorseSaddle_03','GameRomHorseSaddle_04','GameRomHorseSaddle_05','GameRomHorseSaddle_06','GameRomHorseSaddle_07','GameRomHorseSaddle_00L','GameRomHorseSaddle_00S']},
+		{hash:'OwnedHorseList.Rein', type:'EnumArray', propertyName:'reins', enumValues:['None','GameRomHorseReins_00','GameRomHorseReins_01','GameRomHorseReins_02','GameRomHorseReins_03','GameRomHorseReins_04','GameRomHorseReins_05','GameRomHorseReins_06','GameRomHorseReins_00L','GameRomHorseReins_00S']},
+		{hash:'OwnedHorseList.Familiarity', type:'FloatArray', propertyName:'bond'},
+		{hash:'OwnedHorseList.IsFamiliarityChecked', type:'UIntArray', propertyName:'bondChecked'}, //BoolArray but it is indeed a 'BitArray'
+		{hash:'OwnedHorseList.Toughness', type:'IntArray', propertyName:'statsStrength'},
+		{hash:'OwnedHorseList.Speed', type:'IntArray', propertyName:'statsSpeed'},
+		{hash:'OwnedHorseList.ChargeNum', type:'IntArray', propertyName:'statsStamina'},
+		{hash:'OwnedHorseList.HorsePower', type:'IntArray', propertyName:'statsPull'},
+		{hash:'OwnedHorseList.HorseType', type:'IntArray', propertyName:'horseType'},
+		{hash:'OwnedHorseList.ColorType', type:'IntArray', propertyName:'colorType'}, // cannot be zero!
+		{hash:'OwnedHorseList.FootType', type:'IntArray', propertyName:'footType'},
+		{hash:'OwnedHorseList.UidHash', type:'UInt64Array', propertyName:'amiiboUidHash'},
+		{hash:'OwnedHorseList.RoomID', type:'IntArray', propertyName:'roomId'},
+
+		{hash:'OwnedHorseList.Body.Pattern', type:'EnumArray', propertyName:'iconPattern', enumValues:['00','01','02','03','04','05','06']},
+		{hash:'OwnedHorseList.Body.EyeColor', type:'EnumArray', propertyName:'iconEyeColor', enumValues:['Black','Blue']},
+		{hash:'OwnedHorseList.Body.PrimaryColor.Red', type:'UIntArray', propertyName:'iconPrimaryColorRed'},
+		{hash:'OwnedHorseList.Body.PrimaryColor.Green', type:'UIntArray', propertyName:'iconPrimaryColorGreen'},
+		{hash:'OwnedHorseList.Body.PrimaryColor.Blue', type:'UIntArray', propertyName:'iconPrimaryColorBlue'},
+		{hash:'OwnedHorseList.Body.SecondaryColor.Red', type:'UIntArray', propertyName:'iconSecondaryColorRed'},
+		{hash:'OwnedHorseList.Body.SecondaryColor.Green', type:'UIntArray', propertyName:'iconSecondaryColorGreen'},
+		{hash:'OwnedHorseList.Body.SecondaryColor.Blue', type:'UIntArray', propertyName:'iconSecondaryColorBlue'},
+		{hash:'OwnedHorseList.Body.NoseColor.Red', type:'UIntArray', propertyName:'iconNoseColorRed'},
+		{hash:'OwnedHorseList.Body.NoseColor.Green', type:'UIntArray', propertyName:'iconNoseColorGreen'},
+		{hash:'OwnedHorseList.Body.NoseColor.Blue', type:'UIntArray', propertyName:'iconNoseColorBlue'},
+		{hash:'OwnedHorseList.Hair.PrimaryColor.Red', type:'UIntArray', propertyName:'iconHairPrimaryColorRed'},
+		{hash:'OwnedHorseList.Hair.PrimaryColor.Green', type:'UIntArray', propertyName:'iconHairPrimaryColorGreen'},
+		{hash:'OwnedHorseList.Hair.PrimaryColor.Blue', type:'UIntArray', propertyName:'iconHairPrimaryColorBlue'},
+		{hash:'OwnedHorseList.Hair.SecondaryColor.Red', type:'UIntArray', propertyName:'iconHairSecondaryColorRed'},
+		{hash:'OwnedHorseList.Hair.SecondaryColor.Green', type:'UIntArray', propertyName:'iconHairSecondaryColorGreen'},
+		{hash:'OwnedHorseList.Hair.SecondaryColor.Blue', type:'UIntArray', propertyName:'iconHairSecondaryColorBlue'}
+	]
+});
\ No newline at end of file
diff --git a/zelda-totk/zelda-totk.completism.js b/zelda-totk/zelda-totk.completism.js
index 6dc5746..47400c9 100644
--- a/zelda-totk/zelda-totk.completism.js
+++ b/zelda-totk/zelda-totk.completism.js
@@ -1,5 +1,5 @@
 /*
-	The legend of Zelda: Tears of the Kingdom Savegame Editor (Completism) v20230613
+	The legend of Zelda: Tears of the Kingdom savegame editor - Completism (last update 2023-07-08)
 
 	by Marc Robledo 2023
 	research & information compiled by MacSpazzy, Karlos007 and Echocolat
@@ -9,7 +9,7 @@
 var Completism={
 	_count:function(booleanHashes, valueTrue){
 		if(typeof valueTrue==='string')
-			valueTrue=murmurHash3.x86.hash32(valueTrue);
+			valueTrue=hash(valueTrue);
 		else if(typeof valueTrue==='number')
 			valueTrue=valueTrue;
 		else
@@ -72,6 +72,9 @@ var Completism={
 	countBossesGleeok:function(){
 		return this._count(CompletismHashes.BOSSES_GLEEOKS_DEFEATED);
 	},
+	countOldMaps:function(){
+		return this._count(CompletismHashes.TREASURE_MAPS_FOUND);
+	},
 	countSchematicsStone:function(){
 		return this._count(CompletismHashes.SCHEMATICS_STONE_FOUND);
 	},
@@ -85,14 +88,14 @@ var Completism={
 
 	_set:function(booleanHashes, limit, valueTrue, onlyWhen){
 		if(typeof valueTrue==='string')
-			valueTrue=murmurHash3.x86.hash32(valueTrue);
+			valueTrue=hash(valueTrue);
 		else if(typeof valueTrue==='number')
 			valueTrue=valueTrue;
 		else
 			valueTrue=1;
 
 		if(typeof onlyWhen==='string')
-			onlyWhen=murmurHash3.x86.hash32(onlyWhen);
+			onlyWhen=hash(onlyWhen);
 		else if(typeof onlyWhen==='number')
 			onlyWhen=onlyWhen;
 		else
@@ -114,15 +117,19 @@ var Completism={
 	},
 	setShrinesAsFound:function(limit){
 		var changes=this._set(CompletismHashes.SHRINES_FOUND, limit);
-		MarcDialogs.alert(changes+' shrines set as found.');
-		//console.info(this._set(CompletismHashes.SHRINES_STATUS, limit, 'Open', 'Hidden')+' shrines switched from Hidden to Open');
-		//console.info(this._set(CompletismHashes.SHRINES_STATUS, limit, 'Open', 'Appear')+' shrines switched from Appear to Open');
+		UI.toast(_('%s shrines set as found').replace('%s', changes), 'shrines-found');
+		var switchedFromHidden=this._set(CompletismHashes.SHRINES_STATUS, limit, 'Open', 'Hidden');
+		if(switchedFromHidden)
+			UI.toast(_('%s shrines switched from Hidden to Open').replace('%s', switchedFromHidden), 'shrines-found1');
+		var switchedFromAppear=this._set(CompletismHashes.SHRINES_STATUS, limit, 'Open', 'Appear');
+		if(switchedFromAppear)
+			UI.toast(_('%s shrines switched from Appear to Open').replace('%s', switchedFromAppear), 'shrines-found2');
 		SavegameEditor.refreshCounterShrinesFound();
 		return changes;
 	},
 	setShrinesAsClear:function(limit){
 		var changes=this._set(CompletismHashes.SHRINES_STATUS, limit, 'Clear'); //possible values: Hidden,Appear,Open,Enter,Clear
-		MarcDialogs.alert(changes+' shrines set as clear.');
+		UI.toast(_('%s shrines set as clear').replace('%s', changes), 'shrines-clear');
 		if(changes)
 			SavegameEditor.addItem('key', 'Obj_DungeonClearSeal', changes);
 		SavegameEditor.refreshCounterShrinesClear();
@@ -130,13 +137,13 @@ var Completism={
 	},
 	setLightrootsAsFound:function(limit){
 		var changes=this._set(CompletismHashes.LIGHTROOTS_FOUND, limit);
-		MarcDialogs.alert(changes+' lightroots set as found.');
+		UI.toast(_('%s lightroots set as found').replace('%s', changes), 'lightroots-found');
 		SavegameEditor.refreshCounterLighrootsFound();
 		return changes;
 	},
 	setLightrootsAsClear:function(limit){
 		var changes=this._set(CompletismHashes.LIGHTROOTS_STATUS, limit, 'Open'); //possible values: Close,Open
-		MarcDialogs.alert(changes+' lightroots set as clear.');
+		UI.toast(_('%s lightroots set as clear').replace('%s', changes), 'lightroots-clear');
 		SavegameEditor.refreshCounterLighrootsClear();
 		return changes;
 	},
@@ -148,10 +155,7 @@ var Completism={
 			half=true;
 		}
 		var changes=this._set(CompletismHashes.KOROKS_HIDDEN, limit);
-		if(half)
-			MarcDialogs.alert(changes+' koroks set as found.<br/>Click the button again to set the rest.');
-		else
-			MarcDialogs.alert(changes+' koroks set as found.');
+		UI.toast(_('%s koroks set as found').replace('%s', changes), 'koroks-found');
 		if(changes)
 			SavegameEditor.addItem('key', 'Obj_KorokNuts', changes);
 		SavegameEditor.refreshCounterKoroksHidden();
@@ -159,7 +163,7 @@ var Completism={
 	},
 	setKoroksAsCarried:function(limit){
 		var changes=this._set(CompletismHashes.KOROKS_CARRY, limit, 'Clear'); //possible values: NotClear,Clear
-		MarcDialogs.alert(changes+' koroks set as carried.');
+		UI.toast(_('%s koroks set as carried').replace('%s', changes), 'koroks-carried');
 		if(changes)
 			SavegameEditor.addItem('key', 'Obj_KorokNuts', changes*2);
 		SavegameEditor.refreshCounterKoroksCarry();
@@ -167,64 +171,77 @@ var Completism={
 	},
 	defeatBubbuls:function(limit){
 		var changes=this._set(CompletismHashes.BUBBULS_DEFEATED, limit);
-		MarcDialogs.alert(changes+' bubbuls set as defeated.');
-		if(changes)
+		UI.toast(_('%s bubbuls set as defeated').replace('%s', changes), 'bubbuls-defeated');
+		if(changes){
 			SavegameEditor.addItem('key', 'CaveMasterMedal', changes);
+			var defeatBubbulsTotal=new Variable('DefeatedEnemyNum.Enemy_CaveMaster_000', 'UInt');
+			defeatBubbulsTotal.value+=changes;
+			defeatBubbulsTotal.save();
+		}
 		SavegameEditor.refreshCounterBubbuls();
 		return changes;
 	},
 	visitLocationCaves:function(limit){
 		var changes=this._set(CompletismHashes.LOCATION_CAVES_VISITED, limit);
-		MarcDialogs.alert(changes+' caves set as visited.');
+		UI.toast(_('%s caves set as visited').replace('%s', changes), 'caves-visited');
 		SavegameEditor.refreshCounterLocationCaves();
+		this._set(CompletismHashes.LOCATION_CAVES_VISITED2, limit);
 		return changes;
 	},
 	visitLocationWells:function(limit){
 		var changes=this._set(CompletismHashes.LOCATION_WELLS_VISITED, limit);
-		MarcDialogs.alert(changes+' wells set as visited.');
+		UI.toast(_('%s wells set as visited').replace('%s', changes), 'wells-visited');
 		SavegameEditor.refreshCounterLocationWells();
 		this._set(CompletismHashes.LOCATION_WELLS_VISITED2, limit);
 		return changes;
 	},
 	defeatBossesHinox:function(limit){
 		var changes=this._set(CompletismHashes.BOSSES_HINOXES_DEFEATED, limit);
-		MarcDialogs.alert(changes+' hinoxes set as defeated.');
+		UI.toast(_('%s hinoxes set as defeated').replace('%s', changes), 'hinoxes-defeated');
 		SavegameEditor.refreshCounterBossesHinox();
 		return changes;
 	},
 	defeatBossesTalus:function(limit){
 		var changes=this._set(CompletismHashes.BOSSES_TALUSES_DEFEATED, limit);
-		MarcDialogs.alert(changes+' taluses set as defeated.');
+		UI.toast(_('%s taluses set as defeated').replace('%s', changes), 'taluses-defeated');
 		SavegameEditor.refreshCounterBossesTalus();
 		return changes;
 	},
 	defeatBossesMolduga:function(limit){
 		var changes=this._set(CompletismHashes.BOSSES_MOLDUGAS_DEFEATED, limit);
-		MarcDialogs.alert(changes+' moldugas set as defeated.');
+		UI.toast(_('%s moldugas set as defeated').replace('%s', changes), 'moldugas-defeated');
 		SavegameEditor.refreshCounterBossesMolduga();
 		return changes;
 	},
 	defeatBossesFlux:function(limit){
 		var changes=this._set(CompletismHashes.BOSSES_FLUX_CONSTRUCT_DEFEATED, limit);
-		MarcDialogs.alert(changes+' flux constructs set as defeated.');
+		UI.toast(_('%s flux constructs set as defeated').replace('%s', changes), 'flux-constructs-defeated');
 		SavegameEditor.refreshCounterBossesFlux();
 		return changes;
 	},
 	defeatBossesFrox:function(limit){
 		var changes=this._set(CompletismHashes.BOSSES_FROXS_DEFEATED, limit);
-		MarcDialogs.alert(changes+' froxs set as defeated.');
+		UI.toast(_('%s froxs set as defeated').replace('%s', changes), 'froxs-defeated');
 		SavegameEditor.refreshCounterBossesFrox();
 		return changes;
 	},
 	defeatBossesGleeok:function(limit){
 		var changes=this._set(CompletismHashes.BOSSES_GLEEOKS_DEFEATED, limit);
-		MarcDialogs.alert(changes+' gleoks set as defeated.');
+		UI.toast(_('%s gleeoks set as defeated').replace('%s', changes), 'gleeoks-defeated');
 		SavegameEditor.refreshCounterBossesGleeok();
 		return changes;
 	},
+	setOldMapsAsFound:function(limit){
+		var changes=this._set(CompletismHashes.TREASURE_MAPS_FOUND, limit);
+		UI.toast(_('%s treasure maps set as found').replace('%s', changes), 'treasure-maps-found');
+		if(changes)
+			SavegameEditor.addItem('key', 'Obj_TreasureMap_00', changes);
+		SavegameEditor.refreshCounterOldMaps();
+		return changes;
+	},
 	setSchematicStonesAsFound:function(limit){
 		var changes=this._set(CompletismHashes.SCHEMATICS_STONE_FOUND, limit);
-		MarcDialogs.alert(changes+' schematic stones set as found.');
+		UI.toast(_('%s schematic stones set as found').replace('%s', changes), 'schematic-stones-found');
 		if(changes)
 			SavegameEditor.addItem('key', 'Obj_AutoBuilderDraft_00', changes);
 		SavegameEditor.refreshCounterSchematicsStone();
@@ -232,7 +249,7 @@ var Completism={
 	},
 	setSchematicYigaAsFound:function(limit){
 		var changes=this._set(CompletismHashes.SCHEMATICS_YIGA_FOUND, limit);
-		MarcDialogs.alert(changes+' yiga schematics set as found.');
+		UI.toast(_('%s yiga schematics set as found').replace('%s', changes), 'yiga-schematics-found');
 		if(changes)
 			SavegameEditor.addItem('key', 'Obj_AutoBuilderDraftAssassin_00', changes);
 		SavegameEditor.refreshCounterSchematicsYiga();
@@ -240,12 +257,15 @@ var Completism={
 	},
 	setCompendiumAsStockCurrentOnly:function(limit){
 		var changes=this._set(CompletismHashes.COMPENDIUM_STATUS, limit, 'Buy', 'TakePhoto'); //possible values: Unopened,TakePhoto,Buy
-		MarcDialogs.alert(changes+' pictures set to stock.<br/>You can now delete all .jpg images in /picturebook/ folder.');
+		var message=_('%s pictures set to stock').replace('%s', changes);
+		if(changes)
+			message+='<br/>You can now delete all .jpg images in /picturebook/ folder.';
+		UI.toast(message, 'stock-compendium');
 		return changes;
 	},
 	setCompendiumAsBought:function(limit){
 		var changes=this._set(CompletismHashes.COMPENDIUM_STATUS, limit, 'Buy'); //possible values: Unopened,TakePhoto,Buy
-		MarcDialogs.alert(changes+' pictures unlocked');
+		UI.toast(_('%s pictures unlocked').replace('%s', changes), 'bought-compendium');
 		SavegameEditor.refreshCounterCompendium();
 		return changes;
 	},
@@ -500,7 +520,7 @@ var CompletismHashes={
 		0xbf72ba80, //GerudoDesert_0039
 		0x1af6b3fb, //GerudoDesert_0040
 		0x3cddd610, //GerudoDesert_0041
-		0xfb66a60d, //GerudoDesert_0043
+		//0xfb66a60d, //GerudoDesert_0043 (chasm)
 		0xfd2f1edf, //GerudoDesert_0044
 		0xb630844a, //GerudoDesert_0045
 		0xcc03b90a, //GerudoDesert_0046
@@ -550,7 +570,7 @@ var CompletismHashes={
 		0x0fefb1eb, //HyruleRidge_0000
 		0xc1e94df7, //HyruleRidge_0002
 		0x42307003, //HyruleRidge_0003
-		0x05911ba1, //HyruleRidge_0004
+		//0x05911ba1, //HyruleRidge_0004 (chasm)
 		0x382483d5, //HyruleRidge_0005
 		0xa5f140bd, //HyruleRidge_0006
 		0x0ca0ce73, //HyruleRidge_0007
@@ -566,14 +586,14 @@ var CompletismHashes={
 		0x13821c00, //Lanayru_0036
 		0x89efde88, //Lanayru_0048
 		0x3f894c25, //Lanayru_0049
-		0xd9289883, //Lanayru_0050
+		//0xd9289883, //Lanayru_0050 (chasm)
 		0xa84390b1, //Lanayru_0052
 		0x4144f094, //Lanayru_0053
 		0x22946539, //Lanayru_0055
 		0xfe23935a, //Lanayru_0057
 		0xee2118bf, //Lanayru_0060
 		0x8f2ddec1, //Lanayru_0061
-		0x9aa7f2f0, //Lanayru_0063
+		//0x9aa7f2f0, //Lanayru_0063 (chasm)
 		0xc5c5e0be, //LanayruMountain_0002
 		0x5d32a152, //LanayruMountain_0006
 		0x4aeb16ce, //LanayruMountain_0008
@@ -586,7 +606,214 @@ var CompletismHashes={
 		0x008c809a, //LanayruMountain_0026
 		0x8b7dd33a, //Tabantha_0001
 		0xcce3e817, //Tabantha_0002
-		0xbe289d21 //Tabantha_0003
+		0xbe289d21, //Tabantha_0003
+		0xd7ab50ca, //Zora_Imperial_Palace
+		0xdaaf89ad, //ZoraZonauTerminal
+		0x1d484a39 //IsVisitLocation.Well_0043B //counts as Komo Shoreline Cave
+	],
+	LOCATION_CAVES_VISITED2:[
+		// IsVisitLocationArea_CaveEntrance.
+		hash('IsVisitLocationArea_CaveEntrance.5202740261947854689'), //Cave_Akkala_0000
+		hash('IsVisitLocationArea_CaveEntrance.9055438594216366561'), //Cave_Akkala_0003
+		hash('IsVisitLocationArea_CaveEntrance.15335926447545138291'), //Cave_Akkala_0003
+		hash('IsVisitLocationArea_CaveEntrance.11946399843865969720'), //Cave_Akkala_0005
+		hash('IsVisitLocationArea_CaveEntrance.3457555777151736032'), //Cave_Akkala_0007
+		hash('IsVisitLocationArea_CaveEntrance.11671013565008628074'), //Cave_Akkala_0007
+		hash('IsVisitLocationArea_CaveEntrance.9956353720691210968'), //Cave_Akkala_0010
+		hash('IsVisitLocationArea_CaveEntrance.5431129856634400544'), //Cave_Akkala_0011
+		hash('IsVisitLocationArea_CaveEntrance.1926489202404534798'), //Cave_Akkala_0014
+		hash('IsVisitLocationArea_CaveEntrance.8513000792751676936'), //Cave_Akkala_0014
+		hash('IsVisitLocationArea_CaveEntrance.10142666355873547918'), //Cave_Akkala_0017
+		hash('IsVisitLocationArea_CaveEntrance.7141907819268688467'), //Cave_CentralHyrule_0008
+		hash('IsVisitLocationArea_CaveEntrance.11762902907749850765'), //Cave_CentralHyrule_0008
+		hash('IsVisitLocationArea_CaveEntrance.12880309941609668216'), //Cave_CentralHyrule_0009
+		hash('IsVisitLocationArea_CaveEntrance.3657960895423460399'), //Cave_CentralHyrule_0011
+		hash('IsVisitLocationArea_CaveEntrance.6165471125931240097'), //Cave_CentralHyrule_0011
+		hash('IsVisitLocationArea_CaveEntrance.389621003349275914'), //Cave_CentralHyrule_0013
+		hash('IsVisitLocationArea_CaveEntrance.9927661949732117451'), //Cave_CentralHyrule_0013
+		hash('IsVisitLocationArea_CaveEntrance.2527573203000697251'), //Cave_CentralHyrule_0017
+		hash('IsVisitLocationArea_CaveEntrance.12906757512422296002'), //Cave_CentralHyrule_0017
+		hash('IsVisitLocationArea_CaveEntrance.16097313038490651380'), //Cave_CentralHyrule_0018
+		hash('IsVisitLocationArea_CaveEntrance.16115459957567200699'), //Cave_CentralHyrule_0018
+		hash('IsVisitLocationArea_CaveEntrance.17220565559925033058'), //Cave_CentralHyrule_0018
+		hash('IsVisitLocationArea_CaveEntrance.2989256867079414765'), //Cave_CentralHyrule_0019
+		hash('IsVisitLocationArea_CaveEntrance.8543871419045106707'), //Cave_CentralHyrule_0019
+		hash('IsVisitLocationArea_CaveEntrance.15319933969162710085'), //Cave_CentralHyrule_0020
+		hash('IsVisitLocationArea_CaveEntrance.9124311164147940922'), //Cave_CentralHyrule_0021
+		hash('IsVisitLocationArea_CaveEntrance.8802583314912760024'), //Cave_CentralHyrule_0022
+		hash('IsVisitLocationArea_CaveEntrance.17183873816236198710'), //Cave_CentralHyrule_0023
+		hash('IsVisitLocationArea_CaveEntrance.17925324815156417966'), //Cave_CentralHyrule_0030
+		hash('IsVisitLocationArea_CaveEntrance.2820182978785847885'), //Cave_Eldin_0020
+		hash('IsVisitLocationArea_CaveEntrance.5498372046996718881'), //Cave_Eldin_0021
+		hash('IsVisitLocationArea_CaveEntrance.8060741823458164069'), //Cave_Eldin_0022
+		hash('IsVisitLocationArea_CaveEntrance.16322463971808075566'), //Cave_Eldin_0023
+		hash('IsVisitLocationArea_CaveEntrance.10155351167282120417'), //Cave_Eldin_0025
+		hash('IsVisitLocationArea_CaveEntrance.12604202893589555443'), //Cave_Eldin_0026
+		hash('IsVisitLocationArea_CaveEntrance.12239969978811659575'), //Cave_Eldin_0027
+		hash('IsVisitLocationArea_CaveEntrance.7529527728072030710'), //Cave_Eldin_0028
+		hash('IsVisitLocationArea_CaveEntrance.540094550995474204'), //Cave_Eldin_0029
+		hash('IsVisitLocationArea_CaveEntrance.2334228652024532918'), //Cave_Eldin_0030
+		hash('IsVisitLocationArea_CaveEntrance.10136447089337963341'), //Cave_Eldin_0031
+		hash('IsVisitLocationArea_CaveEntrance.13003868390287574459'), //Cave_Eldin_0033
+		hash('IsVisitLocationArea_CaveEntrance.15630240560201477046'), //Cave_Eldin_0034
+		hash('IsVisitLocationArea_CaveEntrance.1801494508290714306'), //Cave_Eldin_0035
+		hash('IsVisitLocationArea_CaveEntrance.10838082017355715677'), //Cave_Eldin_0037
+		hash('IsVisitLocationArea_CaveEntrance.11860991231750302286'), //Cave_Eldin_0037
+		hash('IsVisitLocationArea_CaveEntrance.6579778402399415550'), //Cave_Eldin_0038
+		hash('IsVisitLocationArea_CaveEntrance.14328941808872340282'), //Cave_Eldin_0039
+		hash('IsVisitLocationArea_CaveEntrance.6252906961473836647'), //Cave_Firone_0002
+		hash('IsVisitLocationArea_CaveEntrance.16931302655167485859'), //Cave_Firone_0008
+		hash('IsVisitLocationArea_CaveEntrance.12887654214926357542'), //Cave_Firone_0009
+		hash('IsVisitLocationArea_CaveEntrance.2291495962666291037'), //Cave_Firone_0016
+		hash('IsVisitLocationArea_CaveEntrance.17794289268484220296'), //Cave_Firone_0016
+		hash('IsVisitLocationArea_CaveEntrance.7325726685713060531'), //Cave_Firone_0020
+		hash('IsVisitLocationArea_CaveEntrance.15876372107227050247'), //Cave_Firone_0022
+		hash('IsVisitLocationArea_CaveEntrance.15142163600578211343'), //Cave_Firone_0023
+		hash('IsVisitLocationArea_CaveEntrance.8786178415487831994'), //Cave_Firone_0024
+		hash('IsVisitLocationArea_CaveEntrance.2282125024947853696'), //Cave_Firone_0029
+		hash('IsVisitLocationArea_CaveEntrance.12199381830158178871'), //Cave_FirstPlateau_0001
+		hash('IsVisitLocationArea_CaveEntrance.9940203994076185236'), //Cave_FirstPlateau_0002
+		hash('IsVisitLocationArea_CaveEntrance.11576020347893843241'), //Cave_GerudoDesert_0007
+		hash('IsVisitLocationArea_CaveEntrance.16690736945446424880'), //Cave_GerudoDesert_0007
+		hash('IsVisitLocationArea_CaveEntrance.12510038422293123766'), //Cave_GerudoDesert_0008
+		hash('IsVisitLocationArea_CaveEntrance.16913007828139583251'), //Cave_GerudoDesert_0015
+		hash('IsVisitLocationArea_CaveEntrance.4202665969653539342'), //Cave_GerudoDesert_0022
+		hash('IsVisitLocationArea_CaveEntrance.10518009420437986971'), //Cave_GerudoDesert_0022
+		hash('IsVisitLocationArea_CaveEntrance.11690670861852633792'), //Cave_GerudoDesert_0030
+		hash('IsVisitLocationArea_CaveEntrance.11996803931487605126'), //Cave_GerudoDesert_0031
+		hash('IsVisitLocationArea_CaveEntrance.15033213358038028919'), //Cave_GerudoDesert_0032
+		hash('IsVisitLocationArea_CaveEntrance.10188228423800036434'), //Cave_GerudoDesert_0035
+		hash('IsVisitLocationArea_CaveEntrance.16166623820286719993'), //Cave_GerudoDesert_0036
+		hash('IsVisitLocationArea_CaveEntrance.9086788533805343256'), //Cave_GerudoDesert_0037
+		hash('IsVisitLocationArea_CaveEntrance.1313747287247900726'), //Cave_GerudoDesert_0039
+		hash('IsVisitLocationArea_CaveEntrance.5912572320237750059'), //Cave_GerudoDesert_0040
+		hash('IsVisitLocationArea_CaveEntrance.10615886098827534628'), //Cave_GerudoDesert_0041
+		hash('IsVisitLocationArea_CaveEntrance.11364247050530626523'), //Cave_GerudoDesert_0041
+		//hash('IsVisitLocationArea_CaveEntrance.12690494979007497354'), //Cave_GerudoDesert_0043 (chasm)
+		hash('IsVisitLocationArea_CaveEntrance.2575716733240401024'), //Cave_GerudoDesert_0044
+		hash('IsVisitLocationArea_CaveEntrance.2733724849251422098'), //Cave_GerudoDesert_0044
+		hash('IsVisitLocationArea_CaveEntrance.3159585809076870306'), //Cave_GerudoDesert_0044
+		hash('IsVisitLocationArea_CaveEntrance.5472907972497701967'), //Cave_GerudoDesert_0044
+		hash('IsVisitLocationArea_CaveEntrance.5917955570761207273'), //Cave_GerudoDesert_0044
+		hash('IsVisitLocationArea_CaveEntrance.6434272510662827856'), //Cave_GerudoDesert_0044
+		hash('IsVisitLocationArea_CaveEntrance.8469685058221282368'), //Cave_GerudoDesert_0044
+		hash('IsVisitLocationArea_CaveEntrance.9697862465374992030'), //Cave_GerudoDesert_0044
+		hash('IsVisitLocationArea_CaveEntrance.10959407977416225522'), //Cave_GerudoDesert_0044
+		hash('IsVisitLocationArea_CaveEntrance.12487379951772716063'), //Cave_GerudoDesert_0044
+		hash('IsVisitLocationArea_CaveEntrance.13271954650858439886'), //Cave_GerudoDesert_0044
+		hash('IsVisitLocationArea_CaveEntrance.16209457192430544208'), //Cave_GerudoDesert_0044
+		hash('IsVisitLocationArea_CaveEntrance.9984383196680075552'), //Cave_GerudoDesert_0045
+		hash('IsVisitLocationArea_CaveEntrance.11848909698461881619'), //Cave_GerudoDesert_0046
+		hash('IsVisitLocationArea_CaveEntrance.15998502860260676292'), //Cave_GerudoDesert_0049
+		hash('IsVisitLocationArea_CaveEntrance.1536461930295375687'), //Cave_GerudoDesert_0050
+		hash('IsVisitLocationArea_CaveEntrance.2556267233275928801'), //Cave_GerudoDesert_0051
+		hash('IsVisitLocationArea_CaveEntrance.17113070533003917624'), //Cave_GerudoDesert_0051
+		hash('IsVisitLocationArea_CaveEntrance.4956085668477112851'), //Cave_GerudoHighlands_0002
+		hash('IsVisitLocationArea_CaveEntrance.13402022485127452447'), //Cave_GerudoHighlands_0008
+		hash('IsVisitLocationArea_CaveEntrance.3829441701169624334'), //Cave_GerudoHighlands_0014
+		hash('IsVisitLocationArea_CaveEntrance.10200413539234062667'), //Cave_GerudoHighlands_0017
+		hash('IsVisitLocationArea_CaveEntrance.5245490651623528104'), //Cave_HateruEast_0000
+		hash('IsVisitLocationArea_CaveEntrance.6098009852430490669'), //Cave_HateruEast_0000
+		hash('IsVisitLocationArea_CaveEntrance.6612796801182890824'), //Cave_HateruEast_0002
+		hash('IsVisitLocationArea_CaveEntrance.17467478120509332272'), //Cave_HateruEast_0002
+		hash('IsVisitLocationArea_CaveEntrance.8024413190787260035'), //Cave_HateruEast_0006
+		hash('IsVisitLocationArea_CaveEntrance.16727300130829770739'), //Cave_HateruEast_0007
+		hash('IsVisitLocationArea_CaveEntrance.6802930745954475552'), //Cave_HateruEast_0008
+		hash('IsVisitLocationArea_CaveEntrance.15520389346876570879'), //Cave_HateruEast_0008
+		hash('IsVisitLocationArea_CaveEntrance.5716892940673620530'), //Cave_HateruEast_0009
+		hash('IsVisitLocationArea_CaveEntrance.8281733242675322304'), //Cave_HateruEast_0013
+		hash('IsVisitLocationArea_CaveEntrance.11546223674095079102'), //Cave_HateruEast_0014
+		hash('IsVisitLocationArea_CaveEntrance.17405104512511432097'), //Cave_HateruEast_0016
+		hash('IsVisitLocationArea_CaveEntrance.2377079948731926345'), //Cave_HateruWest_0002
+		hash('IsVisitLocationArea_CaveEntrance.11536545672066358783'), //Cave_HateruWest_0002
+		hash('IsVisitLocationArea_CaveEntrance.14452390387851187371'), //Cave_HateruWest_0005
+		hash('IsVisitLocationArea_CaveEntrance.4113707437011094988'), //Cave_HateruWest_0006
+		hash('IsVisitLocationArea_CaveEntrance.12637708079017963512'), //Cave_HateruWest_0008
+		hash('IsVisitLocationArea_CaveEntrance.14001688345205756141'), //Cave_HateruWest_0008
+		hash('IsVisitLocationArea_CaveEntrance.5582460455199843960'), //Cave_HateruWest_0011
+		hash('IsVisitLocationArea_CaveEntrance.9741614762982953500'), //Cave_HateruWest_0012
+		hash('IsVisitLocationArea_CaveEntrance.3318512786570605776'), //Cave_Hebra_0000
+		hash('IsVisitLocationArea_CaveEntrance.16469865345460228668'), //Cave_Hebra_0013
+		hash('IsVisitLocationArea_CaveEntrance.237924683186779881'), //Cave_Hebra_0015
+		hash('IsVisitLocationArea_CaveEntrance.11736261478102397242'), //Cave_Hebra_0016
+		hash('IsVisitLocationArea_CaveEntrance.3195307747504654540'), //Cave_Hebra_0019
+		hash('IsVisitLocationArea_CaveEntrance.16325049645669939578'), //Cave_Hebra_0019
+		hash('IsVisitLocationArea_CaveEntrance.2105704342604321749'), //Cave_Hebra_0021
+		hash('IsVisitLocationArea_CaveEntrance.10291314157862112744'), //Cave_Hebra_0022
+		hash('IsVisitLocationArea_CaveEntrance.16902444185789897887'), //Cave_Hebra_0023
+		hash('IsVisitLocationArea_CaveEntrance.12796923671859794342'), //Cave_Hebra_0025
+		hash('IsVisitLocationArea_CaveEntrance.4880616531421497220'), //Cave_Hebra_0026
+		hash('IsVisitLocationArea_CaveEntrance.9544967013646230266'), //Cave_Hebra_0030
+		hash('IsVisitLocationArea_CaveEntrance.14012515669863855641'), //Cave_Hebra_0030
+		hash('IsVisitLocationArea_CaveEntrance.10347911355422425929'), //Cave_Hebra_0035
+		hash('IsVisitLocationArea_CaveEntrance.351273480328625563'), //Cave_Hebra_0036
+		hash('IsVisitLocationArea_CaveEntrance.4424842077643087931'), //Cave_Hebra_0037
+		hash('IsVisitLocationArea_CaveEntrance.15195878330545621010'), //Cave_Hebra_0039
+		hash('IsVisitLocationArea_CaveEntrance.331854384806019930'), //Cave_Hebra_0040
+		hash('IsVisitLocationArea_CaveEntrance.2414130203331476311'), //Cave_Hebra_0041
+		hash('IsVisitLocationArea_CaveEntrance.16911046087036530198'), //Cave_Hebra_0041
+		hash('IsVisitLocationArea_CaveEntrance.3626583673838507069'), //Cave_HyruleForest_0001
+		hash('IsVisitLocationArea_CaveEntrance.17919446484334912137'), //Cave_HyruleForest_0006
+		hash('IsVisitLocationArea_CaveEntrance.17492986739704260639'), //Cave_HyruleForest_0007
+		hash('IsVisitLocationArea_CaveEntrance.15069346870719132772'), //Cave_HyruleForest_0008
+		hash('IsVisitLocationArea_CaveEntrance.7031213641441648501'), //Cave_HyruleRidge_0000
+		hash('IsVisitLocationArea_CaveEntrance.13526831088096570570'), //Cave_HyruleRidge_0000
+		hash('IsVisitLocationArea_CaveEntrance.7396388418196389866'), //Cave_HyruleRidge_0002
+		hash('IsVisitLocationArea_CaveEntrance.7109308500424591297'), //Cave_HyruleRidge_0003
+		//hash('IsVisitLocationArea_CaveEntrance.10595346751399989600'), //Cave_HyruleRidge_0004 (chasm)
+		hash('IsVisitLocationArea_CaveEntrance.16086200349282513170'), //Cave_HyruleRidge_0005
+		hash('IsVisitLocationArea_CaveEntrance.7161951218916542562'), //Cave_HyruleRidge_0006
+		hash('IsVisitLocationArea_CaveEntrance.9727847847192093009'), //Cave_HyruleRidge_0007
+		hash('IsVisitLocationArea_CaveEntrance.1001017030533157593'), //Cave_HyruleRidge_0008
+		hash('IsVisitLocationArea_CaveEntrance.2995591950375801309'), //Cave_Lanayru_0006
+		hash('IsVisitLocationArea_CaveEntrance.18330400566032353940'), //Cave_Lanayru_0006
+		hash('IsVisitLocationArea_CaveEntrance.364284787858635830'), //Cave_Lanayru_0008
+		hash('IsVisitLocationArea_CaveEntrance.12971684091903964185'), //Cave_Lanayru_0014
+		hash('IsVisitLocationArea_CaveEntrance.121149631314393175'), //Cave_Lanayru_0019
+		hash('IsVisitLocationArea_CaveEntrance.4222074271666944644'), //Cave_Lanayru_0019
+		hash('IsVisitLocationArea_CaveEntrance.11770869278850880411'), //Cave_Lanayru_0019
+		hash('IsVisitLocationArea_CaveEntrance.2181612675989647998'), //Cave_Lanayru_0024
+		hash('IsVisitLocationArea_CaveEntrance.2568930561223619483'), //Cave_Lanayru_0024
+		hash('IsVisitLocationArea_CaveEntrance.6920893920509135660'), //Cave_Lanayru_0024
+		hash('IsVisitLocationArea_CaveEntrance.9861517874279084103'), //Cave_Lanayru_0024
+		hash('IsVisitLocationArea_CaveEntrance.6101576164770829020'), //Cave_Lanayru_0032
+		hash('IsVisitLocationArea_CaveEntrance.11067701219318302721'), //Cave_Lanayru_0032
+		hash('IsVisitLocationArea_CaveEntrance.1267684059742163273'), //Cave_Lanayru_0033
+		hash('IsVisitLocationArea_CaveEntrance.8479679440708631302'), //Cave_Lanayru_0033
+		hash('IsVisitLocationArea_CaveEntrance.11416496034161895623'), //Cave_Lanayru_0035
+		hash('IsVisitLocationArea_CaveEntrance.18173532972070437383'), //Cave_Lanayru_0036
+		hash('IsVisitLocationArea_CaveEntrance.6400766332894249911'), //Cave_Lanayru_0048
+		hash('IsVisitLocationArea_CaveEntrance.17915364811553875307'), //Cave_Lanayru_0048
+		hash('IsVisitLocationArea_CaveEntrance.7674390140845792498'), //Cave_Lanayru_0049
+		//hash('IsVisitLocationArea_CaveEntrance.12292698567036544880'), //Cave_Lanayru_0050 (chasm)
+		hash('IsVisitLocationArea_CaveEntrance.8187778331917385311'), //Cave_Lanayru_0052
+		hash('IsVisitLocationArea_CaveEntrance.16226687335351902745'), //Cave_Lanayru_0053
+		hash('IsVisitLocationArea_CaveEntrance.8431162680466675195'), //Cave_Lanayru_0055
+		hash('IsVisitLocationArea_CaveEntrance.1879125739105223517'), //Cave_Lanayru_0057
+		hash('IsVisitLocationArea_CaveEntrance.11232051547730571904'), //Cave_Lanayru_0060
+		hash('IsVisitLocationArea_CaveEntrance.16836248457949403705'), //Cave_Lanayru_0061
+		//hash('IsVisitLocationArea_CaveEntrance.15007569538535704822'), //Cave_Lanayru_0063 (chasm)
+		hash('IsVisitLocationArea_CaveEntrance.5030128869675891494'), //Cave_LanayruMountain_0002
+		hash('IsVisitLocationArea_CaveEntrance.4833086368491217811'), //Cave_LanayruMountain_0006
+		hash('IsVisitLocationArea_CaveEntrance.12154058839145194445'), //Cave_LanayruMountain_0008
+		hash('IsVisitLocationArea_CaveEntrance.7159625979791517502'), //Cave_LanayruMountain_0010
+		hash('IsVisitLocationArea_CaveEntrance.7666999484368155152'), //Cave_LanayruMountain_0010
+		hash('IsVisitLocationArea_CaveEntrance.7764210204243066165'), //Cave_LanayruMountain_0014
+		hash('IsVisitLocationArea_CaveEntrance.306314842763820419'), //Cave_LanayruMountain_0016
+		hash('IsVisitLocationArea_CaveEntrance.2241190132839882887'), //Cave_LanayruMountain_0016
+		hash('IsVisitLocationArea_CaveEntrance.14931006272035364254'), //Cave_LanayruMountain_0022
+		hash('IsVisitLocationArea_CaveEntrance.3729378174235672710'), //Cave_LanayruMountain_0024
+		hash('IsVisitLocationArea_CaveEntrance.6248504940692771516'), //Cave_LanayruMountain_0025
+		hash('IsVisitLocationArea_CaveEntrance.11652366925193288374'), //Cave_LanayruMountain_0025
+		hash('IsVisitLocationArea_CaveEntrance.6874178767484973104'), //Cave_LanayruMountain_0026
+		hash('IsVisitLocationArea_CaveEntrance.12943662571339111896'), //Cave_Tabantha_0001
+		hash('IsVisitLocationArea_CaveEntrance.13346964772528420448'), //Cave_Tabantha_0001
+		hash('IsVisitLocationArea_CaveEntrance.8952894420645753579'), //Cave_Tabantha_0002
+		hash('IsVisitLocationArea_CaveEntrance.14339936005749917162'), //Cave_Tabantha_0003
+		hash('IsVisitLocationArea_CaveEntrance.61885230894290162'), //Zora_Imperial_Palace
+		hash('IsVisitLocationArea_CaveEntrance.16374285261465503098'), //Zora_Imperial_Palace
+		hash('IsVisitLocation.ZoraZonauTerminal'), //ZoraZonauTerminal - IsVisitLocationArea_CaveEntrance.741356389245422926????
+		hash('IsVisitLocationArea_CaveEntrance.11637077966753549118') //Well_0043B
 	],
 	LOCATION_WELLS_VISITED:[
 		//IsVisitLocation.Well_
@@ -627,7 +854,6 @@ var CompletismHashes={
 		0xd48a39a6, //0041
 		0x4046d03d, //0042
 		0xc34379ae, //0043
-		//0x1d484a39, //IsVisitLocation.Well_0043B //counts as Komo Shoreline Cave
 		0x10358cdf, //0044
 		0x52446b30, //0045
 		0x0b01b135, //0046
@@ -777,7 +1003,7 @@ var CompletismHashes={
 		0x542a183e, //GerudoDesert_0039
 		0x173aaee7, //GerudoDesert_0040
 		0x6728247e, //GerudoDesert_0041
-		0x29e4a302, //GerudoDesert_0043
+		//0x29e4a302, //GerudoDesert_0043 (chasm)
 		0xa8c973a3, //GerudoDesert_0044
 		0xb8f1f3c1, //GerudoDesert_0045
 		0x393e032c, //GerudoDesert_0046
@@ -827,7 +1053,7 @@ var CompletismHashes={
 		0x0c4fa74c, //HyruleRidge_0000
 		0x52b7f157, //HyruleRidge_0002
 		0x67acbeb9, //HyruleRidge_0003
-		0xca24f955, //HyruleRidge_0004
+		//0xca24f955, //HyruleRidge_0004 (chasm)
 		0xe6e5f556, //HyruleRidge_0005
 		0xc7aa5ca0, //HyruleRidge_0006
 		0x1f24ce09, //HyruleRidge_0007
@@ -843,14 +1069,14 @@ var CompletismHashes={
 		0xbf93c5f7, //Lanayru_0036
 		0xfbe18fd6, //Lanayru_0048
 		0x0aadbad2, //Lanayru_0049
-		0x6ade83b3, //Lanayru_0050
+		//0x6ade83b3, //Lanayru_0050 (chasm)
 		0x61cabc09, //Lanayru_0052
 		0xe6a0230a, //Lanayru_0053
 		0x8d797c20, //Lanayru_0055
 		0xe349a05c, //Lanayru_0057
 		0xa05c2ee9, //Lanayru_0060
 		0x6df6538a, //Lanayru_0061
-		0x52e5cfba, //Lanayru_0063
+		//0x52e5cfba, //Lanayru_0063 (chasm)
 		0xae1f8688, //LanayruMountain_0002
 		0xe9fd11b0, //LanayruMountain_0006
 		0xd99ae420, //LanayruMountain_0008
@@ -863,7 +1089,10 @@ var CompletismHashes={
 		0x57acfa65, //LanayruMountain_0026
 		0x801e08e3, //Tabantha_0001
 		0x891f9219, //Tabantha_0002
-		0xf8017f51 //Tabantha_0003
+		0xf8017f51, //Tabantha_0003
+		0x825b96c0, //Zora_Imperial_Palace
+		0x5b4fdd02, //ZoraZonauTerminal
+		0x1f859e86 //IsVisitLocation.Well_0043B //counts as Komo Shoreline Cave
 	],
 
 	SCHEMATICS_STONE_FOUND:[
@@ -1251,6 +1480,41 @@ var CompletismHashes={
 
 
 
+	TREASURE_MAPS_FOUND:[
+		0x78351b17, //IsFindTreasureMap.Armor_230_Head
+		0xa77d686d, //IsFindTreasureMap.Armor_230_Upper
+		0x17110169, //IsFindTreasureMap.Armor_230_Lower
+		0x2b60b4b7, //IsFindTreasureMap.Armor_200_Head
+		0x28ae6f1c, //IsFindTreasureMap.Armor_200_Upper
+		0x7a1d84a5, //IsFindTreasureMap.Armor_200_Lower
+		0x56aa6296, //IsFindTreasureMap.Armor_205_Head
+		0x5a06eebb, //IsFindTreasureMap.Armor_205_Upper
+		0xdd8a40d8, //IsFindTreasureMap.Armor_205_Lower
+		0x17aea64c, //IsFindTreasureMap.Armor_210_Head
+		0x29889eb8, //IsFindTreasureMap.Armor_210_Upper
+		0xc576b6bd, //IsFindTreasureMap.Armor_210_Lower
+		0x3044e564, //IsFindTreasureMap.Armor_215_Head
+		0xad134aed, //IsFindTreasureMap.Armor_215_Upper
+		0x5aa6fa9f, //IsFindTreasureMap.Armor_215_Lower
+		0xfb332413, //IsFindTreasureMap.Armor_005_Head
+		0xdfdded1c, //IsFindTreasureMap.Armor_005_Upper
+		0x00e34536, //IsFindTreasureMap.Armor_005_Lower
+		0xbb11e8f5, //IsFindTreasureMap.Armor_176_Head
+		0xb672271b, //IsFindTreasureMap.Armor_220_Head
+		0x7b5a8ac8, //IsFindTreasureMap.Armor_172_Head
+		0xeb171a92, //IsFindTreasureMap.Armor_173_Head
+		0x05b058c7, //IsFindTreasureMap.Armor_177_Head
+		0x91916a39, //IsFindTreasureMap.Armor_178_Head
+		0x24fd5dc6, //IsFindTreasureMap.Weapon_Sword_058
+		0xde966d31, //IsFindTreasureMap.Weapon_Lsword_059
+		0x8a67682c, //IsFindTreasureMap.Weapon_Sword_059
+		0xa2c5ee99, //IsFindTreasureMap.Weapon_Shield_057
+		0x5875357a, //IsFindTreasureMap.Armor_1051_Head
+		0x840cfa81, //IsFindTreasureMap.Armor_1051_Upper
+		0xe112f9e2 //IsFindTreasureMap.Armor_1051_Lower
+	],
+
+
 	COMPENDIUM_STATUS:[
 		//PictureBookData.XXX.State
 		0xbbf256d3,0x9ff57115,0x20a5ace9,0x35fc77fb,0xc5b45cc3,0x67386b44,0x1f2816d2,0x493a7ea3,0x68b56527,0x6cb0007b,
diff --git a/zelda-totk/zelda-totk.coordinates.js b/zelda-totk/zelda-totk.coordinates.js
index bd07bc2..1ce0108 100644
--- a/zelda-totk/zelda-totk.coordinates.js
+++ b/zelda-totk/zelda-totk.coordinates.js
@@ -1,5 +1,5 @@
 /*
-	The legend of Zelda: Tears of the Kingdom Savegame Editor (MapPin class and collectible map raw coordinates) v20230608
+	The legend of Zelda: Tears of the Kingdom savegame editor - MapPin class and collectible map raw coordinates (last update 2023-07-08)
 
 	by Marc Robledo 2023
 	research & information compiled by MacSpazzy, Karlos007 and Echocolat
@@ -12,10 +12,13 @@ function MapPin(index, icon, coordinates, map){
 
 	this.icon=icon;
 	this.coordinates=coordinates;
+	this.coordinates.x=MapPin.formatFloat(this.coordinates.x);
+	this.coordinates.y=MapPin.formatFloat(this.coordinates.y);
+	this.coordinates.z=MapPin.formatFloat(this.coordinates.z);
 	this.map=map;
 }
-MapPin.prototype.clear=function(){
-	if(!this.isFree()){
+MapPin.prototype.clear=function(onlyIcon){
+	if((onlyIcon && this.icon===onlyIcon) || (!onlyIcon && !this.isFree())){
 		this.icon=MapPin.ICON_NONE;
 		this.coordinates={x:0.0, y:0.0};
 		this.map=MapPin.MAP_MAIN;
@@ -54,9 +57,14 @@ MapPin.count=function(mapPins){
 	return count;
 }
 MapPin.find=function(mapPins, x, y, z){
+	x=MapPin.formatFloat(x);
+	y=MapPin.formatFloat(y);
+	z=MapPin.formatFloat(z);
 	for(var i=0; i<mapPins.length; i++){
-		if(mapPins[i].coordinates.x===x && mapPins[i].coordinates.y===y && mapPins[i].map===MapPin.getMapByZ(z))
+		if(mapPins[i].coordinates.x===x && mapPins[i].coordinates.y===y && mapPins[i].map===MapPin.getMapByZ(z)){
+			//console.log(x+', '+y+', '+z);
 			return true;
+		}
 	}
 	return false;
 }
@@ -68,6 +76,15 @@ MapPin.getMapByZ=function(z){
 	return MapPin.MAP_MAIN;
 }
 
+
+MapPin.formatFloat=function(f32){
+	var arr=new Float32Array(1);
+	arr[0]=f32;
+	return arr[0];
+}
+
+
+
 MapPin.ICON_NONE=0x7e3d1e46; //Invalid
 MapPin.ICON_SWORD=0xb3005873; //Sword
 MapPin.ICON_POT=0x9f0d8121; //Pot
@@ -88,8 +105,23 @@ MapPin.MAP_MINUS=0xf0235d8d; //Underground
 MapPin.MAX=300;
 
 
+//during pin to map feature, map layer is calculated according to the Z coordinate
+//some shrines are below the Sky<->Hyrule threshold (750), so we add an offset to them in order to the pin be placed in the correct layer
+const LAYER_FIX=500;
+
 
 const Coordinates={
+toRaw:function(gameCoordinates){
+	//if(typeof gameCoordinates==='object' && typeof gameCoordinates.x==='number')
+	//	return Coordinates.toRaw(gameCoordinates.x, gameCoordinates.y, gameCoordinates.z);
+	return [gameCoordinates[0], gameCoordinates[2]+105, -gameCoordinates[1]]
+},
+fromRaw:function(rawCoordinates){
+	//if(typeof rawCoordinates==='object' && typeof rawCoordinates.x==='number')
+	//	return Coordinates.toRaw(rawCoordinates.x, rawCoordinates.y, rawCoordinates.z);
+	return [rawCoordinates[0], -rawCoordinates[2], rawCoordinates[1]-105]
+},
+
 SHRINES:[
 	[343.85880,135.69970,1009.02600], //3706669599997098509
 	[4346.61700,284.19680,-2876.19100], //3706669599451864052
@@ -200,7 +232,7 @@ SHRINES:[
 	[354.65410,297.70820,-1891.89400], //11192380528645083635
 	[2304.06000,90.03803,2377.93100], //17518095894583343332
 	[166.66010,298.16850,-2320.12600], //8050356554736513946
-	[1376.40800,548.01390,3339.86000], //16559659105908682856
+	[1376.40800,548.01390 + LAYER_FIX,3339.86000], //16559659105908682856
 	[3670.70000,1276.90000,-1483.69700], //10321403316262478069
 	[-2997.81100,633.92930,-3101.62700], //15663201104618704077
 	[2755.53300,219.20460,1089.25300], //8029632291316616039
@@ -212,7 +244,7 @@ SHRINES:[
 	[-4158.70700,146.90000,3825.29300], //13812044788472212303
 	[2361.23800,275.39500,510.75050], //18320955024951674721
 	[349.28310,92.14629,2051.54400], //258025124944826518
-	[-2401.84400,734.31790,-825.22710], //14199645569445824140
+	[-2401.84400,734.31790 + LAYER_FIX,-825.22710], //14199645569445824140
 	[1565.83800,276.56460,1944.80700], //3706669599740966765
 	[333.15160,148.04060,-470.00590], //2116984015830799764
 	[-74.91470,140.08480,1115.72300], //15035282945062776479
@@ -241,7 +273,7 @@ SHRINES:[
 	[393.85650,187.54430,-3484.64500], //17578465468269309307
 	[-3546.68200,2083.98700,320.65480], //8915616496436459985
 	[340.39370,1939.90000,-2814.73200], //2421293063711975271
-	[1468.61100,704.81320,2168.89300], //7242573067115231041
+	[1468.61100,704.81320 + LAYER_FIX,2168.89300], //7242573067115231041
 	[-1802.01700,1067.90000,-3406.80700] //9837676963057931142
 ],
 LIGHTROOTS:[
@@ -1172,7 +1204,110 @@ KOROKS_HIDDEN:[
 	[-3245.854,677.7391,1030.86] //9958277342872368886
 ],
 KOROKS_CARRY:[
-	[587.7462,117.107,1580.599], //10035618609325695840
+	/*KorokCarryProgressKeeper*/
+	[47.48,163.5,1691.05], //10035618609325695840
+	[523,161.5,2199], //10147912760170894537
+	[2859.77,146,1910.28], //1027829103425503827
+	[-3344.99,146.59,3058.17], //10530533416107128098
+	[-322.37,205.52,-3161.93], //10648733530437086844
+	[-4263.1,95,-2176.5], //10765936993113452918
+	[2242.82,120,-243.97], //10884485578138139295
+	[1720.1,535.93,-2610.61], //11058875431153592516
+	[428,132.5,-501], //11202514477440889488
+	[-4138.99,151.36,2259.98], //11271636085079936375
+	[3688.03,350.5,3314.68], //11811958806114551925
+	[-2834.8,687.5,-2841.93], //11875758624767344318
+	[2542.26,233.35,-641.99], //11896787561078353905
+	[-1615.44,100.53,2403.14], //11937967932341810839
+	[-2962,249.5,-84.5], //1197214492947962803
+	[29.3,1521.26,1254.91], //12130885694327852729
+	[2644.97,233,2120.32], //12847198751504072774
+	[4353.2,184.06,-2537.93], //12867974234227336785
+	[-304.48,130.27,3292.94], //12925413538446962496
+	[1767.23,120.76,1864.98], //13096531038553645768
+	[-1433.48,299,-1478.95], //13222893714975519401
+	[67.88,111,3759.13], //13247469126542819452
+	[795,116,507.9], //13276398725536494111
+	[-4610.9,143.5,3198.5], //13397407553973487668
+	[-4540.5,633.5,1344], //13406578000478771737
+	[2808.93,252,-180.7], //13574721167545880769
+	[-2890.94,352.4,-3491.44], //13715318254682426167
+	[543.2,122.48,-1098.43], //14086010442264569915
+	[-1797.98,225,323.45], //14386365983047131468
+	[-3670.76,429,-3383.01], //14474122671074317609
+	[1534,411.5,-1609], //14620345371264461858
+	[3655.03,109,607.32], //14675420841305621627
+	[-1382.98,361.5,-3632.45], //1467646013161089597
+	[3349.6,327,-3664.5], //14743492415969903566
+	[2640.73,263.38,-1111.53], //14755292463343432412
+	[-694.28,172,1576.46], //14835004004034249742
+	[3088.6,302,-1757.78], //14913775068882522158
+	[3498.97,268.21,1454.68], //15014578422836026966
+	[1982.51,528.5,-2037.77], //15217693042586832359
+	[1872.51,344.07,813.88], //15261531300099259671
+	[3778.4,636.5,-447], //15270416955868479146
+	[-2982.4,131,2327.5], //1559566833430240376
+	[-1019,304.5,2640.6], //15764967962530007701
+	[1544.5,388.5,-1808.51], //15812195146511308260
+	[475.46,1548.39,1698.93], //15896625821746789069
+	[4001.55,281.5,184.31], //15951088143512413279
+	[1816.66,507,-2645.48], //16672092331503822504
+	[3544.68,106.16,3456.24], //1701261354463979089
+	[-2871.88,284.77,-494.62], //17015045044967365539
+	[4290.57,258.5,-1610.8], //17210919258426000638
+	[-2084.43,209.5,-482.3], //17594093809162698318
+	[2375.05,236.68,-1403.28], //17670912282596839597
+	[3531.7,317,65.07], //17802606411144917162
+	[221.57,175.5,3533.8], //18153127729825633248
+	[2478.43,116.16,1740.21], //18235969829881518418
+	[630.03,117.82,961.98], //1845078604478085116
+	[3248,236.5,2283], //1977590426358230894
+	[-2339.82,509.5,-2955.47], //2065394700677686397
+	[-452,125.5,1649.6], //2425953548859621426
+	[2176.44,628.5,-2783], //2753782435549223662
+	[3965.74,284.5,-3097.01], //3033022659337824191
+	[2245.49,135,3469.26], //3039055495308853332
+	[1025,216.5,-3671], //3140500857535214931
+	[-1356.41,151.86,1307.46], //3643785449856294086
+	[-3580.6,176.5,-12.5], //4192588996974612514
+	[514.22,288.5,-3396.6], //4278308988828624825
+	[-39.05,128,1112.52], //4386102791994685188
+	[1169.4,115.5,1883], //4494468278546116134
+	[-546,373.5,-2223], //5036066410770918472
+	[3747.84,199.5,-2307.5], //5145081417529458167
+	[-1126.81,249.73,1970.13], //5230411027965047570
+	[770.53,241.5,2138.18], //5298571532246140711
+	[-188.5,125,2243.66], //55136037473008208
+	[1397.62,107.61,3642.27], //5634362082519974124
+	[2458.03,325.5,2911.18], //5869665143813001026
+	[522,156.26,3464], //5937135356624406219
+	[4054.92,381.75,-947.96], //661645095586149546
+	[2828.52,106.5,3886.45], //6773575892270236835
+	[-3818.56,157.54,3126.49], //702982911163221302
+	[-776.07,123.5,500.62], //711316197736138568
+	[1502.18,119.5,334.47], //7200846769452032765
+	[-2795.5,459.72,-2304.9], //7205909546088832266
+	[-2430.6,340.19,2119.28], //7252382242329520081
+	[3729.1,307,2159], //7705700044124304347
+	[1537.1,115.5,-511.5], //7786864151230414866
+	[293,133.17,1204.5], //8004497664373186229
+	[-3199.49,584.89,1169.53], //8497568152468259638
+	[-2491.4,131.75,3348.47], //857511348685999225
+	[-1971.86,139.55,2085.11], //879993071457401920
+	[2691.3,217.05,542.07], //882636985276030155
+	[1611.22,166.5,3490.6], //8971903895020413263
+	[1250.28,527.5,-3002.6], //8993451623919032985
+	[-1550.65,133.5,1000.09], //9073478381193169871
+	[4282,277.5,-3270.5], //9329678298925105483
+	[4202.73,233.18,-2739.48], //9380338098995773009
+	[-3614.14,395.17,-983], //9539946314806298996
+	[960.98,137.07,201.78], //9545094517092549436
+	[-1541.8,344,-2555.93], //9705479798924140351
+	[-779.44,122.85,-938.84], //9707096629495885452
+	[489,280.85,-3057.5] //9734881248452388660
+
+	/*Destination*/
+	/*[587.7462,117.107,1580.599], //10035618609325695840
 	[343.6176,163.1467,2182.513], //10147912760170894537
 	[3251.264,205.2559,2114.156], //1027829103425503827
 	[-3078.855,120.2991,3044.774], //10530533416107128098
@@ -1271,540 +1406,367 @@ KOROKS_CARRY:[
 	[1195.869,125.6217,649.251], //9545094517092549436
 	[-1347.099,309.0212,-2791.652], //9705479798924140351
 	[-752.6859,150.4247,-1070.674], //9707096629495885452
-	[594.2153,293.8267,-3043.842] //9734881248452388660
+	[594.2153,293.8267,-3043.842] //9734881248452388660*/
 ],
 
 
 
 LOCATION_CAVES:[
-[4122.229, 299.179, -662.295], //Cave_Akkala_0000
-//[4122.229, 293.179, -662.295],
-
-[4272.99, 258.8511, -774.3162], //Cave_Akkala_0003
-//[4505, 209.9406, -705.1617],
-
-[3925.927, 218.3195, -1576.423], //Cave_Akkala_0005
-//[3925.927, 212.5605, -1576.423],
-
-[3678.723, 183.5108, -1538.252], //Cave_Akkala_0007
-//[3678.723, 179.5108, -1538.252],
-//[3735.437, 190.3167, -1534.085],
-//[3735.437, 186.3167, -1534.085],
-
-[3243.716, 404.535, -1456.824], //Cave_Akkala_0010
-//[3243.716, 399.535, -1456.824],
-
-[3321.5, 286.5, -3424], //Cave_Akkala_0011
-//[3321.5, 276.5, -3424],
-
-[4645.503, 118.9944, -3206.834], //Cave_Akkala_0014
-//[4645.503, 111.9944, -3206.834],
-//[4650.67, 104.5, -3584.908],
-//[4650.67, 54.5, -3584.908],
-
-[3292.5, 510.0642, -1492], //Cave_Akkala_0017
-//[3292.5, 500.0642, -1492],
-
-[37.30195, 128.1821, 198.8625], //Cave_CentralHyrule_0008
-//[6.009788, 141.0668, 157.9319],
-//[37.30195, 124.1821, 198.8625],
-//[6.009788, 136.0668, 157.9319],
-
-[-832.3462, 137.4909, 1488.377], //Cave_CentralHyrule_0009
-//[-832.3462, 132.4909, 1488.377],
-
-[711.5814, 1596.062, 1449.099], //Cave_CentralHyrule_0011
-//[739.0957, 1652.759, 1358.025],
-//[711.5814, 1591.062, 1449.099],
-//[739.0957, 1647.759, 1358.025],
-
-[587.4191, 1553.043, 1624.505], //Cave_CentralHyrule_0013
-//[632.1589, 1593.918, 1638.774],
-//[632.2798, 1588.919, 1638.811],
-//[587.4191, 1548.043, 1624.505],
-
-[170.5166, 1487.815, 1633.773], //Cave_CentralHyrule_0017
-//[260.1547, 1471.727, 1557.838],
-//[170.5166, 1482.815, 1633.773],
-//[260.1547, 1466.727, 1557.838],
-
-[-253.8396, 120.3645, -98], //Cave_CentralHyrule_0018
-//[-253.8998, 212.6871, -749.0048],
-//[-318.5, 182.7972, -782.5],
-//[-325.6665, 159.5706, -802.5264],
-//[-254.0375, 113.5017, -129],
-//[-253.9667, 132.8978, -767.084],
-
-[380.06, 1521.65, 1631.647], //Cave_CentralHyrule_0019
-//[489.6634, 1483.25, 1625.622],
-//[380.06, 1516.65, 1631.647],
-//[489.6634, 1473.25, 1625.622],
-
-[-1111.5, 148.2, 432.0626], //Cave_CentralHyrule_0020
-//[-1111.5, 128.2, 432.0626],
-
-[-72.10925, 125.9356, 1045.974], //Cave_CentralHyrule_0021
-//[-72.10925, 122.9356, 1045.974],
-
-[-512.3591, 130.869, -127.5918], //Cave_CentralHyrule_0022
-//[-512.3591, 125.869, -127.5918],
-
-[-1167.155, 137.7493, 1310.977], //Cave_CentralHyrule_0023
-//[-1167.155, 127.7493, 1310.977],
-
-[-1404.5, 108.66, 256.5], //Cave_CentralHyrule_0030
-//[-1404.5, 101.56, 256.5],
-
-[2767.812, 634.8295, -2778.185], //Cave_Eldin_0020
-//[2767.812, 626.8295, -2778.185],
-
-[2238.605, 636.0185, -2682.376], //Cave_Eldin_0021
-//[2238.605, 626.0185, -2682.376],
-
-[2373.343, 561.8396, -3051.703], //Cave_Eldin_0022
-//[2373.343, 550.8396, -3051.703],
-
-[1554.559, 506.4309, -3102.513], //Cave_Eldin_0023
-//[1554.559, 498.4309, -3102.513],
-
-[1423.078, 394.9322, -2102.729], //Cave_Eldin_0025
-//[1423.078, 389.9322, -2102.729],
-
-[1746.19, 450.72, -1926.52], //Cave_Eldin_0026
-//[1800.955, 425.9151, -1983.352],
-
-[2016, 531.2755, -2038.984], //Cave_Eldin_0027
-//[2016, 526.2755, -2038.984],
-
-[1642.848, 389.5436, -1729.563], //Cave_Eldin_0028
-//[1642.848, 384.5436, -1729.563],
-
-[1853.956, 406.4446, -1719.953], //Cave_Eldin_0029
-//[1853.956, 397.4446, -1719.953],
-
-[2206.314, 514.6932, -3075.319], //Cave_Eldin_0030
-//[2206.314, 510.9432, -3075.319],
-
-[2485.386, 268.3781, -1792.983], //Cave_Eldin_0031
-//[2485.386, 263.3781, -1792.983],
-
-[1764.653, 511.2603, -2837.404], //Cave_Eldin_0033
-//[1764.653, 505.2603, -2837.404],
-
-[1713.881, 511.1068, -2718.587], //Cave_Eldin_0034
-//[1713.881, 506.1068, -2718.587],
-
-[1949.909, 537.4574, -2687.209], //Cave_Eldin_0035
-//[1949.909, 531.4574, -2687.209],
-
-[1929.11, 238.2568, -1278.69], //Cave_Eldin_0037
-//[1931.949, 283.4043, -1312.395],
-//[1929.5, 227.2706, -1271.645],
-//[1931.949, 273.6543, -1304.573],
-
-[2593.647, 261.4519, -1330.448], //Cave_Eldin_0038
-//[2593.647, 256.4519, -1330.448],
-
-[2275.316, 267.5, -1520.099], //Cave_Eldin_0039
-//[2275.316, 262.5, -1520.099],
-
-[809.8935, 121.2152, 2971.707], //Cave_Firone_0002
-//[809.8935, 116.2152, 2971.707],
-
-[671.8048, 134.3863, 3109.481], //Cave_Firone_0008
-//[671.8048, 129.3863, 3109.481],
-
-[1169.23, 283.2793, 2443.27], //Cave_Firone_0009
-//[1169.635, 282.5722, 2443.85],
-
-[-176.3386, 126.6612, 3062.832], //Cave_Firone_0016
-//[-256.1517, 101.9714, 2940.198],
-//[-256.1517, 86.97139, 2940.198],
-//[-171.1738, 92.30429, 3067.066],
-
-[568.6034, 123.2259, 2981.877], //Cave_Firone_0020
-//[568.6034, 118.2259, 2981.877],
-
-[1203.094, 135.9193, 3170.906], //Cave_Firone_0022
-//[1203.094, 130.9193, 3170.906],
-
-[126.18, 68.16491, 2501.39], //Cave_Firone_0023
-//[125.7477, 15.91255, 2501.451],
-
-[608.9023, 161.3276, 2210.08], //Cave_Firone_0024
-//[608.9023, 156.3276, 2210.08],
-
-[280.2788, 135.6949, 3875.137], //Cave_Firone_0029
-//[283.978, 138.5791, 3851.469],
-
-[-1111.638, 254.71, 2148.178], //Cave_FirstPlateau_0001
-//[-1092.381, 249.1899, 2162.711],
-
-[-1061.875, 252.6713, 1829.554], //Cave_FirstPlateau_0002
-//[-1061.875, 247.6713, 1829.554],
-
-[-3763.073, 140.5631, 2698], //Cave_GerudoDesert_0007
-//[-3763.275, 130.3909, 2420.758],
-//[-3763.275, 120.3909, 2698.519],
-//[-3763.275, 120.3909, 2420.758],
-
-[-3827.19, 145.7133, 2650.319], //Cave_GerudoDesert_0008
-//[-3827.19, 140.7133, 2650.319],
-
-[-3242.9, 104.4685, 2936.6], //Cave_GerudoDesert_0015
-//[-3238.816, 39.57154, 2939.655],
-
-[-1795.805, 143.65, 1961.14], //Cave_GerudoDesert_0022
-//[-1967.004, 145.5133, 2059.611],
-//[-1967.004, 135.5133, 2059.611],
-//[-1795.805, 136.65, 1961.14],
-
-[-1527.762, 89.89854, 2222.542], //Cave_GerudoDesert_0030
-//[-1527.762, 84.89854, 2222.542],
-
-[-2696.307, 94.37949, 2809.372],//Cave_GerudoDesert_0031
-//[-2696.025, 38.1045, 2808.615],
-
-[-3679.051, 97.04066, 3255.366], //Cave_GerudoDesert_0032
-//[-3679.051, 87.04066, 3255.366],
-
-[-1726.964, 115.5759, 2183.379], //Cave_GerudoDesert_0035
-//[-1726.964, 110.5759, 2183.379],
-
-[-1744.354, 99.30705, 2394.182], //Cave_GerudoDesert_0036
-//[-1744.354, 94.30705, 2394.182],
-
-[-2215.908, 357.7064, 2395.27], //Cave_GerudoDesert_0037
-//[-2215.908, 352.7064, 2395.27],
-
-[-3099.359, 63.95093, 3063.779], //Cave_GerudoDesert_0039
-//[-3099.359, 53.95093, 3063.779],
-
-[-2941, 100.52, 3857.9], //Cave_GerudoDesert_0040
-//[-2939.102, 68.4035, 3857.828],
-
-[-2173.727, 242.0874, 1841.648], //Cave_GerudoDesert_0041
-//[-2258.922, 171.9476, 1759.334],
-//[-2258.922, 161.9476, 1759.334],
-//[-2173.727, 232.0874, 1841.648],
-
-[-2491.19300, 111.23990, 3067.73800], //Cave_GerudoDesert_0043
-
-[-2521.423, 97.38815, 3725], //Cave_GerudoDesert_0044
-//[-2535.542, 57.27916, 3626.101],
-//[-2518.917, 57.84764, 3671.562],
-//[-2584.241, 57.52135, 3638.208],
-//[-2570.56, 54.07516, 3744.447],
-//[-2530.788, 58.68051, 3769.119],
-//[-2480.565, 58.84991, 3758.143],
-//[-2521.204, 58.38428, 3724.844],
-//[-2564.693, 57.20284, 3681.715],
-//[-2451.857, 58.97064, 3676.729],
-//[-2480.763, 58.91989, 3632.817],
-//[-2477.854, 58.3941, 3709.82],
-//[-2604.787, 55.75517, 3709.315],
-
-[-3354.8, 121, 2694.6], //Cave_GerudoDesert_0045
-//[-3354.94, 101.1725, 2693.962],
-
-[-4814.321, 112, 3875.428], //Cave_GerudoDesert_0046
-//[-4814.321, 104.5, 3875.428],
-
-[-4673.2, 119.7035, 1986.137], //Cave_GerudoDesert_0049
-//[-4673.2, 114.7035, 1986.137],
-
-[-2413.649, 255.2226, 1824.038], //Cave_GerudoDesert_0050
-//[-2433.913, 251.2361, 1819.683],
-
-[-2611.278, 222.9838, 2604.77], //Cave_GerudoDesert_0051
-//[-2676.715, 190.073, 2402.609],
-//[-2611.278, 217.9838, 2604.77],
-//[-2676.715, 185.073, 2402.609],
-
-[-2476.52, 287.5917, 1809.22], //Cave_GerudoHighlands_0002
-//[-2457.328, 281.7868, 1798.546],
-
-[-4384.535, 584.2957, 536.5526], //Cave_GerudoHighlands_0008
-//[-4384.535, 579.2957, 536.5526],
-
-[-3982.832, 542.1691, 1245.38], //Cave_GerudoHighlands_0014
-//[-3982.832, 532.1691, 1245.38],
-
-[-3881.652, 681.944, 726.7761], //Cave_GerudoHighlands_0017
-//[-3881.652, 675.3375, 726.7761],
-
-[3235.51, 177.44, 3017.51], //Cave_HateruEast_0000
-//[3291.834, 174, 3332.983],
-//[3224.249, 164.9509, 3017.773],
-//[3291.353, 170.0782, 3296.459],
-
-[1788.839, 194.6686, 3012], //Cave_HateruEast_0002
-//[1959.679, 181.6188, 2611.651],
-//[1959.679, 176.6188, 2611.651],
-//[1789.542, 185.8739, 2985.635],
-
-[1676.795, 274.8358, 3038.773], //Cave_HateruEast_0006
-//[1676.795, 269.8358, 3038.773],
-
-[1896.399, 265.528, 3111.244], //Cave_HateruEast_0007
-//[1896.399, 237.528, 3111.244],
-
-[1958.782, 314.8886, 3032.786], //Cave_HateruEast_0008
-//[2009.624, 288.4404, 3164.034],
-//[1958.782, 298.3886, 3032.786],
-//[2009.624, 282.4404, 3164.034],
-
-[1813.53, 229, 3738.02], //Cave_HateruEast_0009
-//[1813.53, 224, 3738.02],
-
-[4752.63, 121.7059, 3781.506], //Cave_HateruEast_0013
-//[4752.63, 99.20595, 3781.506],
-
-[1446.719, 184.7728, 3483.647], //Cave_HateruEast_0014
-//[1446.719, 182.7728, 3483.65],
-
-[2454, 175, 3193], //Cave_HateruEast_0016
-//[2454, 170, 3193],
-
-[1611.714, 128.7817, 804], //Cave_HateruWest_0002
-//[1617, 142.2283, 1260],
-//[1617, 112.4627, 1260],
-//[1587.754, 111.5236, 812.1858],
-
-[1947.489, 265.4827, 981.817], //Cave_HateruWest_0005
-//[1947.489, 262.9827, 981.817],
-
-[1877.434, 309.0427, 1160.383], //Cave_HateruWest_0006
-//[1877.434, 304.0427, 1160.383],
-
-[1328.358, 244.9518, 1156.223], //Cave_HateruWest_0008
-//[1373.024, 240.2808, 1197.249],
-//[1373.024, 235.2808, 1197.249],
-//[1328.358, 239.9518, 1156.223],
-
-[1194.246, 268.427, 1853.947], //Cave_HateruWest_0011
-//[1194.457, 263.4327, 1854.056],
-
-[1183.372, 356, 1947.553], //Cave_HateruWest_0012
-//[1183.372, 351, 1947.553],
-
-[-4041.161, 135.7831, -2671.444], //Cave_Hebra_0000
-//[-4041.161, 128.7831, -2671.444],
-
-[-4429.344, 333.8416, -3760.204], //Cave_Hebra_0013
-//[-4429.344, 328.8416, -3760.204],
-
-[-3932, 94.24, -2853.611], //Cave_Hebra_0015
-//[-3930.992, 87.47372, -2861.257],
-
-[-2900.156, 500.4017, -2510.26], //Cave_Hebra_0016
-//[-2900.156, 493.4017, -2510.26],
-
-[-2414.122, 485.1641, -3136.461], //Cave_Hebra_0019
-//[-2642.285, 361.5, -3268.3],
-//[-2642.285, 354.5, -3268.3],
-//[-2414.122, 478.1641, -3136.461],
-
-[-3814.609, 368.5, -3595.483], //Cave_Hebra_0021
-//[-3814.609, 360.5, -3595.483],
-
-[-3010.71, 673, -3216.431], //Cave_Hebra_0022
-//[-2995.566, 645.4677, -3225.751],
-
-[-3005.719, 311.8382, -1635.029], //Cave_Hebra_0023
-//[-3005.719, 304.8382, -1635.029],
-
-[-3571.5, 337.7415, -2475], //Cave_Hebra_0025
-//[-3559.555, 332.716, -2488.378],
-
-[-3214.608, 456.0323, -2462.24], //Cave_Hebra_0026
-//[-3214.608, 451.0323, -2462.24],
-
-[-3227.5, 551.66, -2535.71], //Cave_Hebra_0030
-//[-3398.434, 423.3941, -2499.361],
-//[-3398.434, 418.6059, -2499.361],
-//[-3227.496, 547.1563, -2535.279],
-
-[-2840.931, 334.4799, -1771.911], //Cave_Hebra_0035
-//[-2840.931, 328.4799, -1771.911],
-
-[-1372.09, 308.2222, -2861.308], //Cave_Hebra_0036
-//[-1372.09, 303.2222, -2861.308],
-
-[-2395.838, 283, -2276.628], //Cave_Hebra_0037
-//[-2395.838, 275, -2276.628],
-
-[-3958.686, 311.0806, -2029.48], //Cave_Hebra_0039
-//[-3958.686, 306.0806, -2029.48],
-
-[-3960.082, 349.4887, -3245.218], //Cave_Hebra_0040
-//[-3960.082, 342.4887, -3245.218],
-
-[-3555.201, 383.8807, -3088.22], //Cave_Hebra_0041
-//[-3978.405, 252, -3069.581],
-//[-3555.201, 378.8807, -3088.22],
-//[-3989.371, 243.8339, -3062.853],
-
-[676.4661, 156.6693, -1389.783], //Cave_HyruleForest_0001
-//[676.4661, 150.6693, -1389.783],
-
-[1244.07, 135.27, -1226.72], //Cave_HyruleForest_0006
-//[1247.259, 131.0546, -1231.93],
-
-[-643.5, 265, -2040], //Cave_HyruleForest_0007
-//[-643.5, 260, -2040],
-
-[307.1301, 199, -3579.347], //Cave_HyruleForest_0008
-//[307.1301, 193, -3579.347],
-
-[-1188.387, 181.3508, -644.5137], //Cave_HyruleRidge_0000
-//[-1234.645, 199.9723, -770],
-//[-1234.178, 182.9717, -770.2173],
-//[-1188.387, 177.8508, -644.5137],
-
-[-2921.855, 119.0728, 804.1642], //Cave_HyruleRidge_0002
-//[-2921.855, 113.0728, 804.1642],
-
-[-1730.5, 340.5, -1158], //Cave_HyruleRidge_0003
-//[-1734.927, 334.1996, -1165.696],
-
-[-2644.24400, 247.63170, -1126.02400], //Cave_HyruleRidge_0004
-
-[-2196.346, 229.6, 815.1], //Cave_HyruleRidge_0005
-//[-2198.541, 222.7959, 807.5707],
-
-[-2268.351, 201.6453, -899.2295], //Cave_HyruleRidge_0006
-//[-2268.351, 191.6453, -899.2295],
-
-[-2049.127, 55.87498, -1631.707], //Cave_HyruleRidge_0007
-//[-2049.127, 48.87498, -1631.707],
-
-[-2151.008, 386.5, 360.521], //Cave_HyruleRidge_0008
-//[-2151.008, 381.5, 360.521],
-
-[1144.714, 169.0162, -247.4642], //Cave_Lanayru_0006
-//[1349.549, 140.3217, -296.4998],
-//[1144.714, 163.0162, -247.4642],
-//[1349.549, 134.3217, -296.4998],
-
-[3094.097, 189.5792, 51.30798], //Cave_Lanayru_0008
-//[3094.097, 184.5792, 51.30798],
-
-[2909.617, 192.4868, 65.92992], //Cave_Lanayru_0014
-//[2909.617, 187.4868, 65.92992],
-
-[2601.823, 190.6994, -225.8443], //Cave_Lanayru_0019
-//[2674.985, 199.7526, -287.4286],
-//[2691.49, 212, -214.2797],
-//[2674.985, 194.7526, -287.4286],
-//[2605.527, 181.4956, -227.0979],
-//[2679.644, 198.03, -217.6957],
-
-[2185.078, 147.8939, -142.0787], //Cave_Lanayru_0024
-//[2215.354, 181.0875, -100.1791],
-//[2253.844, 126.6181, -14.21026],
-//[2254.5, 236.2, -98.5],
-//[2185.078, 142.8939, -142.0787],
-//[2253.844, 121.6181, -14.21026],
-//[2215.354, 177.0875, -100.1791],
-//[2260.729, 216.0839, -108.3997],
-
-[2570.025, 274.5424, -517.9893], //Cave_Lanayru_0032
-//[2633.5, 309.1393, -525.6262],
-//[2570.025, 269.5424, -517.9893],
-//[2633.568, 294.1987, -526.1559],
-
-[2700.302, 315.4945, -479.8156], //Cave_Lanayru_0033
-//[2863.632, 339.7472, -346.3295],
-//[2863.632, 332.7472, -346.3295],
-//[2700.302, 307.4945, -479.8156],
-
-[4243.966, 99.10972, 255.6655], //Cave_Lanayru_0035
-//[4243.966, 89.10972, 255.6655],
-
-[4473.68, 150.3593, 832.2194], //Cave_Lanayru_0036
-//[4473.05, 137.0549, 826.9572],
-
-[2912.125, 273.1285, -170.1434], //Cave_Lanayru_0048
-//[2958.832, 313.0372, -253.8851],
-//[2958.832, 308.0372, -253.8851],
-//[2912.125, 263.1285, -170.1434],
-
-[2849.799, 439.877, -478.9477], //Cave_Lanayru_0049
-//[2850.636, 429.9589, -477.983],
-
-[1726.91700, 100.18590, -162.05480], //Cave_Lanayru_0050
-
-[493.7314, 150, -730.937], //Cave_Lanayru_0052
-//[493.7314, 146, -730.937],
-
-[845.9233, 125.8293, -31.49684], //Cave_Lanayru_0053
-//[845.9233, 121.3293, -31.49684],
-
-[3809.582, 321.4452, -419.5987], //Cave_Lanayru_0055
-//[3809.582, 314.4452, -419.5987],
-
-[3660.875, 385.0333, -538.5847], //Cave_Lanayru_0057
-//[3660.896, 374.0333, -538.5865],
-
-[3147.392, 287.5269, -667.6096], //Cave_Lanayru_0060
-//[3147.392, 282.5269, -667.6096],
-
-[3240.992, 186.4779, -373.5201], //Cave_Lanayru_0061
-//[3240.992, 181.4779, -373.5201],
-
-[3271.55000, 84.30600, -441.58720], //Cave_Lanayru_0063
-
-[2698.728, 225.9755, 1292.447], //Cave_LanayruMountain_0002
-//[2698.274, 216.7247, 1314.642],
-
-[4585.332, 109.5976, 2246.283], //Cave_LanayruMountain_0006
-//[4585.332, 103.5976, 2246.283],
-
-[2504.104, 123.9471, 2106.521], //Cave_LanayruMountain_0008
-//[2504.104, 111.9471, 2106.521],
-
-[3074.555, 207.2067, 1138.09], //Cave_LanayruMountain_0010
-//[3476.452, 127.4407, 968.3922],
-//[3073.536, 197.2633, 1137.785],
-//[3476.452, 97.4407, 968.3922],
-
-[2492.99, 122.5274, 1477.647], //Cave_LanayruMountain_0014
-//[2492.99, 117.5274, 1477.647],
-
-[3933.575, 237.9416, 2069.003], //Cave_LanayruMountain_0016
-//[4225.536, 305.5, 1738.955],
-//[4225.536, 285.5, 1738.955],
-//[3933.575, 232.9416, 2069.003],
-
-[4207.23, 109.01, 2287.35], //Cave_LanayruMountain_0022
-//[4213.486, 105.6649, 2262.576],
-
-[3650.401, 111.8049, 3210.815], //Cave_LanayruMountain_0024
-//[3650.401, 99.30487, 3210.815],
-
-[3748.875, 300.5, 2026.508], //Cave_LanayruMountain_0025
-//[3757.448, 322.2258, 2066.606],
-//[3757.448, 319.7258, 2066.606],
-//[3748.875, 295.5, 2026.508],
-
-[2243.432, 134, 1689.599], //Cave_LanayruMountain_0026
-//[2243.432, 129, 1689.599],
-
-[-3865.5, 188, -1011.5], //Cave_Tabantha_0001
-//[-3931.099, 188.3087, -1090.969],
-//[-3865.5, 178, -1011.5],
-//[-3931.099, 178.3087, -1090.969],
-
-[-3465.121, 369.5734, -449.4601], //Cave_Tabantha_0002
-//[-3465.121, 359.5734, -449.4601],
-
-[-3308.472, 13.62203, -789.7637], //Cave_Tabantha_0003
-//[-3308.472, 3.622033, -789.7637],
-
-//[486.9327, 117.2137, 3831.136] //Well_0043B
-//[486.9327, 113.2137, 3831.136],
-
+[4122.229, 299.179, -662.295], //5202740261947854689 - Cave_Akkala_0000
+[4505, 209.9406, -705.1617], //9055438594216366561 - Cave_Akkala_0003
+[4272.99, 258.8511, -774.3162], //15335926447545138291 - Cave_Akkala_0003
+[3925.927, 218.3195, -1576.423], //11946399843865969720 - Cave_Akkala_0005
+[3678.723, 183.5108, -1538.252], //3457555777151736032 - Cave_Akkala_0007
+[3735.437, 190.3167, -1534.085], //11671013565008628074 - Cave_Akkala_0007
+[3243.716, 404.535, -1456.824], //9956353720691210968 - Cave_Akkala_0010
+[3321.5, 286.5, -3424], //5431129856634400544 - Cave_Akkala_0011
+[4650.67, 104.5, -3584.908], //1926489202404534798 - Cave_Akkala_0014
+[4645.503, 118.9944, -3206.834], //8513000792751676936 - Cave_Akkala_0014
+[3292.5, 510.0642, -1492], //10142666355873547918 - Cave_Akkala_0017
+[37.30195, 128.1821, 198.8625], //7141907819268688467 - Cave_CentralHyrule_0008
+[6.009788, 141.0668, 157.9319], //11762902907749850765 - Cave_CentralHyrule_0008
+[-832.3462, 137.4909, 1488.377], //12880309941609668216 - Cave_CentralHyrule_0009
+[711.5814, 1596.062, 1449.099], //3657960895423460399 - Cave_CentralHyrule_0011
+[739.0957, 1652.759, 1358.025], //6165471125931240097 - Cave_CentralHyrule_0011
+[632.1589, 1593.918, 1638.774], //389621003349275914 - Cave_CentralHyrule_0013
+[587.4191, 1553.043, 1624.505], //9927661949732117451 - Cave_CentralHyrule_0013
+[170.5166, 1487.815, 1633.773], //2527573203000697251 - Cave_CentralHyrule_0017
+[260.1547, 1471.727, 1557.838], //12906757512422296002 - Cave_CentralHyrule_0017
+[-325.6665, 159.5706, -802.5264], //16097313038490651380 - Cave_CentralHyrule_0018
+[-254.0375, 113.5017, -129], //16115459957567200699 - Cave_CentralHyrule_0018
+[-253.9667, 132.8978, -767.084], //17220565559925033058 - Cave_CentralHyrule_0018
+[380.06, 1521.65, 1631.647], //2989256867079414765 - Cave_CentralHyrule_0019
+[489.6634, 1483.25, 1625.622], //8543871419045106707 - Cave_CentralHyrule_0019
+[-1111.5, 148.2, 432.0626], //15319933969162710085 - Cave_CentralHyrule_0020
+[-72.10925, 125.9356, 1045.974], //9124311164147940922 - Cave_CentralHyrule_0021
+[-512.3591, 130.869, -127.5918], //8802583314912760024 - Cave_CentralHyrule_0022
+[-1167.155, 137.7493, 1310.977], //17183873816236198710 - Cave_CentralHyrule_0023
+[-1404.5, 108.66, 256.5], //17925324815156417966 - Cave_CentralHyrule_0030
+[2767.812, 634.8295, -2778.185], //2820182978785847885 - Cave_Eldin_0020
+[2238.605, 636.0185, -2682.376], //5498372046996718881 - Cave_Eldin_0021
+[2373.343, 561.8396, -3051.703], //8060741823458164069 - Cave_Eldin_0022
+[1554.559, 506.4309, -3102.513], //16322463971808075566 - Cave_Eldin_0023
+[1423.078, 394.9322, -2102.729], //10155351167282120417 - Cave_Eldin_0025
+[1746.19, 450.72, -1926.52], //12604202893589555443 - Cave_Eldin_0026
+[2016, 531.2755, -2038.984], //12239969978811659575 - Cave_Eldin_0027
+[1642.848, 389.5436, -1729.563], //7529527728072030710 - Cave_Eldin_0028
+[1853.956, 406.4446, -1719.953], //540094550995474204 - Cave_Eldin_0029
+[2206.314, 514.6932, -3075.319], //2334228652024532918 - Cave_Eldin_0030
+[2485.386, 268.3781, -1792.983], //10136447089337963341 - Cave_Eldin_0031
+[1764.653, 511.2603, -2837.404], //13003868390287574459 - Cave_Eldin_0033
+[1713.881, 511.1068, -2718.587], //15630240560201477046 - Cave_Eldin_0034
+[1949.909, 537.4574, -2687.209], //1801494508290714306 - Cave_Eldin_0035
+[1929.11, 238.2568, -1278.69], //10838082017355715677 - Cave_Eldin_0037
+[1931.949, 283.4043, -1312.395], //11860991231750302286 - Cave_Eldin_0037
+[2593.647, 261.4519, -1330.448], //6579778402399415550 - Cave_Eldin_0038
+[2275.316, 267.5, -1520.099], //14328941808872340282 - Cave_Eldin_0039
+[809.8935, 121.2152, 2971.707], //6252906961473836647 - Cave_Firone_0002
+[671.8048, 134.3863, 3109.481], //16931302655167485859 - Cave_Firone_0008
+[1169.23, 283.2793, 2443.27], //12887654214926357542 - Cave_Firone_0009
+[-256.1517, 101.9714, 2940.198], //2291495962666291037 - Cave_Firone_0016
+[-176.3386, 126.6612, 3062.832], //17794289268484220296 - Cave_Firone_0016
+[568.6034, 123.2259, 2981.877], //7325726685713060531 - Cave_Firone_0020
+[1203.094, 135.9193, 3170.906], //15876372107227050247 - Cave_Firone_0022
+[126.18, 68.16491, 2501.39], //15142163600578211343 - Cave_Firone_0023
+[608.9023, 161.3276, 2210.08], //8786178415487831994 - Cave_Firone_0024
+[280.2788, 135.6949, 3875.137], //2282125024947853696 - Cave_Firone_0029
+[-1111.638, 254.71, 2148.178], //12199381830158178871 - Cave_FirstPlateau_0001
+[-1061.875, 252.6713, 1829.554], //9940203994076185236 - Cave_FirstPlateau_0002
+[-3763.073, 140.5631, 2698], //11576020347893843241 - Cave_GerudoDesert_0007
+[-3763.275, 130.3909, 2420.758], //16690736945446424880 - Cave_GerudoDesert_0007
+[-3827.19, 145.7133, 2650.319], //12510038422293123766 - Cave_GerudoDesert_0008
+[-3242.9, 104.4685, 2936.6], //16913007828139583251 - Cave_GerudoDesert_0015
+[-1967.004, 145.5133, 2059.611], //4202665969653539342 - Cave_GerudoDesert_0022
+[-1795.805, 143.65, 1961.14], //10518009420437986971 - Cave_GerudoDesert_0022
+[-1527.762, 89.89854, 2222.542], //11690670861852633792 - Cave_GerudoDesert_0030
+[-2696.307, 94.37949, 2809.372],//11996803931487605126 - Cave_GerudoDesert_0031
+[-3679.051, 97.04066, 3255.366], //15033213358038028919 - Cave_GerudoDesert_0032
+[-1726.964, 115.5759, 2183.379], //10188228423800036434 - Cave_GerudoDesert_0035
+[-1744.354, 99.30705, 2394.182], //16166623820286719993 - Cave_GerudoDesert_0036
+[-2215.908, 357.7064, 2395.27], //9086788533805343256 - Cave_GerudoDesert_0037
+[-3099.359, 63.95093, 3063.779], //1313747287247900726 - Cave_GerudoDesert_0039
+[-2941, 100.52, 3857.9], //5912572320237750059 - Cave_GerudoDesert_0040
+[-2258.922, 171.9476, 1759.334], //10615886098827534628 - Cave_GerudoDesert_0041
+[-2173.727, 242.0874, 1841.648], //11364247050530626523 - Cave_GerudoDesert_0041
+//[-2491.19300, 111.23990, 3067.73800], //12690494979007497354 - Cave_GerudoDesert_0043 (chasm)
+[-2535.542, 57.27916, 3626.101], //2575716733240401024 - Cave_GerudoDesert_0044
+[-2518.917, 57.84764, 3671.562], //2733724849251422098 - Cave_GerudoDesert_0044
+[-2584.241, 57.52135, 3638.208], //3159585809076870306 - Cave_GerudoDesert_0044
+[-2570.56, 54.07516, 3744.447], //5472907972497701967 - Cave_GerudoDesert_0044
+[-2530.788, 58.68051, 3769.119], //5917955570761207273 - Cave_GerudoDesert_0044
+[-2480.565, 58.84991, 3758.143], //6434272510662827856 - Cave_GerudoDesert_0044
+[-2521.204, 58.38428, 3724.844], //8469685058221282368 - Cave_GerudoDesert_0044
+[-2564.693, 57.20284, 3681.715], //9697862465374992030 - Cave_GerudoDesert_0044
+[-2451.857, 58.97064, 3676.729], //10959407977416225522 - Cave_GerudoDesert_0044
+[-2480.763, 58.91989, 3632.817], //12487379951772716063 - Cave_GerudoDesert_0044
+[-2477.854, 58.3941, 3709.82], //13271954650858439886 - Cave_GerudoDesert_0044
+[-2604.787, 55.75517, 3709.315], //16209457192430544208 - Cave_GerudoDesert_0044
+[-3354.8, 121, 2694.6], //9984383196680075552 - Cave_GerudoDesert_0045
+[-4814.321, 112, 3875.428], //11848909698461881619 - Cave_GerudoDesert_0046
+[-4673.2, 119.7035, 1986.137], //15998502860260676292 - Cave_GerudoDesert_0049
+[-2413.649, 255.2226, 1824.038], //1536461930295375687 - Cave_GerudoDesert_0050
+[-2611.278, 222.9838, 2604.77], //2556267233275928801 - Cave_GerudoDesert_0051
+[-2676.715, 190.073, 2402.609], //17113070533003917624 - Cave_GerudoDesert_0051
+[-2476.52, 287.5917, 1809.22], //4956085668477112851 - Cave_GerudoHighlands_0002
+[-4384.535, 584.2957, 536.5526], //13402022485127452447 - Cave_GerudoHighlands_0008
+[-3982.832, 542.1691, 1245.38], //3829441701169624334 - Cave_GerudoHighlands_0014
+[-3881.652, 681.944, 726.7761], //10200413539234062667 - Cave_GerudoHighlands_0017
+[3235.51, 177.44, 3017.51], //5245490651623528104 - Cave_HateruEast_0000
+[3291.834, 174, 3332.983], //6098009852430490669 - Cave_HateruEast_0000
+[1959.679, 181.6188, 2611.651], //6612796801182890824 - Cave_HateruEast_0002
+[1788.839, 194.6686, 3012], //17467478120509332272 - Cave_HateruEast_0002
+[1676.795, 274.8358, 3038.773], //8024413190787260035 - Cave_HateruEast_0006
+[1896.399, 265.528, 3111.244], //16727300130829770739 - Cave_HateruEast_0007
+[1958.782, 314.8886, 3032.786], //6802930745954475552 - Cave_HateruEast_0008
+[2009.624, 288.4404, 3164.034], //15520389346876570879 - Cave_HateruEast_0008
+[1813.53, 229, 3738.02], //5716892940673620530 - Cave_HateruEast_0009
+[4752.63, 121.7059, 3781.506], //8281733242675322304 - Cave_HateruEast_0013
+[1446.719, 184.7728, 3483.647], //11546223674095079102 - Cave_HateruEast_0014
+[2454, 175, 3193], //17405104512511432097 - Cave_HateruEast_0016
+[1611.714, 128.7817, 804], //2377079948731926345 - Cave_HateruWest_0002
+[1587.754, 111.5236, 812.1858], //11536545672066358783 - Cave_HateruWest_0002
+[1947.489, 265.4827, 981.817], //14452390387851187371 - Cave_HateruWest_0005
+[1877.434, 309.0427, 1160.383], //4113707437011094988 - Cave_HateruWest_0006
+[1373.024, 240.2808, 1197.249], //12637708079017963512 - Cave_HateruWest_0008
+[1328.358, 244.9518, 1156.223], //14001688345205756141 - Cave_HateruWest_0008
+[1194.246, 268.427, 1853.947], //5582460455199843960 - Cave_HateruWest_0011
+[1183.372, 356, 1947.553], //9741614762982953500 - Cave_HateruWest_0012
+[-4041.161, 135.7831, -2671.444], //3318512786570605776 - Cave_Hebra_0000
+[-4429.344, 333.8416, -3760.204], //16469865345460228668 - Cave_Hebra_0013
+[-3932, 94.24, -2853.611], //237924683186779881 - Cave_Hebra_0015
+[-2900.156, 500.4017, -2510.26], //11736261478102397242 - Cave_Hebra_0016
+[-2642.285, 361.5, -3268.3], //3195307747504654540 - Cave_Hebra_0019
+[-2414.122, 485.1641, -3136.461], //16325049645669939578 - Cave_Hebra_0019
+[-3814.609, 368.5, -3595.483], //2105704342604321749 - Cave_Hebra_0021
+[-3010.71, 673, -3216.431], //10291314157862112744 - Cave_Hebra_0022
+[-3005.719, 311.8382, -1635.029], //16902444185789897887 - Cave_Hebra_0023
+[-3571.5, 337.7415, -2475], //12796923671859794342 - Cave_Hebra_0025
+[-3214.608, 456.0323, -2462.24], //4880616531421497220 - Cave_Hebra_0026
+[-3398.434, 423.3941, -2499.361], //9544967013646230266 - Cave_Hebra_0030
+[-3227.5, 551.66, -2535.71], //14012515669863855641 - Cave_Hebra_0030
+[-2840.931, 334.4799, -1771.911], //10347911355422425929 - Cave_Hebra_0035
+[-1372.09, 308.2222, -2861.308], //351273480328625563 - Cave_Hebra_0036
+[-2395.838, 283, -2276.628], //4424842077643087931 - Cave_Hebra_0037
+[-3958.686, 311.0806, -2029.48], //15195878330545621010 - Cave_Hebra_0039
+[-3960.082, 349.4887, -3245.218], //331854384806019930 - Cave_Hebra_0040
+[-3555.201, 383.8807, -3088.22], //2414130203331476311 - Cave_Hebra_0041
+[-3989.371, 243.8339, -3062.853], //16911046087036530198 - Cave_Hebra_0041
+[676.4661, 156.6693, -1389.783], //3626583673838507069 - Cave_HyruleForest_0001
+[1244.07, 135.27, -1226.72], //17919446484334912137 - Cave_HyruleForest_0006
+[-643.5, 265, -2040], //17492986739704260639 - Cave_HyruleForest_0007
+[307.1301, 199, -3579.347], //15069346870719132772 - Cave_HyruleForest_0008
+[-1234.645, 199.9723, -770], //7031213641441648501 - Cave_HyruleRidge_0000
+[-1188.387, 181.3508, -644.5137], //13526831088096570570 - Cave_HyruleRidge_0000
+[-2921.855, 119.0728, 804.1642], //7396388418196389866 - Cave_HyruleRidge_0002
+[-1730.5, 340.5, -1158], //7109308500424591297 - Cave_HyruleRidge_0003
+//[-2644.24400, 247.63170, -1126.02400], //10595346751399989600 - Cave_HyruleRidge_0004 (chasm)
+[-2196.346, 229.6, 815.1], //16086200349282513170 - Cave_HyruleRidge_0005
+[-2268.351, 201.6453, -899.2295], //7161951218916542562 - Cave_HyruleRidge_0006
+[-2049.127, 55.87498, -1631.707], //9727847847192093009 - Cave_HyruleRidge_0007
+[-2151.008, 386.5, 360.521], //1001017030533157593 - Cave_HyruleRidge_0008
+[1144.714, 169.0162, -247.4642], //2995591950375801309 - Cave_Lanayru_0006
+[1349.549, 140.3217, -296.4998], //18330400566032353940 - Cave_Lanayru_0006
+[3094.097, 189.5792, 51.30798], //364284787858635830 - Cave_Lanayru_0008
+[2909.617, 192.4868, 65.92992], //12971684091903964185 - Cave_Lanayru_0014
+[2674.985, 199.7526, -287.4286], //121149631314393175 - Cave_Lanayru_0019
+[2601.823, 190.6994, -225.8443], //4222074271666944644 - Cave_Lanayru_0019
+[2691.49, 212, -214.2797], //11770869278850880411 - Cave_Lanayru_0019
+[2185.078, 147.8939, -142.0787], //2181612675989647998 - Cave_Lanayru_0024
+[2253.844, 126.6181, -14.21026], //2568930561223619483 - Cave_Lanayru_0024
+[2215.354, 181.0875, -100.1791], //6920893920509135660 - Cave_Lanayru_0024
+[2260.729, 216.0839, -108.3997], //9861517874279084103 - Cave_Lanayru_0024
+[2570.025, 274.5424, -517.9893], //6101576164770829020 - Cave_Lanayru_0032
+[2633.5, 309.1393, -525.6262], //11067701219318302721 - Cave_Lanayru_0032
+[2863.632, 339.7472, -346.3295], //1267684059742163273 - Cave_Lanayru_0033
+[2700.302, 315.4945, -479.8156], //8479679440708631302 - Cave_Lanayru_0033
+[4243.966, 99.10972, 255.6655], //11416496034161895623 - Cave_Lanayru_0035
+[4473.68, 150.3593, 832.2194], //18173532972070437383 - Cave_Lanayru_0036
+[2958.832, 313.0372, -253.8851], //6400766332894249911 - Cave_Lanayru_0048
+[2912.125, 273.1285, -170.1434], //17915364811553875307 - Cave_Lanayru_0048
+[2849.799, 439.877, -478.9477], //7674390140845792498 - Cave_Lanayru_0049
+//[1726.91700, 100.18590, -162.05480], //12292698567036544880 - Cave_Lanayru_0050 (chasm)
+[493.7314, 150, -730.937], //8187778331917385311 - Cave_Lanayru_0052
+[845.9233, 125.8293, -31.49684], //16226687335351902745 - Cave_Lanayru_0053
+[3809.582, 321.4452, -419.5987], //8431162680466675195 - Cave_Lanayru_0055
+[3660.875, 385.0333, -538.5847], //1879125739105223517 - Cave_Lanayru_0057
+[3147.392, 287.5269, -667.6096], //11232051547730571904 - Cave_Lanayru_0060
+[3240.992, 186.4779, -373.5201], //16836248457949403705 - Cave_Lanayru_0061
+//[3271.55000, 84.30600, -441.58720], //15007569538535704822 - Cave_Lanayru_0063 (chasm)
+[2698.728, 225.9755, 1292.447], //5030128869675891494 - Cave_LanayruMountain_0002
+[4585.332, 109.5976, 2246.283], //4833086368491217811 - Cave_LanayruMountain_0006
+[2504.104, 123.9471, 2106.521], //12154058839145194445 - Cave_LanayruMountain_0008
+[3074.555, 207.2067, 1138.09], //7159625979791517502 - Cave_LanayruMountain_0010
+[3476.452, 127.4407, 968.3922], //7666999484368155152 - Cave_LanayruMountain_0010
+[2492.99, 122.5274, 1477.647], //7764210204243066165 - Cave_LanayruMountain_0014
+[4225.536, 305.5, 1738.955], //306314842763820419 - Cave_LanayruMountain_0016
+[3933.575, 237.9416, 2069.003], //2241190132839882887 - Cave_LanayruMountain_0016
+[4207.23, 109.01, 2287.35], //14931006272035364254 - Cave_LanayruMountain_0022
+[3650.401, 111.8049, 3210.815], //3729378174235672710 - Cave_LanayruMountain_0024
+[3757.448, 322.2258, 2066.606], //6248504940692771516 - Cave_LanayruMountain_0025
+[3748.875, 300.5, 2026.508], //11652366925193288374 - Cave_LanayruMountain_0025
+[2243.432, 134, 1689.599], //6874178767484973104 - Cave_LanayruMountain_0026
+[-3865.5, 188, -1011.5], //12943662571339111896 - Cave_Tabantha_0001
+[-3931.099, 188.3087, -1090.969], //13346964772528420448 - Cave_Tabantha_0001
+[-3465.121, 369.5734, -449.4601], //8952894420645753579 - Cave_Tabantha_0002
+[-3308.472, 13.62203, -789.7637], //14339936005749917162 - Cave_Tabantha_0003
+[3708.01904, 448.502686, -608.693726], //61885230894290162 - Zora_Imperial_Palace
+[3622, 275, -583], //16374285261465503098 - Zora_Imperial_Palace
+[3622.3269, 275.002686, -583.486023], //741356389245422926? - ZoraZonauTerminal
+[486.9327, 113.2137, 3831.136] //11637077966753549118 - Well_0043B
+],
+LOCATION_BUBBULS:[
+/* single cave entrances */
+[4122.229, 299.179, -662.295], //5202740261947854689 - Cave_Akkala_0000
+[4272.99, 258.8511, -774.3162], //xxxxxxxxxxxxxxx - Cave_Akkala_0003
+[3925.927, 218.3195, -1576.423], //11946399843865969720 - Cave_Akkala_0005
+[3735.437, 190.3167, -1534.085], //xxxxxxxxxxxxxxx - Cave_Akkala_0007
+[3243.716, 404.535, -1456.824], //9956353720691210968 - Cave_Akkala_0010
+[3321.5, 286.5, -3424], //5431129856634400544 - Cave_Akkala_0011
+[4645.503, 118.9944, -3206.834], //xxxxxxxxxxxxxxx - Cave_Akkala_0014
+[3292.5, 510.0642, -1492], //10142666355873547918 - Cave_Akkala_0017
+[37.30195, 128.1821, 198.8625], //xxxxxxxxxxxxxxx - Cave_CentralHyrule_0008
+[-832.3462, 137.4909, 1488.377], //12880309941609668216 - Cave_CentralHyrule_0009
+[711.5814, 1596.062, 1449.099], //xxxxxxxxxxxxxxx - Cave_CentralHyrule_0011
+[587.4191, 1553.043, 1624.505], //xxxxxxxxxxxxxxx - Cave_CentralHyrule_0013
+[170.5166, 1487.815, 1633.773], //xxxxxxxxxxxxxxx - Cave_CentralHyrule_0017
+[-325.6665, 159.5706, -802.5264], //xxxxxxxxxxxxxxx - Cave_CentralHyrule_0018
+[380.06, 1521.65, 1631.647], //xxxxxxxxxxxxxxx - Cave_CentralHyrule_0019
+[-1111.5, 148.2, 432.0626], //15319933969162710085 - Cave_CentralHyrule_0020
+[-72.10925, 125.9356, 1045.974], //xxxxxxxxxxxxxxx - Cave_CentralHyrule_0021
+[-512.3591, 130.869, -127.5918], //xxxxxxxxxxxxxxx - Cave_CentralHyrule_0022
+[-1167.155, 137.7493, 1310.977], //17183873816236198710 - Cave_CentralHyrule_0023
+[-1404.5, 108.66, 256.5], //17925324815156417966 - Cave_CentralHyrule_0030
+[2767.812, 634.8295, -2778.185], //2820182978785847885 - Cave_Eldin_0020
+[2238.605, 636.0185, -2682.376], //5498372046996718881 - Cave_Eldin_0021
+[2373.343, 561.8396, -3051.703], //8060741823458164069 - Cave_Eldin_0022
+[1554.559, 506.4309, -3102.513], //16322463971808075566 - Cave_Eldin_0023
+[1423.078, 394.9322, -2102.729], //10155351167282120417 - Cave_Eldin_0025
+[1746.19, 450.72, -1926.52], //12604202893589555443 - Cave_Eldin_0026
+[2016, 531.2755, -2038.984], //12239969978811659575 - Cave_Eldin_0027
+[1642.848, 389.5436, -1729.563], //7529527728072030710 - Cave_Eldin_0028
+[1853.956, 406.4446, -1719.953], //540094550995474204 - Cave_Eldin_0029
+[2206.314, 514.6932, -3075.319], //2334228652024532918 - Cave_Eldin_0030
+[2485.386, 268.3781, -1792.983], //10136447089337963341 - Cave_Eldin_0031
+[1764.653, 511.2603, -2837.404], //13003868390287574459 - Cave_Eldin_0033
+[1713.881, 511.1068, -2718.587], //15630240560201477046 - Cave_Eldin_0034
+[1949.909, 537.4574, -2687.209], //1801494508290714306 - Cave_Eldin_0035
+[1929.11, 238.2568, -1278.69], //xxxxxxxxxxxxxxx - Cave_Eldin_0037
+[2593.647, 261.4519, -1330.448], //6579778402399415550 - Cave_Eldin_0038
+[2275.316, 267.5, -1520.099], //14328941808872340282 - Cave_Eldin_0039
+[809.8935, 121.2152, 2971.707], //6252906961473836647 - Cave_Firone_0002
+[671.8048, 134.3863, 3109.481], //16931302655167485859 - Cave_Firone_0008
+[1169.23, 283.2793, 2443.27], //12887654214926357542 - Cave_Firone_0009
+[-176.3386, 126.6612, 3062.832], //xxxxxxxxxxxxxxx - Cave_Firone_0016
+[568.6034, 123.2259, 2981.877], //7325726685713060531 - Cave_Firone_0020
+[1203.094, 135.9193, 3170.906], //15876372107227050247 - Cave_Firone_0022
+[126.18, 68.16491, 2501.39], //15142163600578211343 - Cave_Firone_0023
+[608.9023, 161.3276, 2210.08], //8786178415487831994 - Cave_Firone_0024
+[280.2788, 135.6949, 3875.137], //2282125024947853696 - Cave_Firone_0029
+[-1111.638, 254.71, 2148.178], //12199381830158178871 - Cave_FirstPlateau_0001
+[-1061.875, 252.6713, 1829.554], //9940203994076185236 - Cave_FirstPlateau_0002
+[-3763.073, 140.5631, 2698], //xxxxxxxxxxxxxxx - Cave_GerudoDesert_0007
+[-3827.19, 145.7133, 2650.319], //12510038422293123766 - Cave_GerudoDesert_0008
+[-3242.9, 104.4685, 2936.6], //16913007828139583251 - Cave_GerudoDesert_0015
+[-1795.805, 143.65, 1961.14], //xxxxxxxxxxxxxxx - Cave_GerudoDesert_0022
+[-1527.762, 89.89854, 2222.542], //11690670861852633792 - Cave_GerudoDesert_0030
+[-2696.307, 94.37949, 2809.372],//11996803931487605126 - Cave_GerudoDesert_0031
+[-3679.051, 97.04066, 3255.366], //15033213358038028919 - Cave_GerudoDesert_0032
+[-1726.964, 115.5759, 2183.379], //10188228423800036434 - Cave_GerudoDesert_0035
+[-1744.354, 99.30705, 2394.182], //16166623820286719993 - Cave_GerudoDesert_0036
+[-2215.908, 357.7064, 2395.27], //9086788533805343256 - Cave_GerudoDesert_0037
+[-3099.359, 63.95093, 3063.779], //1313747287247900726 - Cave_GerudoDesert_0039
+[-2941, 100.52, 3857.9], //5912572320237750059 - Cave_GerudoDesert_0040
+[-2173.727, 242.0874, 1841.648], //xxxxxxxxxxxxxxx - Cave_GerudoDesert_0041
+//[-2491.19300, 111.23990, 3067.73800], //12690494979007497354 - Cave_GerudoDesert_0043 (chasm)
+[-2535.542, 57.27916, 3626.101], //xxxxxxxxxxxxxxx - Cave_GerudoDesert_0044
+[-3354.8, 121, 2694.6], //9984383196680075552 - Cave_GerudoDesert_0045
+[-4814.321, 112, 3875.428], //11848909698461881619 - Cave_GerudoDesert_0046
+[-4673.2, 119.7035, 1986.137], //15998502860260676292 - Cave_GerudoDesert_0049
+[-2413.649, 255.2226, 1824.038], //1536461930295375687 - Cave_GerudoDesert_0050
+[-2611.278, 222.9838, 2604.77], //xxxxxxxxxxxxxxx - Cave_GerudoDesert_0051
+[-2476.52, 287.5917, 1809.22], //4956085668477112851 - Cave_GerudoHighlands_0002
+[-4384.535, 584.2957, 536.5526], //13402022485127452447 - Cave_GerudoHighlands_0008
+[-3982.832, 542.1691, 1245.38], //3829441701169624334 - Cave_GerudoHighlands_0014
+[-3881.652, 681.944, 726.7761], //10200413539234062667 - Cave_GerudoHighlands_0017
+[3235.51, 177.44, 3017.51], //xxxxxxxxxxxxxxx - Cave_HateruEast_0000
+[1788.839, 194.6686, 3012], //xxxxxxxxxxxxxxx - Cave_HateruEast_0002
+[1676.795, 274.8358, 3038.773], //8024413190787260035 - Cave_HateruEast_0006
+[1896.399, 265.528, 3111.244], //16727300130829770739 - Cave_HateruEast_0007
+[1958.782, 314.8886, 3032.786], //xxxxxxxxxxxxxxx - Cave_HateruEast_0008
+[1813.53, 229, 3738.02], //5716892940673620530 - Cave_HateruEast_0009
+[4752.63, 121.7059, 3781.506], //8281733242675322304 - Cave_HateruEast_0013
+[1446.719, 184.7728, 3483.647], //11546223674095079102 - Cave_HateruEast_0014
+[2454, 175, 3193], //17405104512511432097 - Cave_HateruEast_0016
+[1611.714, 128.7817, 804], //xxxxxxxxxxxxxxx - Cave_HateruWest_0002
+[1947.489, 265.4827, 981.817], //14452390387851187371 - Cave_HateruWest_0005
+[1877.434, 309.0427, 1160.383], //4113707437011094988 - Cave_HateruWest_0006
+[1328.358, 244.9518, 1156.223], //xxxxxxxxxxxxxxx - Cave_HateruWest_0008
+[1194.246, 268.427, 1853.947], //5582460455199843960 - Cave_HateruWest_0011
+[1183.372, 356, 1947.553], //9741614762982953500 - Cave_HateruWest_0012
+[-4041.161, 135.7831, -2671.444], //3318512786570605776 - Cave_Hebra_0000
+[-4429.344, 333.8416, -3760.204], //16469865345460228668 - Cave_Hebra_0013
+[-3932, 94.24, -2853.611], //237924683186779881 - Cave_Hebra_0015
+[-2900.156, 500.4017, -2510.26], //11736261478102397242 - Cave_Hebra_0016
+[-2414.122, 485.1641, -3136.461], //xxxxxxxxxxxxxxx - Cave_Hebra_0019
+[-3814.609, 368.5, -3595.483], //2105704342604321749 - Cave_Hebra_0021
+[-3010.71, 673, -3216.431], //10291314157862112744 - Cave_Hebra_0022
+[-3005.719, 311.8382, -1635.029], //16902444185789897887 - Cave_Hebra_0023
+[-3571.5, 337.7415, -2475], //12796923671859794342 - Cave_Hebra_0025
+[-3214.608, 456.0323, -2462.24], //4880616531421497220 - Cave_Hebra_0026
+[-3227.5, 551.66, -2535.71], //xxxxxxxxxxxxxxx - Cave_Hebra_0030
+[-2840.931, 334.4799, -1771.911], //10347911355422425929 - Cave_Hebra_0035
+[-1372.09, 308.2222, -2861.308], //351273480328625563 - Cave_Hebra_0036
+[-2395.838, 283, -2276.628], //4424842077643087931 - Cave_Hebra_0037
+[-3958.686, 311.0806, -2029.48], //15195878330545621010 - Cave_Hebra_0039
+[-3960.082, 349.4887, -3245.218], //331854384806019930 - Cave_Hebra_0040
+[-3555.201, 383.8807, -3088.22], //xxxxxxxxxxxxxxx - Cave_Hebra_0041
+[676.4661, 156.6693, -1389.783], //3626583673838507069 - Cave_HyruleForest_0001
+[1244.07, 135.27, -1226.72], //17919446484334912137 - Cave_HyruleForest_0006
+[-643.5, 265, -2040], //17492986739704260639 - Cave_HyruleForest_0007
+[307.1301, 199, -3579.347], //15069346870719132772 - Cave_HyruleForest_0008
+[-1188.387, 181.3508, -644.5137], //xxxxxxxxxxxxxxx - Cave_HyruleRidge_0000
+[-2921.855, 119.0728, 804.1642], //7396388418196389866 - Cave_HyruleRidge_0002
+[-1730.5, 340.5, -1158], //7109308500424591297 - Cave_HyruleRidge_0003
+//[-2644.24400, 247.63170, -1126.02400], //10595346751399989600 - Cave_HyruleRidge_0004 (chasm)
+[-2196.346, 229.6, 815.1], //16086200349282513170 - Cave_HyruleRidge_0005
+[-2268.351, 201.6453, -899.2295], //7161951218916542562 - Cave_HyruleRidge_0006
+[-2049.127, 55.87498, -1631.707], //9727847847192093009 - Cave_HyruleRidge_0007
+[-2151.008, 386.5, 360.521], //1001017030533157593 - Cave_HyruleRidge_0008
+[1144.714, 169.0162, -247.4642], //xxxxxxxxxxxxxxx - Cave_Lanayru_0006
+[3094.097, 189.5792, 51.30798], //364284787858635830 - Cave_Lanayru_0008
+[2909.617, 192.4868, 65.92992], //12971684091903964185 - Cave_Lanayru_0014
+[2601.823, 190.6994, -225.8443], //xxxxxxxxxxxxxxx - Cave_Lanayru_0019
+[2185.078, 147.8939, -142.0787], //xxxxxxxxxxxxxxx - Cave_Lanayru_0024
+[2570.025, 274.5424, -517.9893], //xxxxxxxxxxxxxxx - Cave_Lanayru_0032
+[2700.302, 315.4945, -479.8156], //xxxxxxxxxxxxxxx - Cave_Lanayru_0033
+[4243.966, 99.10972, 255.6655], //11416496034161895623 - Cave_Lanayru_0035
+[4473.68, 150.3593, 832.2194], //18173532972070437383 - Cave_Lanayru_0036
+[2912.125, 273.1285, -170.1434], //xxxxxxxxxxxxxxx - Cave_Lanayru_0048
+[2849.799, 439.877, -478.9477], //7674390140845792498 - Cave_Lanayru_0049
+//[1726.91700, 100.18590, -162.05480], //xxxxxxxxxxxxxxx - Cave_Lanayru_0050 (chasm)
+[493.7314, 150, -730.937], //8187778331917385311 - Cave_Lanayru_0052
+[845.9233, 125.8293, -31.49684], //16226687335351902745 - Cave_Lanayru_0053
+[3809.582, 321.4452, -419.5987], //8431162680466675195 - Cave_Lanayru_0055
+[3660.875, 385.0333, -538.5847], //1879125739105223517 - Cave_Lanayru_0057
+[3147.392, 287.5269, -667.6096], //11232051547730571904 - Cave_Lanayru_0060
+[3240.992, 186.4779, -373.5201], //16836248457949403705 - Cave_Lanayru_0061
+//[3271.55000, 84.30600, -441.58720], //xxxxxxxxxxxxxxx - Cave_Lanayru_0063 (chasm)
+[2698.728, 225.9755, 1292.447], //5030128869675891494 - Cave_LanayruMountain_0002
+[4585.332, 109.5976, 2246.283], //4833086368491217811 - Cave_LanayruMountain_0006
+[2504.104, 123.9471, 2106.521], //12154058839145194445 - Cave_LanayruMountain_0008
+[3074.555, 207.2067, 1138.09], //xxxxxxxxxxxxxxx - Cave_LanayruMountain_0010
+[2492.99, 122.5274, 1477.647], //7764210204243066165 - Cave_LanayruMountain_0014
+[3933.575, 237.9416, 2069.003], //xxxxxxxxxxxxxxx - Cave_LanayruMountain_0016
+[4207.23, 109.01, 2287.35], //14931006272035364254 - Cave_LanayruMountain_0022
+[3650.401, 111.8049, 3210.815], //3729378174235672710 - Cave_LanayruMountain_0024
+[3748.875, 300.5, 2026.508], //xxxxxxxxxxxxxxx - Cave_LanayruMountain_0025
+[2243.432, 134, 1689.599], //6874178767484973104 - Cave_LanayruMountain_0026
+[-3865.5, 188, -1011.5], //xxxxxxxxxxxxxxx - Cave_Tabantha_0001
+[-3465.121, 369.5734, -449.4601], //8952894420645753579 - Cave_Tabantha_0002
+[-3308.472, 13.62203, -789.7637], //14339936005749917162 - Cave_Tabantha_0003
+[3708.01904, 448.502686, -608.693726], //xxxxxxxxxxxxxxx - Zora_Imperial_Palace
+[3622.3269, 275.002686, -583.486023], //741356389245422926 - ZoraZonauTerminal
+[486.9327, 113.2137, 3831.136] //11637077966753549118 - Well_0043B
 ],
 LOCATION_WELLS:[
 	[-3831.584,230.703,-2105.445], //13194262444821253016 - Well_0001
@@ -1902,7 +1864,7 @@ SCHEMATICS_YIGA:[
 	[2542, -476-105, 544], //Super Spring
 	[-1903, -682-105, -2095], //Sprinkler System
 	[3618, -455-105, 569], //Icebreaker
-	[-130, -634-105, -2867], //Aerial Cannon
+	[130, -634-105, -2867], //Aerial Cannon
 	[-2865, -931-105, -2918], //Floodlights
 	[-3403, -482-105, 222], //Instant Scaffold (Yiga schematic)
 	[-1225, -480-105, 2611], //Monocycle
@@ -2196,5 +2158,39 @@ BOSSES_REMATCH:[
 	[-3635.715576171875, -926.6304931640625, 837.6383666992188], //6031128008877239078 - Enemy_DungeonBoss_Gerudo_Underground
 	[-2266.555419921875, -710.8698120117188, -3266.33154296875], //7058364791334812681 - Enemy_DungeonBoss_Rito_Underground
 	[-2792.8583984375, -440.26953125, 759.00732421875] //8899164221420779612 - Enemy_DungeonBoss_Goron_Underground
+],
+
+TREASURE_MAPS:[
+	[-1347.79, 907.24, 1542.00], //Obj_TreasureMap_00 - 12982257783340555813 - Armor_230_Head
+	[-1232.51, 1093.91, 1399.99], //Obj_TreasureMap_01 - 8025772427704871030 - Armor_230_Upper
+	[-1456.58, 1325.98, 1584.35], //Obj_TreasureMap_02 - 18358225765623179803 - Armor_230_Lower
+	[1662.94, 506.26 + LAYER_FIX, 352.65], //Obj_TreasureMap_03 - 13327614428398590506 - Armor_200_Head
+	[1851.51, 1044.21, 979.00], //Obj_TreasureMap_04 - 5691569256957001682 - Armor_200_Upper
+	[1765.79, 1007.66, 1310.74], //Obj_TreasureMap_05 - 8688382086926296901 - Armor_200_Lower
+	[3200.16, 1522.58, -598.47], //Obj_TreasureMap_06 - 5064574262399912277 - Armor_205_Head
+	[3167.95, 1041.18, -459.37], //Obj_TreasureMap_07 - 6373743458188454703 - Armor_205_Upper
+	[3692.78, 1350.65, -593.25], //Obj_TreasureMap_08 - 6271540893534223348 - Armor_205_Lower
+	[3294.51, 900.13, -3434.16], //Obj_TreasureMap_09 - 17213520049899645000 - Armor_210_Head
+	[3664.83, 1094.38, -1795.00], //Obj_TreasureMap_10 - 3779756660275854581 - Armor_210_Upper
+	[4269.17, 889.46, -3107.88], //Obj_TreasureMap_11 - 16186188512693537154 - Armor_210_Lower
+	[1126.41, 862.67, 3273.63], //Obj_TreasureMap_12 - 10822848644781216269 - Armor_215_Head
+	[1651.63, 679.41 + LAYER_FIX, 2190.70], //Obj_TreasureMap_13 - 9656043850692720211 - Armor_215_Upper
+	[952.39, 862.20, 3113.04], //Obj_TreasureMap_14 - 2371108008813842096 - Armor_215_Lower
+	[-3634.97, 1776.16, -466.73], //Obj_TreasureMap_15 - 3872714873027077662 - Armor_005_Head
+	[-3437.53, 1296.21, -1431.37], //Obj_TreasureMap_16 - 11411219828237605981 - Armor_005_Upper
+	[-3961.84, 1813.72, -608.13], //Obj_TreasureMap_17 - 11354847325397059866 - Armor_005_Lower
+	[435.19, 2349.23, -2195.60], //Obj_TreasureMap_18 - 2696629006754560889 - Armor_176_Head
+	[-815.71, 1020.34, 1590.62], //Obj_TreasureMap_19 - 14802750979980998435 - Armor_220_Head
+	[-3376.84, 2390.17, 20.58], //Obj_TreasureMap_20 - 7421986010725994499 - Armor_172_Head
+	[4659.19, 1873.97, 869.84], //Obj_TreasureMap_21 - 7700079370819772878 - Armor_173_Head
+	[-1648.57, 1070.24, -3513.13], //Obj_TreasureMap_22 - 1847915464330506328 - Armor_177_Head
+	[4752.22, 2022.34, 777.56], //Obj_TreasureMap_23 - 18371741502374795567 - Armor_178_Head
+	[-1956.29, 1272.59, 1809.80], //Obj_TreasureMap_24 - 7768005075754752823 - Weapon_Sword_058
+	[1810.72, 1309.84, -1013.62], //Obj_TreasureMap_25 - 2157549263046577864 - Weapon_Lsword_059
+	[2159.54, 1368.36, 2592.08], //Obj_TreasureMap_26 - 8126075550031825859 - Weapon_Sword_059
+	[2644.91, 1581.15, 1414.08], //Obj_TreasureMap_27 - 18276965192563104883 - Weapon_Shield_057
+	[-3475.80, 1035.90, -3513.55], //Obj_TreasureMap_28 - 12889407973329805926 - Armor_1051_Head
+	[-3860.64, 853.33 + LAYER_FIX, -2922.98], //Obj_TreasureMap_29 - 4955019236407069 - Armor_1051_Upper
+	[-3830.44, 650.10 + LAYER_FIX, -2715.02] //Obj_TreasureMap_30 - 7336531139994088567 - Armor_1051_Lower
 ]
 }
\ No newline at end of file
diff --git a/zelda-totk/zelda-totk.css b/zelda-totk/zelda-totk.css
index 9677e43..d9b38f1 100644
--- a/zelda-totk/zelda-totk.css
+++ b/zelda-totk/zelda-totk.css
@@ -1,40 +1,75 @@
-/* Zelda TOTK Savegame editor by Marc Robledo v20230616 */
-
-/* @FONT-FACES */
+/* stylesheet for Zelda TOTK Savegame editor (last update 2023-07-08) */
 @import url('https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700,800');
 
+:root{
+	--danger: #b72319;
+}
+
 
 body{
 	font:15px 'Open Sans',sans-serif;
 	cursor:default;
-	margin:0 0 80px;
+	margin:0 0 40px;
 	background-color:#160c0c;
 	color:#f9f5da;
 	background-image:url(assets/bg_black.jpg);
+
+	-moz-user-select:none;
+	-webkit-user-select: none;
+	-ms-user-select:none;
+	-o-user-select:none;
+	user-select:none
 }
 
+
+
+
+/* load file screen */
+#file-load{display:none}
+#dragzone-message button{
+	border:none;
+	background-color:transparent;
+	padding:0;
+	color:#f7e2b3;
+	font:inherit;
+	text-decoration:underline;
+	line-height:1
+}
+#dragzone-message button:hover{
+	cursor:pointer;
+	color:white;
+}
+
+
+
+
+
+
 /* master editor */
-#toolbar select{width:initial !important}
 #page-prev,#page-next{min-width:initial !important}
 table{
-  border-collapse:collapse;
+	border-collapse:collapse;
 }
 tr{border-bottom:1px solid #2e4533;height:36px}
 tr:last-child{border-bottom:none}
-tr:hover{background-color:#121710}
+#tab-master tr:hover{background-color:#121710}
 
 
 /* toast */
-#toast-loading{
+#toasts-container{
 	position:fixed;
-	bottom: 10px;
-	right:10px;
-	padding: 8px 20px;
+	bottom: 10px; right:10px;
+}
+#toasts-container .toast{
+	margin-top:8px;
+	padding: 16px 32px;
 	border-radius:3px;
-	background-color:rgba(0,0,0,.91);
+	background-color:rgba(0,0,0,.95);
 	z-index:1000;
 }
 
+
+
 #box-settings #warning-language{
 	color:orange;
 	display:none;
@@ -50,6 +85,9 @@ tr:hover{background-color:#121710}
 	border-radius:8px;
 	margin-left:8px;
 }
+.container-counter .progress-bar{
+	background-color:black;
+}
 .progress{
 	background-color:#c8ac5a;
 	height:100%;
@@ -60,18 +98,67 @@ tr:hover{background-color:#121710}
 }
 
 
+.alert{
+	background-color:#2c392d;
+	padding: 12px 16px;
+	border-radius:3px;
+	color: white;
+	border: 1px solid #555;
+	position:relative
+}
+.alert p:first-child{
+	margin-top:0
+}
+.alert p:last-child{
+	margin-bottom:0
+}
+
+.alert a{
+	color:white
+}
+
+.alert-danger{
+	color:#ffc77f
+}
+#alert-troubleshooting{
+	margin-top:16px;
+	margin-bottom:16px;
+}
+#container-language{
+	margin-bottom:32px;
+}
+
+
+
+
+
+
 /* TOTK */
-.dye-color{
-	display:inline-block;
+.btn-menu-floating{
+	display:none;
+	position:absolute;
+	top:8px; left:8px;
+
+	background-color:rgba(0,0,0,.25);
+	border:none;
+	border-radius:48px;
+	border:none;
+	line-height:1;
+	padding:8px;
+}
+.btn-menu-floating img{
 	width:16px;
 	height:16px;
-	vertical-align:middle;
-	border-radius:16px;
-	border:2px solid rgba(255,255,255,.2);
-	position: absolute;
-	top: calc(50% - 8px - 1px);
-	right: 158px;
+	display:inline-block;
 }
+.btn-menu-floating:hover{
+	background-color:rgba(0,0,0,.6);
+	cursor:pointer;
+}
+.row-item:hover .btn-menu-floating{
+	display:block
+}
+
 .floating{
 	display:none;
 	position:absolute;
@@ -80,7 +167,7 @@ tr:hover{background-color:#121710}
 	min-width:10px;
 	padding:4px;
 }
-.row-items:hover .floating{
+.row-item:hover .floating{
 	display:block
 }
 .floating:before{
@@ -88,29 +175,9 @@ tr:hover{background-color:#121710}
 }
 
 
-/* settings */
-#box-settings{
-	background-color: rgba(0,0,0,.4);
-	max-width: 400px;
-	margin:0 auto;
-	padding: 20px;
-	border-radius:3px
-}
-#box-settings>div{
-	margin-bottom:20px;
-	display:flex;
-	justify-content:space-between;
-	align-items: center;
-}
-#box-settings>div:last-child{
-	margin-bottom:0
-}
-#tab-settings a{
-	color:white;
-}
-#tab-settings a:hover{
-	color:orange;
-}
+
+
+
 #select-language{
 	width:auto
 }
@@ -118,38 +185,42 @@ tr:hover{background-color:#121710}
 /* flex box */
 .row{
 	display:flex;
-	flex-flow:row wrap; /* this is the same as flex-direction:row;flex-wrap:wrap; */
 	align-items:center; /* vertical align */
 	justify-content:space-between
 }
-.columns.c1,.columns.one{width:7.33333%}
-.columns.c2,.columns.two{width:15.66667%}
-.columns.c3,.columns.three{width:24%}
-.columns.c4,.columns.four{width:32.33333%}
-.columns.c5,.columns.five{width:40.66667%}
-.columns.c6,.columns.six{width:49%}
-.columns.c7,.columns.seven{width:57.33333%}
-.columns.c8,.columns.eight{width:65.66667%}
-.columns.c9,.columns.nine{width:74%}
-.columns.c10,.columns.ten{width:82.33333%}
-.columns.c11,.columns.eleven{width:90.66667%}
-.columns.c12,.columns.twelve{width:99%}
+.col-right{
+	min-width:160px;
+	text-align:right;
+}
+
 
 /* grid box */
-.row-items{
+.row-item{
 	background-color:rgba(0,0,0,.4);
 	position:relative;
 	margin-bottom:4px;
 	padding:10px;
 }
-.row-items img{max-width:100%;min-height:32px}
-.row-items .item-name:hover{text-decoration:underline}
+.row-item-left{
+	grow:1;
+	shrink:0;
+	vertical-align:middle;
+}
+.row-item-right{
+	max-width:200px
+}
+.row-item-right input, .row-item-right select{
+	margin-bottom:2px;
+}
+
+.item-icon{max-width:76px;vertical-align:middle; margin-right:8px;}
+.item-name:hover{text-decoration:underline}
 .item-number{position:absolute;top:0;left:0; color:#444;font-family:monospace;font-size:80%}
 .tiles span{display:block}
 
 /* useful classes */
 .help:hover{cursor:help}
-.hidden{display:none}
+.hide{display:none}
 .mono{font-family:monospace;}
 .clickable{cursor:pointer} /* also Safari iOS fix for clickable elements */
 .text-ellipsis{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
@@ -160,24 +231,6 @@ tr:hover{background-color:#121710}
 .padding-vertical{padding:20px 0}
 .round{border-radius:3px}
 /* colors */
-.bg-light-gray{background-color:rgba(216,216,216,.99)}
-.bg-mid-gray{background-color:rgba(144,144,144,.99);color:white}
-.bg-dark-gray{background-color:rgba(72,72,72,.99);color:white}
-.bg-red{background-color:#e74c3c}
-.bg-orange{background-color:#f39c12}
-.bg-blue{background-color:#3498db}
-.bg-green{background-color:#25ba84}
-.fnt-white{color:white}
-.fnt-light-gray{color:#d8d8d8}
-.fnt-mid-gray{color:#909090}
-.fnt-dark-gray{color:#48484}
-.fnt-red{color:#e74c3c}
-/*.fnt-red{color:#fe5d05}*/
-.fnt-orange{color:#f39c12}
-/*.fnt-orange{color:#feb806}*/
-.fnt-blue{color:#3498db}
-.fnt-green{color:#25ba84}
-/*.fnt-green{color:#9ac430}*/
 .border-white{border-color:white}
 .border-light-gray{border-color:#d8d8d8}
 .border-mid-gray{border-color:#909090}
@@ -191,85 +244,58 @@ tr:hover{background-color:#121710}
 .mb-10{margin-bottom:10px}
 
 
-/* Icons */
-span.sprite,span.icon,button.with-icon:before{
-	background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMAAAABECAQAAAB99PJCAAAOMUlEQVR42u1cC3RTRRpOX/hcsGcRRXysngNoWdtuM0mharUFi0ILapXaQy0oLAoCCyILWDCoLCCusrq+wEVBq1BclbPuCrVSBAVXjkBp6RMEKn3a0iRt7SNN7r9z507uI3duk9A0jXuS/7Tcmf/euTPfN/8//8yfogMdAqTxAzp/CJLkE2RHjVJZpg1Dj6B8ZMb9sqACNAOFS3f4rXdKWYaOoCs17rgZnUHZtP8fIw73mpcQorsKzcYyAq3ENZ+Cjr6E/aPqjNBQfwxxGhqCBqEy3LoDX0VguENlBIxGx+i7nVKMxgwoASbSi2Mad7yHdXaUJcNMIuB2cp1CCABCAJntLAFfEiC8ThyUsrQcl8+gBtp+KyrBv7eiUKodjZpc4OflPE+Bz4EGAQ03BKyhfVjFuON36F/oWvQF1lZ7SIAWy761AOFZ9TUuDUYtDIC70c1EGybO/iKUim5EiWgPLZ9AET4mwPlu2ejx9Qh0sQyXEPRXetcKpEbvJnSW2Oe1KBfFBpQFSLAr4QfJoAFVovfRYXr9Oh3eI7Rch65ACegDNBk7qFJa96iqb6L0AjFzeiFlC1J9El55CtClFJNQ9DbRc2ihyyrFyyh0jj6fL2qlNq/GFITgNWAGlhHoNS8sgDE/lRC60avvk68xKJqCnotnO//mHFI6iW4h2nz6zE7c+XL87/f4jndpXYF7AN3NcHcEohrhTegSMvs3UfjnqcIE3lXW0qfr8TKsJoCJkUcW4CsCZFbAGvo1YsTTJLVAIh9eerBhAy7dhiLFeWb2AmA3BGnabRxebfgnvsKucgu5suMoRh2njRTh/xlFybTuCRgYC1DVcjgKcr67SkaAvM0uDMeV6KhGO727GDe907QAnoIW+nZhImQyAuWR4qRoRjEKrfDky9jny+Ul9MsFrwHg6zVgI479+boM+t5oHIry5UKFBfDyBdbulZXNPl2E2WsALwa8+xDqbSjddZIS318jwh/rouVr32Cg+5I3FiAP0kA7SvIIfnUUpMPxBF/ThhYjI97A1NBF9yKiLZDBUo0WYQcglff6JQrixUisoBvdp8YI+3vJ+USrtHz9Wga+A7MPQOxdQR7DhZnRjUSbLav7L14BTsvKj/l8y6VyYSIacZj+VNYkFfcvTehWhtY9Af7ZB/Qy8Aj0DYMADmUSbThZfAUpxL62XCyVo0H+OSzxxLYx/DFMejy0gIE9C7ocO5pleK4La8EuPNOOo7mih42icYirhUQjXcAQoPD9XlvAAA9Akh2ku7eSUFQeY4zBu14l/OWCt4WAF3IUtxbv3+9RSBIhgAsIAjyiJwLNxFYinIbuRbOcIeuvgIAdmIK1eFupnEC1hICPfwUE/L+LLpgP6Od8wDlx1gunu79H27Do8c4a24FgAXxcw/zxdz4gtRWBEVj5AEOR0oQNJYGQDxhbwr4j5VPcQ4drPmBTOF/OIkfZma9nnw+wfICx2tBIwW0z4CXXuE3KBxgZx9VGy8DnA16tZ+cDTu9ciLWJzSwCTCTQeCZfRgBoEAA+J0ArH5DQoQY43pEYJeQDEsqEmkw4ALVwFBbQOxJODmw+4D0AdULmpni8jx9XXl24EkrrPSTAT/kAcDkLklof/CYl4AF4FrLpfevtQBIyY2cI5XvAUvLO0uTPTMu68x9yUjDbH/kAo9W41zUfYIDtAOqEzKj4euH5O/ZDLrgkZO6IxU+HFqxZA2sg//X727ywAB+dhsp18iFGTyanPyvBXgnvw+Et5I4Ui5APSCsRnljS2RZ5+1kE4yshYjk9oEsrZbeuoLeP+YAEcjQeXyjkA4ybBfg/5kCdkBkdT53oRCj7NjDzAQz4paerPwGy/bKtmiBrIbGH+nyOP5JIgkOlKDK5XahL7JEDDEx6Pc4HuH5ofUljsvD+Qmc+wAifcaBOyIx0wn83VDWBNwkZv1lAr/kAA1TcQN8bNtXOzgckQGnrocnxx7XyASDC77t8AMSVWpNBygfEw24HqBMyI53OZzyUt4AqIfMIzFVItncW4JwUonkr5ghj9rjq5UuvCoCXIUXwkdOd+QAjKT9B7kmSgbLAAXEJB6RyEjDnscYa1HvvtFwYhjGuuPUuWj8WvrKDOiEzKr7BCX+ZBVQJmQyAH+ArhRzO9soCfJcPAKRTUbBxM1mQ4juFfMDYRmHR7fqa1z7RI8GS0oEWGTmpPKfHl1EQ24WRkRqK23grGAf77KBOyNwsOZ8KMzASMtN/Ub/vUetA7AOcz7okZLKK1Q7sTkf6aF77oewYLqv7n69Okd3zfplvt1wsF0ahNJZaU+FADzASMvHNQm8mQGULMBMyma3qt/l9H8BwWmI+YBrji1cGmL6Q13Y8+rBYN8Oal3G/zVl6ENrm+Hznq+3C4qAaUrVtewKUm0EjIeOGAC/OgqCXDl64RLQdmgdb4d90LViCN1yZfKBHEjIQXlGZzFjik6D0NARMQgb7fjNoJmTcWkAvP345bYHLoQCWQfbSTr5Txwoh1V4MYkIGoqos01zgfxAqW0GRkPH242OraRa2XWx6MlvRApdvRSyWExA4soMM5lZ8FaZYBMfYSj+HecBHRHfhIG4XdFeAnxIyfaUxlRBgtLs4WAdPwCSBgP76uBuId24KZmIrMWN6LLAXZvXd+fjNQqpxnw+BzSUItuNQFOCcQECa9o/vhugJBIl3h6UNTWXBYQqdFR0/cUiaLm1wmvGeWTGm0H50KYreaekfjo+atOJyDSqH6hbpYoRndU/pVlMJIbphuvuxXKPLxjVLvFwDdGm89IehzxmTc4kpvOYg5+iy4KuwWdGmEEm7dFhs6vZXao/a2gFsv9QW5W38w5Snrx5IZ/lQQuHWllPTM9naGU+2mDd8qovmry1W56TfGcbjv/rhg0UHi56fXV0KYG0VLYA5B9J8GQUpqVOWMsdufXF8xqj7rD8BcJwxQz91+yup450ULB02/3Hzj0oLNp9d9GR/UODZBEu/7ZuP+F50VDFauEKX2ZkL4OA25ip34AIBB1/krw9v4gkAWRTEXt19GYbyD6aJ1Mraybn4wDaA9sYus9B8T4flLEDl3tUEYFNozpxuq/qcw9b67FxTmK/hl/fSKcuHmGR5B1PI1Du+y6OdWKVqIfLO549X3rbC9iV28zUeEuAfC6CPponwy/IB9lY1wJxNyAcsiHXOfq74zGPrph/L4vKFsqV6kd7VPUri/QwX+6WgYP5N6TMnTTENcsKfmvTDZ/S2FaoWfpv0lxYLQF3jXX9y5gOkEQ0djleBkHPL+OvadWfKvbAAcVC0e65DdB28BgTOwbnQuGT4sVxaR/IB9PLzp6/itYUbhHL3+c7IV5+u2pdngoiOs0Ldvle8OGzTnOGu8Cvv+fsztvbaoqlTeSvAsz/5xG5hNsBCVQtDJ653evyuQnW/prwV/lz4c5Pf3H9k/5GHNtU2eGMB7k47PToNVdwnq52/oLmKuJ48IfrnVvKltrpZ8/hS/VHhgdPf3pLaeg67nqKVl54sEOrqizTPOz2e4e4IdNSTGVuUOiXn4knjT+yh8M9Tz/5711upJTsaBevtBRvxLZ6tAT4iQLIh1tBbrqflMJtVaoGPfMiY7WY87znr+Qnp0zqa6DrQrgGiFzPcrQuL48jaVFcUk1FGiOccMFsNf8paEf5miHKLjZwAf1mAHALFOynCy2OdLqmtVtaC7OOwQdwfM1p+7O1U/8LzAZr6OM5C304mAmSy4Hc6H0cLxDDaVeUDvLMAn4Sh4tOuFGy0t/A1H26Yblh83WPROfM5jgx1H6/taZcwqf8hy1B/XCr3tPv8JJRNj4Gjs5vrgXSm728V4Y9Vt9pco96rNZwekCiI3c6JLQTOzvx/LF+yY2NHM1/qbNkynBxHfyeh0vlz83PYAYifju/74TCaPUIjbwU4MrtPrZu0QeZ8ollt1p1SEzAg+wB2yRRWc4AR57d/MpEsgjOkOkvFT5M7GmQHKrMDIR/QSm3UcZ4cI3pPgBdnQf2UD3AcZKwgYj7AXia6oOKsx/lIiMJ/MjDyASL8MVpaTyxgAPMBIOYDeki80b0Hz7TjMFfURnFmBj9WhrkPHAGa+QBKQLwuUSHj5AQEdD6AyBiu1AX+ioCB3wN66k5t/s9HhXLZsjswCfBjPsBv4j4fIC4yb0IZdGCpgE1g9PQF+j/rO/Wgn6kvwr/VclL/AP7drc8J/imG5h9oYLkM3gXOZQnMhcEeEdBJgJ6pf03/OUM2EwJA3xWEWpuAy+A75k72CAyht8XAHmwZVuyjb4BrMTUW6MQOARECgBKg0xCBAAhCrU3ARwTsdPgSfobvsTTAPpiG/RbALnITAmk3Wgs10r4IxgUJ6DsBiQTMXJXqHVJ/N776WvMo6UCQgL4T8AGB8m8q1VpSvx1fdWsSYAsS0HcCzpIld5hKNQR6sIb/f8/qNQloCBLQdwK6+FMtpvI8n9rB/z6vScC6IAF9J4AcBcNwlSoS+HNHM9kE7WLCvxsuEgmYo0lAZpCA3gnYT8B8QaVaQeq/ofvQnSr4d8FFsjD0mP56fShDRugPBQnonYAFGMwSvJyuh+vF6uswIXYC8xJaEw7bFPDnAf2qBnP/y5Ag1FoEXIaX4RJYRQC/l1QmiTDXyXbDofCWWP+edFgWJKDvG7EEvKV6G6bAU0D+lBi7FvpNEEyF/OYQeJnUvwGhsqOIIAE+OAtKwYttFd77ki+bwiACsxVYqcoX+MhHcRYkh7lJ/wSOh5SyJ0iAewJ0OAp6A5rgN3TJbYLNeB3w7DRUTsAuMfZJ1h8lEhoMQz0j4IJFgwAKe5CAIAFBAoIE9C8B3R4R0B2Eur8IyNF3MQiI1BuI6GhKcnUQarb8D1Y8dNzm1WVIAAAAAElFTkSuQmCC');
-	background-position:0px 0px;
-	display:inline-block;
-	vertical-align:middle
+.btn>span, .octicon{
+	vertical-align:middle;
+	max-height: 24px;
 }
-span.sprite{width:24px;height:24px}
-span.icon,button.with-icon:before{
-	width:16px;height:16px;
-	margin-right:4px;
-	content:""
+.octicon.invert{
+	filter: invert(1);
 }
-button.with-icon.icon0:before{background-position:-0px -16px}
-button.with-icon.icon1:before{background-position:-16px -16px}
-button.with-icon.icon2:before{background-position:-32px -16px}
-button.with-icon.icon3:before{background-position:-48px -16px}
-button.with-icon.icon4:before{background-position:-64px -16px}
-button.with-icon.icon5:before{background-position:-80px -16px}
-button.with-icon.icon6:before{background-position:-96px -16px}
-button.with-icon.icon7:before{background-position:-112px -16px}
-button.with-icon.icon8:before{background-position:-128px -16px}
-button.with-icon.icon9:before{background-position:-144px -16px}
-button.with-icon.icon10:before{background-position:-160px -16px}
-button.with-icon.colored.icon0:before{background-position:-0px -32px}
-button.with-icon.colored.icon1:before{background-position:-16px -32px}
-button.with-icon.colored.icon2:before{background-position:-32px -32px}
-button.with-icon.colored.icon3:before{background-position:-48px -32px}
-button.with-icon.colored.icon4:before{background-position:-64px -32px}
-button.with-icon.colored.icon5:before{background-position:-80px -32px}
-button.with-icon.colored.icon6:before{background-position:-96px -32px}
-button.with-icon.colored.icon7:before{background-position:-112px -32px}
-button.with-icon.colored.icon8:before{background-position:-128px -32px}
-button.with-icon.colored.icon9:before{background-position:-144px -32px}
-button.with-icon.colored.icon10:before{background-position:-160px -32px}
-span.icon.icon0,button.with-icon.transparent.icon0:before{background-position:-0px 0px}
-span.icon.icon1,button.with-icon.transparent.icon1:before{background-position:-16px 0px}
-span.icon.icon2,button.with-icon.transparent.icon2:before{background-position:-32px 0px}
-span.icon.icon3,button.with-icon.transparent.icon3:before{background-position:-48px 0px}
-span.icon.icon4,button.with-icon.transparent.icon4:before{background-position:-64px 0px}
-span.icon.icon5,button.with-icon.transparent.icon5:before{background-position:-80px 0px}
-span.icon.icon6,button.with-icon.transparent.icon6:before{background-position:-96px 0px}
-span.icon.icon7,button.with-icon.transparent.icon7:before{background-position:-112px 0px}
-span.icon.icon8,button.with-icon.transparent.icon8:before{background-position:-128px 0px}
-span.icon.icon9,button.with-icon.transparent.icon9:before{background-position:-144px 0px}
-span.icon.icon10,button.with-icon.transparent.icon10:before{background-position:-160px 0px}
-span.sprite{width:24px;height:24px}
-span.sprite.github{background-position:0px -48px;width:16px;height:16px; margin-right:5px}
-span.sprite.heart{background-position:-16px -48px;width:16px;height:16px; margin-right:5px}
-button.with-icon.file-load:before{background-position:-32px -48px;width:20px;height:20px; margin-right:8px}
 
-.tab-button{
+#the-editor{margin-top:16px}
+
+
+
+/* nav */
+.nav-link{
 	padding:2px;
-	margin:0 2px;
+	margin:0 3px 0 0;
 	min-width:1px;
 	line-height:0;
+
+	background-color:transparent;
+	border: 2px solid transparent;
+	border-radius:4px;
+	background-color:#fffef0;
 }
-.tab-button.active{
+.nav-link:hover{
+	cursor:pointer;
+	background-color:white;
+	border-color:#d0c7b2;
+}
+.nav-link.active{
 	border-color:#d3af61;
-	background-color: white;
+	background-color:white;
 }
-i.tab-icon{
+
+.nav-link i.tab-icon{
 	display:inline-block;
 	width:32px;height:32px;
 	background-image:url('assets/tabs.png');
 	background-size:384px;
 }
-i.tab-icon.home{background-position-x:-0px;}
-i.tab-icon.weapons{background-position-x:-32px;}
-i.tab-icon.bows{background-position-x:-64px;}
-i.tab-icon.shields{background-position-x:-96px;}
-i.tab-icon.clothes{background-position-x:-128px;}
-i.tab-icon.materials{background-position-x:-160px;}
-i.tab-icon.food{background-position-x:-192px;}
-i.tab-icon.other{background-position-x:-224px;}
-i.tab-icon.horses{background-position-x:-256px;}
-i.tab-icon.master{background-position-x:-288px;}
-i.tab-icon.devices{background-position-x:-320px;}
-i.tab-icon.settings{background-position-x:-352px;}
+.nav-link i.tab-icon.home{background-position-x:-0px;}
+.nav-link i.tab-icon.weapons{background-position-x:-32px;}
+.nav-link i.tab-icon.bows{background-position-x:-64px;}
+.nav-link i.tab-icon.shields{background-position-x:-96px;}
+.nav-link i.tab-icon.clothes{background-position-x:-128px;}
+.nav-link i.tab-icon.materials{background-position-x:-160px;}
+.nav-link i.tab-icon.food{background-position-x:-192px;}
+.nav-link i.tab-icon.other{background-position-x:-224px;}
+.nav-link i.tab-icon.horses{background-position-x:-256px;}
+.nav-link i.tab-icon.master{background-position-x:-288px;}
+.nav-link i.tab-icon.devices{background-position-x:-320px;}
+.nav-link i.tab-icon.settings{background-position-x:-352px;}
 
 
 
@@ -286,11 +312,12 @@ i.tab-icon.settings{background-position-x:-352px;}
 #header{
 	color:#333;
 	position:sticky;
-	top:-108px;
+	top:-98px;
 	width:100%;
 	z-index:100;
 	background-color:#faf8f7;
 	background-image:url(assets/bg_white.jpg);
+	padding-bottom:4px;
 }
 #header:after{
 	display:block;
@@ -303,9 +330,7 @@ i.tab-icon.settings{background-position-x:-352px;}
 
 	content:"";
 }
-#toolbar{
-	padding:8px
-}
+
 #header h1{display:none}
 #header h1 img{vertical-align:middle}
 
@@ -335,23 +360,22 @@ i.tab-icon.settings{background-position-x:-352px;}
 }
 
 .donate.button{
-	background-color:#51a451 !important;
+	background-color:#e33354 !important;
 
 	/*text-shadow:0 -1px 0 #37a137 !important;
 	background:radial-gradient(#60bd60,#398a39);*/
 	animation:donateglow 2s infinite
 }
-.donate.button:hover{background-color:#3e903e !important}
+.donate.button:hover{background-color:#f75372 !important}
 @keyframes donateglow{
 	0%{box-shadow:none}
-	50%{box-shadow:#d8ff7c 0 0 8px inset}
+	50%{box-shadow:#ffadbc 0 0 8px inset}
 	100%{box-shadow:none}
 }
 
 
 
 
-hr{border:none;border-top:1px dotted #bbb;margin:15px 0}
 h3{
 	border-bottom:2px solid #888;
 	font-size:135%;
@@ -361,8 +385,6 @@ h3{
 }
 
 table{width:100%}
-/*tbody tr:nth-child(even){background-color:#f2f2f2}*/
-th{background-color:#d4d4d4}
 
 
 
@@ -388,21 +410,22 @@ input[type=text].error,input[type=number].error,select.error{
 	box-shadow:#f88 0 0 4px 1px;
 	border-color:red
 }
-input[type=text].small,input[type=number].small,select.small{width:70px}
+input[type=text].small,input[type=number].small,select.small{width:74px}
+input[type=text].coordinate{width:113px}
 input[type=text].medium,input[type=number].medium,select.medium{width:130px}
 .full-width{width:100% !important;max-width:100% !important}
 optgroup{background-color:black}
 
-#the-editor input[type=text],#the-editor input[type=number],#the-editor select{
+input[type=text], input[type=number], select{
 	border:1px solid #444;
 	border-radius:2px;
 	background-color:#111;
 	color:white;
 }
-#the-editor input[type=text]:hover,#the-editor input[type=number]:hover,#the-editor select:hover{
+input[type=text]:hover, input[type=number]:hover, select:hover{
 	border-color:#666
 }
-#the-editor input[type=text]:focus,#the-editor input[type=number]:focus,#the-editor select:focus{
+input[type=text]:focus, input[type=number]:focus, select:focus{
 	box-shadow:rgba(140, 121, 77, 0.5) 0 0 0px 3px;
 	background-color:#222;
 	border-color:#b99f65;
@@ -411,19 +434,147 @@ optgroup{background-color:black}
 input[type=text]:disabled, select:disabled{
 	color: #252824 !important;
 }
-
-
-#tab-home span.clickable{
-	text-decoration:underline;
-	font-size:12px;
-	color:#c8ac5a;
+input[type=text].with-icon{
+	padding-left:40px;
+	background-repeat:no-repeat;
+	background-size:24px 16px;
+	background-position:left 8px center;
 }
-#tab-home span.clickable:hover{
+
+
+
+
+.modal-body input[type=text], input[type=number], .modal-body select{
+	color:inherit;
+	background-color:#fffff8;
+	border-color:#9f9f9f;
+}
+.modal-body input.changed, .modal-body select.changed{
+	background-color:#ffffdf !important;
+}
+.modal-body input[type=text]:hover, input[type=number]:hover, .modal-body select:hover{
+	border-color:#645656;
+}
+.modal-body input[type=text]:focus, input[type=number]:focus, .modal-body select:focus{
+	background-color:white;
+	border-color:#645656;
+}
+
+
+.dropdown-menu{
+	display:none;
+	background-color:#050605;
+	border-radius:4px;
+	list-style:none;
+	padding:6px 6px;
+	margin:0;
+	max-width:200px;
+	position:absolute;
+	box-shadow: rgba(0,0,0,.3) 3px 3px 0 0;
+}
+.dropdown-menu .dropdown-item{
+	color:inherit;
+	font-family:inherit;
+	font-size:85%;
+	background-color:transparent;
+	border:none;
+	display:block;
+	border-radius:3px;
+	width:100%;
+	text-align:left;
+	padding:4px 8px;
+	outline:none;
+}
+.dropdown-menu .dropdown-item:disabled{
+	opacity:.15;
+}
+.dropdown-menu .dropdown-item>.octicon{
+	margin-right:6px
+}
+.dropdown-menu .dropdown-item:not(:disabled):hover{
+	background-color:#273729;
+	cursor:pointer;
+}
+.dropdown-menu .dropdown-item.btn-danger:not(:disabled):hover{
+	background-color:var(--danger);
+}
+hr.dropdown-divider{
+	border:none;
+	border-top:1px solid #2d2c2a;
+	margin:4px -6px
+}
+
+
+label.clickable:has(> input[type=radio]){
+	padding: 4px 12px;
+	border-radius:3px;
+}
+label.clickable:has(> input[type=radio]:checked){
+	color:white;
+	background-color:rgba(255,255,255,.1)
+}
+.container-counter{
+	border: 2px solid #313c34;
+	border-radius: 6px;
+	display: inline-block;
+	text-align: center;
+	width: 240px;
+	padding: 8px;
+	background-color: rgba(0,0,0,.35);
+}
+.container-counter.clickable{
+	border-color: #b99f65;
+	background-color: rgba(0,0,0,.5);
+}
+.container-counter.clickable:hover{
+	cursor:pointer;
+	background-color: rgba(0,0,0,.75);
+	border-color: #ffcb56
+}
+.container-counter button{
+	background-color:transparent;
+	border:none;
+	color:inherit;
+	font-family:inherit;
+	color:#c8ac5a;
+	text-decoration:underline;
+}
+.container-counter button:hover{
+	cursor:pointer;
 	color:white;
 }
+.container-counter{
+  position:relative;
+}
+.completionism-actions{
+	display:none;
+	position:absolute;
+	bottom:0;
+	left:0;
+	width:100%;
+	z-index:900;
+	border-radius: 0 0 6px 6px;
+	padding: 8px 0;
+	background-image:linear-gradient(0deg, rgba(4, 18, 13, 0.95) 80%, transparent 100%);
+}
+.container-counter:hover .completionism-actions{
+	display:block;
+}
+
+
+
+
+
+
+
+
+
+
+
+
 
 /* buttons */
-button{
+.btn{
 	font-family:inherit;
 	font-size:100%;
 	min-width:120px;
@@ -443,14 +594,12 @@ button{
 	box-sizing:border-box;
 	vertical-align:middle;
 }
-button.small{
-	min-width:1px
-}
-button:hover{
+.btn.btn-sm{min-width: 16px;}
+.btn:hover{
 	text-shadow:none;
 	border-color:#999999
 }
-button:active,button.active{
+.btn:active,.btn.active{
 	background-image:none;
 	transform:translate(0px,1px);
 	border-color:#888;
@@ -460,110 +609,62 @@ button:active,button.active{
 	background-color:#eeeeee;
 	transform:translateY(1px)
 }
-button:focus{}
-button:disabled{opacity:.35}
+.btn:focus{}
+.btn:disabled{opacity:.35}
 
-button.colored{color:white !important}
-button.colored.blue{
+.btn.btn-primary{
+	color:white;
 	box-shadow:0 1px 0 rgba(120, 200, 230, 0.5) inset;
 	background-color:#21759B;
 	background-image:linear-gradient(to bottom, #2A95C5, #21759B);
 	border-color:#21759B #21759B #1E6A8D;
 	text-shadow:0 -1px 0 #20749a
 }
-button.colored.blue:hover{
+.btn.btn-primary:hover{
+	color:white;
 	box-shadow:0 1px 0 rgba(120, 200, 230, 0.6) inset;
 	background-color:#278AB7;
 	background-image:linear-gradient(to bottom, #2E9FD2, #21759B);
 	border-color:#1B607F;
 	text-shadow:0 -1px 0 #1b6080
 }
-button.colored.blue:active{
+.btn.btn-primary:active{
+	color:white;
 	box-shadow:0 2px 8px -3px rgba(0, 0, 0, 0.5) inset;
 	background:linear-gradient(to bottom, #21759B, #278AB7) repeat scroll 0 0 #1B607F;
 	border-color:#124560 #0e74a3 #0e74a3;
 	text-shadow:0 -1px 0 #177ea4
 }
 
-button.colored.red{
+.btn.btn-danger{
+	color:white;
 	box-shadow:0 1px 0 #df4c45 inset;
-	background-color:#b72319;
+	background-color:var(--danger);
 	background-image:linear-gradient(to bottom, #ce271d, #a41f17);
 	border-color:#a41f17 #a41f17 #951d15;
 	text-shadow:0 -1px 0 #a01d15
 }
-button.colored.red:hover{
+.btn.btn-danger:hover{
+	color:white;
 	box-shadow:0 1px 0 #e8564f inset !important;
 	background-color:#bf261c !important;
 	background-image:linear-gradient(to bottom, #db2c20, #a52017) !important;
 	border-color:#871a13 !important;
 	text-shadow:0 -1px 0 #8b1b14 !important
 }
-button.colored.red:active{
+.btn.btn-danger:active{
+	color:white;
 	box-shadow:0 2px 8px -3px rgba(0, 0, 0, 0.5) inset !important;
 	background:linear-gradient(to bottom, #a51f17, #c1251b) repeat scroll 0 0 #b22118 !important;
 	border-color:#66140c #a0150d #a0150d !important;
 	text-shadow:0 -1px 0 #a41e17 !important
 }
 
-button.colored.green{
-	box-shadow:0 1px 0 #81cf81 inset !important;
-	background-color:#59b259 !important;
-	background-image:linear-gradient(to bottom, #61c261, #51a351) !important;
-	border-color:#52a452 #4f9f4f #448944 !important;
-	text-shadow:0 -1px 0 #37a137 !important
-}
-button.colored.green:hover{
-	box-shadow:0 1px 0 #99de99 inset !important;
-	background-color:#278AB7 !important;
-	background-image:linear-gradient(to bottom, #64ce64, #51a351) !important;
-	border-color:#3f7f3f !important;
-	text-shadow:0 -1px 0 #1c9216 !important
-}
-button.colored.green:active{
-	box-shadow:0 2px 8px -3px rgba(0, 0, 0, 0.5) inset !important;
-	background:linear-gradient(to bottom, #1e8f22, #23a627) repeat scroll 0 0 #219b24 !important;
-	border-color:#105815 #17941b #17941b !important;
-	text-shadow:0 -1px 0 #17a417 !important
-}
-
-button.colored.orange{
-	box-shadow:0 1px 0 #ffb519 inset !important;
-	background-color:#e69501 !important;
-	background-image:linear-gradient(to bottom, #fda502, #d08400) !important;
-	border-color:#d38500 #c97e00 #b46f00 !important;
-	text-shadow:0 -1px 0 #8f5901 !important
-}
-button.colored.orange:hover{
-	box-shadow:0 1px 0 #ffc03c inset !important;
-	background-color:#e69501 !important;
-	background-image:linear-gradient(to bottom, #ffb01e, #d08400) !important;
-	border-color:#a36300 !important;
-	text-shadow:0 -1px 0 #95620f !important
-}
-button.colored.orange:active{
-	box-shadow:0 2px 8px -3px rgba(0, 0, 0, 0.5) inset !important;
-	background:linear-gradient(to bottom, #c07400, #ed9500) repeat scroll 0 0 #219b24 !important;
-	border-color:#53400b #886912 #886912 !important;
-	text-shadow:0 -1px 0 #654e0e !important
-}
 
 
-button.transparent{
-	min-width:auto;
-	box-shadow:none;
-	padding:0;
-	background:none;
-	text-decoration:underline;
-	border:none;
-	text-shadow:none;
-	color:black !important
+.text-danger{
+	color:var(--danger) !important;
 }
-button.transparent:hover{background-color:rgba(0,0,0,.05)}
-button.no-text.with-icon:before{margin-right:0px}
-
-
-
 
 
 
@@ -580,7 +681,6 @@ button.no-text.with-icon:before{margin-right:0px}
 }
 
 
-
 /* MarcDragAndDrop */
 #dragzone{
 	border:4px dashed #b99f65;
@@ -590,8 +690,6 @@ button.no-text.with-icon:before{margin-right:0px}
 	position:relative;
 	transition:all .2s;
 	padding-bottom:20px;
-	margin-top: 72px;
-	/*font-weight:bold;*/
 }
 .dragging-files #dragzone{
 	border-color:#3498db;
@@ -641,6 +739,56 @@ button.no-text.with-icon:before{margin-right:0px}
 
 
 
+
+/* modals */
+.modal::backdrop{
+	background-color:rgba(0,0,0,.6);
+	backdrop-filter: blur(2px);
+}
+
+.modal{
+	background-color:white;
+	padding:16px;
+	border-radius:3px;
+	min-width: 320px;
+	box-sizing: border-box;
+	border:0;
+}
+.modal-header{
+	color: #d3af61;
+	font-size: 120%;
+	font-weight: bold;
+	margin-bottom:8px;
+}
+.modal-footer{
+	margin-top:8px;
+	text-align:right;
+}
+.modal-footer.text-center{
+	text-align:center;
+}
+#modal-hash-editor{
+	min-width:640px;
+}
+#modal-hash-editor-body{
+	max-height:calc(100vh - 200px);
+	overflow-y:auto;
+	padding: 4px 8px 4px 0;
+}
+#modal-hash-editor-body .row-master-mini>div>*{
+	margin-left:4px
+}
+
+
+
+
+
+
+
+
+
+
+
 /* responsive */
 @media only screen and (max-width:961px){
 	.wrapper{max-width:auto; padding-left:10px;padding-right:10px;}
@@ -701,11 +849,9 @@ button.no-text.with-icon:before{margin-right:0px}
 	background-color:#eee;
 	color:#333;
 	padding:10px;
-	visibility:hidden;
-	opacity:0;
+	display:none;
 	z-index:8000;
 	border-radius:2px;
-	transition:visibility 0s .15s,opacity .15s;
 	font-size:80%;
 }
 .tooltip.dark{
@@ -720,7 +866,7 @@ button.no-text.with-icon:before{margin-right:0px}
 .tooltip.position-right{margin-left:8px}
 
 /* animation */
-.tooltip.visible{visibility:visible;opacity:1;transition-delay:0s} /* transition-delay fixes fade-in/fade-out in some browsers */
+.tooltip.visible{display:block} /* transition-delay fixes fade-in/fade-out in some browsers */
 
 .tooltip.align-right{
 	text-align:right;
diff --git a/zelda-totk/zelda-totk.exp-calculator.js b/zelda-totk/zelda-totk.exp-calculator.js
index 5925320..414ddab 100644
--- a/zelda-totk/zelda-totk.exp-calculator.js
+++ b/zelda-totk/zelda-totk.exp-calculator.js
@@ -1,5 +1,5 @@
 /*
-	The legend of Zelda: Tears of the Kingdom Savegame Editor (Experience calculator) v20230616
+	The legend of Zelda: Tears of the Kingdom savegame editor - Experience calculator (last update 2023-07-08)
 
 	by Marc Robledo 2023
 	research & information compiled by Echocolat and Phil
@@ -7,30 +7,68 @@
 
 
 const ExperienceCalculator={
+	generateHashesTextActor(actorName){
+		return [
+			'DefeatedEnemyNum.' + actorName,
+			'EnemyBattleData.' + actorName + '.DefeatedNoDamageCount',
+			'EnemyBattleData.' + actorName + '.HeadShotCount',
+			'EnemyBattleData.' + actorName + '.GuardJustCount',
+			'EnemyBattleData.' + actorName + '.JustAvoidCount'
+		];
+	},
+	generateHashesTextAll(){
+		var hashes=[];
+		for(actorName in this.SCALING_DATA){
+			hashes=hashes.concat(this.generateHashesTextActor(actorName));
+		}
+		return hashes;
+	},
+	generateHashesAll(){
+		return this.generateHashesTextAll().map(function(hashText){
+			return hash(hashText);
+		});
+	},
+	getPrettifiedEnemyName(actorId){
+		return actorId.replace(/_/g, ' ').replace('Enemy_', '');
+	},
+	getPrettifiedHashLabel(hashText){
+		var matches;
+		if(matches=hashText.match(/^DefeatedEnemyNum.(.*?)$/)){
+			return this.getPrettifiedEnemyName(matches[1])+' - Total defeated';
+		}else if(matches=hashText.match(/^EnemyBattleData.(.*?).DefeatedNoDamageCount$/)){
+			return this.getPrettifiedEnemyName(matches[1])+' - Damageless defeat';
+		}else if(matches=hashText.match(/^EnemyBattleData.(.*?).HeadShotCount$/)){
+			return this.getPrettifiedEnemyName(matches[1])+' - Head shots';
+		}else if(matches=hashText.match(/^EnemyBattleData.(.*?).GuardJustCount$/)){
+			return this.getPrettifiedEnemyName(matches[1])+' - Parries';
+		}else if(matches=hashText.match(/^EnemyBattleData.(.*?).JustAvoidCount$/)){
+			return this.getPrettifiedEnemyName(matches[1])+' - Avoided battle';
+		}else{
+			return hashText;
+		}
+	},
+
+
+
 	calculate(){
 		var totalExperience=0;
 		for(actorName in this.SCALING_DATA){
+			// Save file variable strings
+			var hashTexts=this.generateHashesTextActor(actorName);
+			var data=SavegameEditor._readStruct(hashTexts.map(function(hashText){
+				return {hash:hashText, type:'Int'}
+			}));
+			var DefeatedEnemyNum = data[hashTexts[0]];
+			var DefeatedNoDamageCount = data[hashTexts[1]];
+			var HeadShotCount = data[hashTexts[2]];
+			var GuardJustCount = data[hashTexts[3]];
+			var JustAvoidCount = data[hashTexts[4]];
+
 			// All data for this actor
 			var Points = this.SCALING_DATA[actorName].Points;
 			var MaxNum = this.SCALING_DATA[actorName].MaxNum;
 			var BossPlayerSkillPointRate = this.SCALING_DATA[actorName].BossPlayerSkillPointRate;
 
-			// Save file variable strings
-			var data=SavegameEditor._readStruct(
-				[
-					{hash:'DefeatedEnemyNum.' + actorName, type:'Int'},
-					{hash:'EnemyBattleData.' + actorName + '.DefeatedNoDamageCount', type:'Int'},
-					{hash:'EnemyBattleData.' + actorName + '.HeadShotCount', type:'Int'},
-					{hash:'EnemyBattleData.' + actorName + '.GuardJustCount', type:'Int'},
-					{hash:'EnemyBattleData.' + actorName + '.JustAvoidCount', type:'Int'}
-				]
-			);
-			var DefeatedEnemyNum = data['DefeatedEnemyNum.' + actorName];
-			var DefeatedNoDamageCount = data['EnemyBattleData.' + actorName + '.DefeatedNoDamageCount'];
-			var HeadShotCount = data['EnemyBattleData.' + actorName + '.HeadShotCount'];
-			var GuardJustCount = data['EnemyBattleData.' + actorName + '.GuardJustCount'];
-			var JustAvoidCount = data['EnemyBattleData.' + actorName + '.JustAvoidCount'];
-			
 			// Formulas
 			var DefeatPoints = Math.min(DefeatedEnemyNum, MaxNum)*Points;
 
@@ -57,17 +95,6 @@ const ExperienceCalculator={
 		}
 		return currentEnemyTiers;
 	},
-	generateHashes(){
-		var hashes=[];
-		for(actorName in this.SCALING_DATA){
-			hashes.push(murmurHash3.x86.hash32('DefeatedEnemyNum.' + actorName));
-			hashes.push(murmurHash3.x86.hash32('EnemyBattleData.' + actorName + '.DefeatedNoDamageCount'));
-			hashes.push(murmurHash3.x86.hash32('EnemyBattleData.' + actorName + '.HeadShotCount'));
-			hashes.push(murmurHash3.x86.hash32('EnemyBattleData.' + actorName + '.GuardJustCount'));
-			hashes.push(murmurHash3.x86.hash32('EnemyBattleData.' + actorName + '.JustAvoidCount'));
-		}
-		return hashes;
-	},
 
 	SCALING_DATA:{
 		'Enemy_Wizzrobe_Electric':{Points:5,MaxNum:10,BossPlayerSkillPointRate:1},
@@ -184,5 +211,158 @@ const ExperienceCalculator={
 			['Blue-Maned Lynel (Armored)', 3900],
 			['Lynel (Armored)', 0]
 		]
+	],
+
+	countPristineWeapons:function(){
+		return this.BROKEN_WEAPON_HASHES.length - Completism._count(this.BROKEN_WEAPON_HASHES, 0);
+	},
+	getMissingPristineWeapons:function(){
+		var missing=[];
+		for(var decayedWeaponId in Equipment.WEAPONS_DECAYED_TO_PRISTINE){
+			var variable=new Variable('EquipmentDeathCount.'+decayedWeaponId, 'Int');
+			if(variable.value<1){
+				missing.push(Equipment.WEAPONS_DECAYED_TO_PRISTINE[decayedWeaponId]);
+			}
+		}
+		return missing;
+	},
+	resetGhostStatuesSeeds:function(){
+		var nChanges=0;
+		for(var i=0; i<this.PRISTINE_STATUES_SEEDS.length; i++){
+			var variable=new Variable(this.PRISTINE_STATUES_SEEDS[i], 'Int');
+			if(variable.value){
+				variable.value=0;
+				variable.save();
+				nChanges++;
+			}
+		}
+		return nChanges;
+	},
+
+	BROKEN_WEAPON_HASHES:[//EquipmentDeathCount.
+		0x39f93a30, // Weapon_Sword_106 (Traveler's Sword, decayed) --> Weapon_Sword_001 (pristine)
+		0xa9f00300, // Weapon_Sword_112 (Soldier's Broadsword, decayed) --> Weapon_Sword_002 (pristine)
+		0x50557318, // Weapon_Sword_113 (Knight's Broadsword, decayed) --> Weapon_Sword_003 (pristine)
+		0x27d807b0, // Weapon_Sword_124 (Royal Broadsword, decayed) --> Weapon_Sword_024 (pristine)
+		0x3dc96502, // Weapon_Sword_125 (Forest Dweller's Sword, decayed) --> Weapon_Sword_025 (pristine)
+		0x1435013c, // Weapon_Sword_127 (Zora Sword, decayed) --> Weapon_Sword_027 (pristine)
+		0xd6211a3b, // Weapon_Sword_129 (Gerudo Scimitar, decayed) --> Weapon_Sword_029 (pristine)
+		0x47bbf37a, // Weapon_Sword_131 (Feathered Edge, decayed) --> Weapon_Sword_031 (pristine)
+		0xb9fa308b, // Weapon_Sword_114 (Eightfold Blade, decayed) --> Weapon_Sword_041 (pristine)
+		0x200311fb, // Weapon_Sword_147 (Royal Guard's Sword, decayed) --> Weapon_Sword_047 (pristine)
+		0x416e7439, // Weapon_Sword_168 (Wooden Stick, decayed) --> Weapon_Sword_103 (pristine)
+
+		0x6147a3f3, // Weapon_Lsword_106 (Traveler's Claymore, decayed) --> Weapon_Lsword_001 (pristine)
+		0x2b53b900, // Weapon_Lsword_112 (Soldier's Claymore, decayed) --> Weapon_Lsword_002 (pristine)
+		0x51eb5232, // Weapon_Lsword_113 (Knight's Claymore, decayed) --> Weapon_Lsword_003 (pristine)
+		0x2a3c5306, // Weapon_Lsword_124 (Royal Claymore, decayed) --> Weapon_Lsword_024 (pristine)
+		0x82bc5fce, // Weapon_Lsword_127 (Zora Longsword, decayed) --> Weapon_Lsword_027 (pristine)
+		0x52d62303, // Weapon_Lsword_129 (Gerudo Claymore, decayed) --> Weapon_Lsword_029 (pristine)
+		0xe8605be0, // Weapon_Lsword_136 (Cobble Crusher, decayed) --> Weapon_Lsword_036 (pristine)
+		0xefc0b908, // Weapon_Lsword_114 (Eightfold Longblade, decayed) --> Weapon_Lsword_041 (pristine)
+		0x8d861fa2, // Weapon_Lsword_147 (Royal Guard's Claymore, decayed) --> Weapon_Lsword_047 (pristine)
+		0x9a67c31d, // Weapon_Lsword_168 (Thick Stick, decayed) --> Weapon_Lsword_103 (pristine)
+		0x48978e2e, // Weapon_Lsword_174 (Giant Boomerang, decayed) --> Weapon_Lsword_051 (pristine)
+
+		0x59b92288, // Weapon_Spear_106 (Traveler's Spear, decayed) --> Weapon_Spear_001 (pristine)
+		0xa358c1f3, // Weapon_Spear_112 (Soldier's Spear, decayed) --> Weapon_Spear_002 (pristine)
+		0x798d8d3c, // Weapon_Spear_113 (Knight's Halberd, decayed) --> Weapon_Spear_003 (pristine)
+		0xc65605d6, // Weapon_Spear_124 (Royal Halberd, decayed) --> Weapon_Spear_024 (pristine)
+		0xe5fc7340, // Weapon_Spear_125 (Forest Dweller's Spear, decayed) --> Weapon_Spear_025 (pristine)
+		0x87217bec, // Weapon_Spear_127 (Zora Spear, decayed) --> Weapon_Spear_027 (pristine)
+		0x07d3d4a7, // Weapon_Spear_129 (Gerudo Spear, decayed) --> Weapon_Spear_029 (pristine)
+		0x4f8754a9, // Weapon_Spear_173 (Throwing Spear, decayed) --> Weapon_Spear_030 (pristine)
+		0xe58b15d2, // Weapon_Spear_132 (Feathered Spear, decayed) --> Weapon_Spear_032 (pristine)
+		0x82847dee, // Weapon_Spear_147 (Royal Guard's Spear, decayed) --> Weapon_Spear_047 (pristine)
+		0x70be2851, // Weapon_Spear_168 (Long Stick, decayed) --> Weapon_Spear_103 (pristine)
+	],
+
+	PRISTINE_STATUES_SEEDS:[
+		//MinusFieldGhostRandomSeed.
+		0x3aea33b1, 0x37121d69, 0xb80ff3f2, 0xe93d56f0, 0xee1701a0, 0x5cf16947, 0x2da90fab, 0x94c3f7fb,
+		0x3cc60295, 0x8c658c7b, 0xa8a9f5e8, 0xed23e2b6, 0x2b0ef11e, 0xdcb68cec, 0x5065c9ad, 0x0d4abe4c,
+		0x8f632978, 0xab85c738, 0x1c3ef78f, 0x7868ba13, 0x72ee5025, 0x88a05c7b, 0x0d6a54a9, 0x0233065b,
+		0x5ba61931, 0x79d9f53f, 0xaab604e1, 0x42a4027d, 0x123771fd, 0x11dc347c, 0x7973cb66, 0x2e311871,
+		0x4404ff9a, 0x9145ea9e, 0x418306c5, 0xb0b35fee, 0xd4e6ea3c, 0x81c7d9e0, 0x730f6786, 0x0082a5d1,
+		0x60227c8d, 0x97d249fd, 0xe2f4db0b, 0x1efc0a6f, 0x291e9388, 0x64fb43e9, 0x5c30ed65, 0x724e2ce0,
+		0x90aac754, 0x0a04af23, 0x159dedce, 0x2656044e, 0xf37611ea, 0xbd396531, 0xe3d90df8, 0x2058117b,
+		0x3685344a, 0x276a57d4, 0xab5e1f4d, 0x266753b6, 0x5dcf249f, 0xcf27b249, 0x07a510f3, 0xfa6f5249,
+		0xa8e8cefb, 0x0a6c170a, 0xfa95d6d4, 0xe85147c8, 0x29d068a1, 0x6ef6e288, 0x80c42fcc, 0x06abfe1e,
+		0x2da51738, 0x47b033be, 0x0a42e8a4, 0x04a0f26e, 0x6bda1464, 0x44457635, 0x812aa486, 0x39de9493,
+		0x90221156, 0x06001794, 0x36a69f9d, 0x5e0d1779, 0xd0a40681, 0x63363e17, 0x62172557, 0xe19b60ba,
+		0x6fc7622b, 0xb55472bd, 0xa8740a5b, 0xe9898ad5, 0xc37bf200, 0x1c991652, 0xa0c08bee, 0x52dd8e08,
+		0x7a34f411, 0xde8dbba4, 0x2f285d51, 0xbd8cd52d, 0xb2a5cc5f, 0x2d8cdf92, 0x1a7f2eca, 0x38aa24b7,
+		0xe7770604, 0x38d57f14, 0x609fcec4, 0x9afd8db8, 0x7e336176, 0x5fb7b25d, 0x8e46b0f6, 0x3c3a456f,
+		0x8a0d35fe, 0x1c040fdc, 0xc5f9cf9b, 0xba5fa0f9, 0xe06f8afc, 0x22441a59, 0x38f001eb, 0x14a7b808,
+		0xa3f1bc45, 0x6be133e6, 0x355eff16, 0x9254c909, 0x00099636, 0x9235cda3, 0x1979c01d, 0xf259e388,
+		0xb3d39dc0, 0xa286be5f, 0x8f861a62, 0xea8875f1, 0x37bc2c0f, 0x70539632, 0x7a777984, 0x9419ff56,
+		0x5d0efd1c, 0x3f303687, 0xfbe4919c, 0xc5ba679c, 0x8e415040, 0x21ff30d1, 0x3b7eece4, 0x7dc46bc3,
+		0x39e575cc, 0x9760b152, 0x55fc1269, 0xd9a25576, 0xdc005497, 0xe6930155, 0x7299e972, 0xd3764c73,
+		0x3b2833b6, 0x88ee2a89, 0xfd5aabbe, 0x63887a57, 0xef95ab0b, 0x4c18db00, 0x25f21cd5, 0x26d6b964,
+		0x04e3198b, 0x26057007, 0x8af73e1e, 0x7fcf320c, 0x2c94bea3, 0x981bb25b, 0xe2d3c500, 0xeca2be78,
+		0x045192fa, 0xa1afde1c, 0xcf7c7b18, 0xcf9048c1, 0xd4a90db2, 0xe1153091, 0x4fde58e1, 0x441b4917,
+		0x5b524e49, 0xc1397883, 0x04635eba, 0xaf0bf5b5, 0x8b259120, 0xcd84fc53, 0x30940f1f, 0x09675b4e,
+		0x764e6b14, 0x3320f162, 0x96b08adb, 0xa9a147d1, 0x71c730e0, 0x36075839, 0xb016b82e, 0x7969c911,
+		0x03567ffc, 0x7e2b0354, 0xb5c9ae66, 0xd318e275, 0x1bdf50ba, 0x28b7ab62, 0x6aeb77fa, 0x27eb3584,
+		0x550dd1ca, 0xd7235376, 0x8c45ec5c, 0x000a3a34, 0x1a10053d, 0x0495d437, 0xb3aa45b1, 0xed6a6d2a,
+		0x6c706369, 0xad3d3aa0, 0x470be4d2, 0x2bb23289, 0x5d780d03, 0xe779116b, 0xfb971e11, 0x4e3377f8,
+		0x2df278f7, 0x06f5848c, 0xab182590, 0x5c78db0a, 0x93f55f84, 0xc60cd8dd, 0x3067aac2, 0x8b8d9c29,
+		0x87460c50, 0x778ac55a, 0xbf99c8f0, 0x7c7ee810, 0x3da01e13, 0x7dbcfefb, 0x4bcf1a08, 0x9436189e,
+		0xaa285bf6, 0xa1342cef, 0x4d9959ce, 0x2e50d7a0, 0x0ef59066, 0xbf794365, 0x7b09e66e, 0x0c21cd08,
+		0xf1ff55d1, 0xf7eed3ab, 0x354aa09d, 0x393e0c0d, 0x87380693, 0x26c11853, 0x75a5c803, 0x4bde422b,
+		0x7378538f, 0x78422122, 0x42173b04, 0x09f34555, 0x3b0a4355, 0x0a92489f, 0x9b57679d, 0xbb582416,
+		0x34f5a1dd, 0xd689ad18, 0x98a6f970, 0x85c6e936, 0x723db2ee, 0xdc4e0b5c, 0xd4b200ad, 0x86fadb63,
+		0x5104397e, 0x01aeb2ed, 0x39109750, 0xb6267f06, 0xdfd7ce61, 0xaa1f0585, 0x73ef52f5, 0x5cafcece,
+		0xdae10b4b, 0x8bfbc84c, 0x3e57fb03, 0x198b19e4, 0x673fb0fa, 0x0bbc5c49, 0x19727e8d, 0x20410b79,
+		0xc56ca216, 0x974e819d, 0x62c7ee11, 0x62adb452, 0x03330e92, 0x2448bfac, 0x4eba25cc, 0x80aeff05,
+		0x2c094899, 0x04e0f0f9, 0x52f0c03b, 0xaaf8abc3, 0xd25397b0, 0x06032090, 0xeef5a1b6, 0xd4a2e078,
+		0x32d34f36, 0xa381bb82, 0x4f655557, 0x25e7f4d5, 0x6810a9df, 0x97d13b04, 0xf0e37fe0, 0x8206ed6e,
+		0x13454995, 0x779dd392, 0x3167767d, 0x9962603e, 0x48524e61, 0x78e4d49c, 0xae49689c, 0x65492753,
+		0x7a5044a7, 0xa20d7a09, 0x95e901c6, 0x2c94d1e4, 0x78f81eae, 0x13ba4f27, 0x2c47639b, 0x35ea79a2,
+		0x92d9cb10, 0xe6ac7bfe, 0x4372af82, 0x9a7ea123, 0xbc387fdc, 0xf0305196, 0x241d60ae, 0xc9dc2f98,
+		0x8c8b611c, 0x2861cfa1, 0xe02145be, 0xb134be6d, 0x7707028a, 0x429f444b, 0x2ac36489, 0x366a6373,
+		0x68f003dd, 0xbe7eb0d2, 0x855ecc08, 0x649a7364, 0x8d90ae28, 0x000cd06c, 0x2b9ade0d, 0x95709686,
+		0x9ead961f, 0xe0c14df7, 0x3b4a75a6, 0x0cae23ae, 0x843165e7, 0xcb9d8e37, 0xd86957ea, 0xf09d3942,
+		0xe681fd24, 0xef678ceb, 0xb179c924, 0x00c5481e, 0x1deef256, 0x3f665829, 0x147ddcd4, 0xa8ef87f3,
+		0x129eb5d9, 0x3ccfc84f, 0xf73f83bb, 0x6d8b9c11, 0xb4b22f2c, 0x7db0b46f, 0x9203dfdd, 0x6bc9b42d,
+		0xe9538df0, 0x8dfe95ba, 0x62653cd5, 0x8473bacd, 0xf9348d12, 0x1a11ae55, 0x4ce29075, 0x78acf047,
+		0x3b80ecf8, 0x0fb1e070, 0x9afcfb9e, 0xd50bc1b5, 0x1e54b30d, 0x57ff8019, 0x450abad7, 0x179f9f5e,
+		0x8fd56cb3, 0x149f2948, 0x521ac3a4, 0xfe6b6cb0, 0x7383b3aa, 0x8324c098, 0x692bfb86, 0x141b4ec8,
+		0x249fa1cf, 0x7dc9bcbc, 0xabf62253, 0xbe97679b, 0x17b0f517, 0x34ecbf84, 0x2520af77, 0x5d3faa84,
+		0xda9a7798, 0x04e6027a, 0x58edfb1c, 0xb676607a, 0xeede2df8, 0xc1e00f64, 0xee137f5d, 0xec9525ae,
+		0x7dcd1867, 0xc65217c9, 0x732fe6a2, 0x6eed47c4, 0xb1498939, 0x30679165, 0xbb05e5fb, 0x4c8c0142,
+		0xa02c0606, 0x58040c83, 0x5910390b, 0x4e57cff9, 0xe3b5f6f3, 0xafe64032, 0x38ff35f3, 0x37f24e41,
+		0x7c17d85d, 0x8c712f8f, 0xa12d806c, 0x49f1ecd1, 0x429c3f96, 0xcfa6417f, 0x2f83065d, 0x729d5326,
+		0x22ea6a1e, 0xad8cb09a, 0x34b988af, 0x1b2ca7c5, 0x8e6c8850, 0xd27f717d, 0x36fdd1e2, 0xbde91683,
+		0x2c4f7f83, 0x49eb44b8, 0x9237773f, 0x6ad6421e, 0x599b8532, 0x2e28e54c, 0x4d8009e4, 0x8f1bbcaa,
+		0x6b1c16ae, 0xe19ad47a, 0x7ad38f0e, 0x4f697011, 0x34ebdd45, 0x6290e23c, 0x96e122f6, 0x20cf735a,
+		0xc554926e, 0x4740c1f0, 0xdbf7e672, 0x1f665fad, 0x0525b650, 0x85dd48d4, 0x77ee42e7, 0xc5d5b8e6,
+		0xe2eb4bea, 0xfc4678b9, 0x0e1bd7ff, 0x195a91ad, 0xc772396e, 0x27836967, 0xdf30efab, 0x00cffd75,
+		0x6d2d4243, 0xd3e61365, 0x86a37eab, 0xdd50cd83, 0xb71cb6ce, 0x56e40aaf, 0x859701ca, 0xcffbee40,
+		0xa3e587c9, 0x7688fc58, 0x048421ba, 0xbafe74ad, 0x815f47cb, 0x5f50341d, 0x0dfd2d58, 0x8476adbb,
+		0x254368b0, 0x1717f4b4, 0x2c732bda, 0x9c091654, 0xd1cae118, 0x3c97b686, 0x6756b5f4, 0x7375ac92,
+		0x84ecfc69, 0x6157c84b, 0xadc75224, 0xf056a37c, 0x0b469c30, 0x0bdaec95, 0x9c166a9b, 0xb18c82bb,
+		0x2ed75a14, 0x37e38383, 0x098c6458, 0x5e8023a0, 0xedaf28ed, 0x2c78e899, 0x113bfe06, 0xe30455ef,
+		0x342d7a14, 0x5b785906, 0x971e4abb, 0x2708920a, 0x85b65cbc, 0x405ef5b6, 0xd9152297, 0x3782b8f7,
+		0x1f2e85dd, 0x246c3b17, 0x02608837, 0x55b7085c, 0xd1d58c4d, 0xef6da56a, 0xf181bcc6, 0xa236491c,
+		0xf429703f, 0xc12238eb, 0xa3cd2b5e, 0x4a2a6e29, 0xa85fd376, 0x0f2986d2, 0xbb70da57, 0xacf70f6e,
+		0xcd3029b0, 0xea347ed0, 0x35229e89, 0x182e3b57, 0x9520d9ee, 0x6af1fc5c, 0xe9afc5e9, 0x67bd4f2a,
+		0xc8a28bb3, 0xf425c3d4, 0xd48bd7bf, 0x695e5695, 0xffe64fd2, 0x85e6ff71, 0x525e7e13, 0x96b7d88a,
+		0x18b69172, 0x7e239f6d, 0x80df50a2, 0x85a56e12, 0x06e82557, 0x207cb48f, 0xac35ed51, 0xec016d31,
+		0x74338ede, 0x193bdf7e, 0x486fd9b9, 0x22472334, 0xc50935ca, 0x8c5f125d, 0xeacd70d1, 0x69152e68,
+		0x663834bc, 0x04b96f50, 0xe738f5c4, 0xb98dd8fc, 0x9e4405b4, 0xb9803f7d, 0x115366c3, 0x58fcab5c,
+		0xeca98944, 0x50859c27, 0x6022e202, 0xff308b6a, 0x72661ed3, 0xbf509be3, 0x82c6ffc7, 0x7a1952ef,
+		0x331993e9, 0x220e5150, 0x94039b4e, 0x7760231d, 0x770abc65, 0xc4e3fafe, 0xdc6b1070, 0x2a241138,
+		0xebba89b5, 0x6244b1ab, 0xe396c21e, 0x5581b239, 0x59b07f02, 0x1507c911, 0xd2cbe915, 0x1ad2e3e5,
+		0xa134efd2, 0x783c8838, 0xf294339e, 0x08802f30, 0x779b4f35, 0xab37cc46, 0x0ff1b04a, 0x37909370,
+		0x5679cde5, 0xba9ea1dd, 0x90b1b69e, 0x46bff276, 0xf55979bf, 0x924d945c, 0xb8d93ce4, 0x69335f64,
+		0x2e6e2ec0, 0x92c86cc7, 0x469dd3b9, 0xe34fd540, 0xe5aadf47, 0xd1a5856b, 0xc89419f2, 0xab7bd5db,
+		0xaa2998f1, 0x8b841077, 0x49cb8db4, 0x90b01ed8, 0x36d71775, 0x6225a2b1, 0x2a613bfd, 0xb678ffc4,
+		0x8bc24500, 0x4490b5b7, 0x36ba410d, 0x0b7bea88, 0xb4055bb0, 0x10bc4e4c, 0x2199676f, 0xd7b14382,
+		0xe06047b4, 0xfe96b6f0, 0x3bc361e3, 0xa91363a7, 0x9a4a748f, 0xe7373cc3, 0x1644bb42, 0x2a027273,
+		0xc931e865, 0xf986e936, 0xe245cab2, 0x56669750, 0xee792882, 0xef8334af, 0x54336857, 0xa65b282d,
+		0x1edf7e04, 0xb1ce48b3, 0x3fc2069f, 0xb8afa49c, 0x743ebe8d, 0x014b001b, 0xea96db10, 0x84a41bba,
+		0x9328c470, 0x3614ed85, 0xbab3ecfd, 0x80f54d8f, 0x12738644, 0xb28d8705, 0x72efec21, 0xeb63cedb,
+		0xf2113294, 0x62728ace, 0x80bc3a1c, 0xcb058401, 0x66b4e81b, 0x914be5af, 0x702b01c8
 	]
 };
\ No newline at end of file
diff --git a/zelda-totk/zelda-totk.js b/zelda-totk/zelda-totk.js
index dcfdc6f..90c0238 100644
--- a/zelda-totk/zelda-totk.js
+++ b/zelda-totk/zelda-totk.js
@@ -1,20 +1,20 @@
 /*
-	The legend of Zelda: Tears of the Kingdom savegame editor v20230616
+	The legend of Zelda: Tears of the Kingdom savegame editor (last update 2023-07-08)
 
 	by Marc Robledo 2023
 */
+
 var currentEditingItem;
 
 SavegameEditor={
 	Name:'The legend of Zelda: Tears of the Kingdom',
 	Filename:['progress.sav','caption.sav'],
-	Version:20230608,
+	Version:20230708,
 	noDemo:true,
 
 	/* Settings */
 	Settings:{
-		lang:'en',
-		removeWarning:true
+		lang:'en'
 	},
 
 	/* Constants */
@@ -22,9 +22,7 @@ SavegameEditor={
 		GAME_VERSIONS:[
 			{version:'v1.0', fileSize:2307552, header:0x0046c3c8, metaDataStart:0x0003c050},
 			{version:'v1.1.x', fileSize:2307656, header:0x0047e0f4, metaDataStart:0x0003c088}
-		],
-
-		BLANK_ICON_PATH:'./assets/_blank.png'
+		]
 	},
 
 	/* Hashes */
@@ -38,83 +36,20 @@ SavegameEditor={
 		0xafd01d68, 'PlayerStatus.MaxEnergy', false,
 
 		0xc884818d, 'PlayerStatus.SavePos', true, //Vector3F
+		0x1d6189da, 'Sequence_CurrentBanc', true, //String64
 		0xd7a3f6ba, 'Pouch.Weapon.ValidNum', true,
 		0xc61785c2, 'Pouch.Bow.ValidNum', true,
 		0x05271e7d, 'Pouch.Shield.ValidNum', true,
 
-		0x65efd0be, 'Pouch.Weapon.Content.Name', true,
-		0x8b12d062, 'Pouch.Weapon.Content.Life', true, //durability
-		0xdd846288, 'Pouch.Weapon.Content.Effect.Type', true, //modifier
-		0xfda1d214, 'Pouch.Weapon.Content.Effect.Value', true, //modifier value
-		0x80707cad, 'Pouch.Weapon.Content.Combined.Name', true, //fuse id
-		//0x6796852b, 'Pouch.Weapon.Content.Combined.Life', true, //fuse durability
-		//0x12ffda6b, 'Pouch.Weapon.Content.ExtraLife', true,
-		//0xbf321621, 'Pouch.Weapon.Content.RecordExtraLife', true,
-		0x791c4a0b, 'Pouch.Bow.Content.Name', true,
-		0x60589200, 'Pouch.Bow.Content.Life', true,
-		0xd59aeed5, 'Pouch.Bow.Content.Effect.Type', true,
-		0xdfd216f2, 'Pouch.Bow.Content.Effect.Value', true,
-		0x273190f4, 'Pouch.Shield.Content.Name', true,
-		0xc3416d19, 'Pouch.Shield.Content.Life', true,
-		0x464b410c, 'Pouch.Shield.Content.Effect.Type', true,
-		0xa6a38304, 'Pouch.Shield.Content.Effect.Value', true,
-		0xc95833d9, 'Pouch.Shield.Content.Combined.Name', true,
-		//0x7a20968b, 'Pouch.Shield.Content.Combined.Life', true, //fuse durability
-		//0x0c1dafcb, 'Pouch.Shield.Content.ExtraLife', true,
-		0x754e8549, 'Pouch.Armor.Content.Name', true,
-		0x183e2a32, 'Pouch.Armor.Content.ColorVariation', true,
-		0x24dd3262, 'Pouch.Arrow.Content.Name', true,
-		0x53b27d94, 'Pouch.Arrow.Content.StockNum', true,
-		0xd96ebf12, 'Pouch.Material.Content.Name', true,
-		0xde2d8500, 'Pouch.Material.Content.StockNum', true,
-		//0xb532a540, 'Pouch.Material.Content.GetOrder', true,
-		//0xe50dcb79, 'Pouch.Material.Content.UseOrder', true,
-		0x7c0f89ad, 'Pouch.Food.Content.Name', true,
-		0x2a952a60, 'Pouch.Food.Content.StockNum', true,
-		0x9d3b5847, 'Pouch.Food.Content.LifeRecover', true,
-		0x6f743e98, 'Pouch.Food.Content.Effect.Type', true,
-		0x904a7213, 'Pouch.Food.Content.Effect.Level', true,
-		0xf097cefa, 'Pouch.Food.Content.Effect.Time', true, // in seconds
-		0x2e470848, 'Pouch.Food.Content.Price', true,
-		//0x919ad411, 'Pouch.Food.Content.MaterialName', true,
-		0xa86f2f10, 'Pouch.SpecialParts.Content.Name', true,
-		0x60d16ab0, 'Pouch.SpecialParts.Content.StockNum', true,
-		0x3bdba89c, 'Pouch.SpecialParts.Content.UseOrder', true,
-		0x22c6530a, 'Pouch.KeyItem.Content.Name', true,
-		0x60fac288, 'Pouch.KeyItem.Content.StockNum', true,
-
-		0x7bde80e9, 'OwnedHorseList.ActorName', true,
-		0xd2ddb868, 'OwnedHorseList.Name', true,
-		0x54049354, 'OwnedHorseList.Mane', true,
-		0x1daf6cb4, 'OwnedHorseList.Saddle', true,
-		0xfee5cd77, 'OwnedHorseList.Rein', true,
-		0xdcd9f005, 'OwnedHorseList.Familiarity', true, //bond
-		0xcea848b6, 'OwnedHorseList.HorseType', true,
-		0xafe462c3, 'OwnedHorseList.Toughness', true, //stats strength (life)
-		0xc0775abf, 'OwnedHorseList.Speed', true,
-		0xc8454f7c, 'OwnedHorseList.ChargeNum', true, //stats stamina
-		0x10d564d7, 'OwnedHorseList.HorsePower', true, //stats pull
-		0xfbf44df2, 'OwnedHorseList.Body.Pattern', true,
-		0x48bfcf08, 'OwnedHorseList.Body.EyeColor', true,
-		//0xf4505b59, 'OwnedHorseList.ColorType', true,
-		//0xbf41c181, 'OwnedHorseList.FootType', true,
-		//0xaabf3198, 'OwnedHorseList.UidHash', true,
-		//0x5dd10d95, 'OwnedHorseList.Body.NoseColor.Blue', true, //icon only
-		//0xfec02192, 'OwnedHorseList.Body.NoseColor.Green', true, //icon only
-		//0x9e10d432, 'OwnedHorseList.Body.NoseColor.Red', true, //icon only
-
-		0xa0e854ea, 'LastWildHorse.ActorName', true,
-
-
 		0x14d7f4c4, 'MapData.IconData.StampData.Type', true,
 		0xf24fc2e7, 'MapData.IconData.StampData.Pos', true,
 		0xd2025694, 'MapData.IconData.StampData.Layer', true,
 
-		0xd27f8651, 'AutoBuilder.Draft.Content.Index', true, //S32, length=30
-		0xa56722b6, 'AutoBuilder.Draft.Content.CombinedActorInfo', true, //binary data (size=6688), length=0?
-		0xc5bf2815, 'AutoBuilder.Draft.Content.CameraPos', true, //Vector3F, length=30
-		0xef74dca7, 'AutoBuilder.Draft.Content.CameraAt', true, //Vector3F, length=30
-		0x67f4b46b, 'AutoBuilder.Draft.Content.IsFavorite', true //S32?, length=30
+		0xd27f8651, 'AutoBuilder.Draft.Content.Index', true, //S32, array length=30
+		0xa56722b6, 'AutoBuilder.Draft.Content.CombinedActorInfo', true, //binary data (size=6688)
+		0xc5bf2815, 'AutoBuilder.Draft.Content.CameraPos', true, //Vector3F
+		0xef74dca7, 'AutoBuilder.Draft.Content.CameraAt', true, //Vector3F
+		0x67f4b46b, 'AutoBuilder.Draft.Content.IsFavorite', true //S32
 	],
 
 
@@ -208,7 +143,7 @@ SavegameEditor={
 	readStringUTF8Array:function(hashKey, arrayIndex){
 		return this._readArray(hashKey, arrayIndex, this.readStringUTF8);
 	},
-	readDynamicDataArray:function(hashKey, arrayIndex){
+	readBinaryArray:function(hashKey, arrayIndex){
 		var allData=[];
 		var offset=this.Offsets[hashKey];
 		var max=tempFile.readU32(offset);
@@ -289,7 +224,7 @@ SavegameEditor={
 			tempFile.writeF32(this.Offsets[hashKey] + 0x08, vector.z);
 		}
 	},
-	writeDynamicData:function(hashKey, arrayIndex, data){
+	writeBinary:function(hashKey, arrayIndex, data){
 		var offset=this.Offsets[hashKey];
 		var max=tempFile.readU32(offset);
 		offset+=4;
@@ -313,9 +248,6 @@ SavegameEditor={
 			if(typeof loadedSettings.lang==='string'){
 				this.Settings.lang=loadedSettings.lang.toLowerCase().trim();
 			}
-			if(typeof loadedSettings.removeWarning==='boolean'){
-				this.Settings.removeWarning=loadedSettings.removeWarning;
-			}
 		}
 	},
 	saveSettings:function(){
@@ -378,7 +310,7 @@ SavegameEditor={
 		for(var i=0; i<structInfo.length; i++){
 			if(typeof structInfo[i].hash==='string'){
 				structInfo[i].hashText=structInfo[i].hash;
-				structInfo[i].hash=murmurHash3.x86.hash32(structInfo[i].hash);
+				structInfo[i].hash=hash(structInfo[i].hash);
 			}
 
 			if(!this.Offsets[structInfo[i].hash])
@@ -415,159 +347,41 @@ SavegameEditor={
 		return ret;
 	},
 
-	_createItemRow:function(item){
-		var img=new Image();
-		img.id='icon-'+item.category+'-'+item.index;
-		img.loading='lazy';
-		img.onerror=function(){
-			this.removeEventListener('error', this.onerror);
-			//console.error('icon '+this.src+' not found');
-			img.src=SavegameEditor.Constants.BLANK_ICON_PATH;
+	_removeItem:function(catId, itemToRemove){
+		var pouch=this.pouches[catId];
+		var removedItem=pouch.remove(itemToRemove);
+		if(removedItem){
+			document.getElementById('container-'+catId).removeChild(removedItem._htmlRow);
+			
+			if(catId==='arrows')
+				SavegameEditor.refreshAddArrowsButton();
 		}
-		if(item.category==='armors')
-			img.src='./assets/icons/'+item.category+'/'+Armor.ICONS[item.id]+'.png';
-		else
-			img.src='./assets/icons/'+item.category+'/'+item.id+'.png';
-
-		var itemNumber=document.createElement('span');
-		itemNumber.className='item-number';
-		itemNumber.innerHTML='#'+item.index;
-
-		var spanItemId=document.createElement('span');
-		spanItemId.className='item-name clickable';
-		spanItemId.id='item-name-'+item.category+'-'+item.index;
-		spanItemId.innerHTML=item.getItemTranslation();
-		if(item.getItemTranslation()===item.id){
-			spanItemId.style.color='red';
-		}
-		spanItemId.addEventListener('click', function(){
-			SavegameEditor.editItem(item);
-		}, false);
-
-
-		var lastColumn=document.createElement('div');
-		if(item.category==='weapons' || item.category==='bows' || item.category==='shields'){
-			lastColumn.appendChild(item._htmlInputDurability);
-			lastColumn.appendChild(item._htmlSelectModifier);
-			lastColumn.appendChild(item._htmlInputModifierValue);
-			if(item.isFusable()){
-				lastColumn.appendChild(item._htmlSelectFusion);
-			}
-		}else if(item.quantity!==0xffffffff && (item.category==='arrows' || item.category==='materials' || item.category==='food' || item.category==='devices' || item.category==='key')){
-			lastColumn.appendChild(item._htmlInputQuantity);
-			if(item.category==='food'){
-				lastColumn.appendChild(item._htmlSelectFoodEffect);
-				lastColumn.appendChild(item._htmlInputFoodEffectHearts);
-				lastColumn.appendChild(item._htmlInputFoodEffectMultiplier);
-				lastColumn.appendChild(item._htmlInputFoodEffectTime);
-				lastColumn.appendChild(item._htmlInputFoodPrice);
-			}
-		}else if(item.category==='armors'){
-			lastColumn.appendChild(item._htmlSpanColor);
-			lastColumn.appendChild(item._htmlSelectDyeColor);
-		}else if(item.category==='horses'){
-			lastColumn.appendChild(item._htmlInputName);
-			lastColumn.appendChild(item._htmlSelectMane);
-			lastColumn.appendChild(item._htmlSelectSaddles);
-			lastColumn.appendChild(item._htmlSelectReins);
-			lastColumn.appendChild(item._htmlInputBond);
-			lastColumn.appendChild(item._htmlInputStatsStrength);
-			lastColumn.appendChild(item._htmlSelectStatsSpeed);
-			lastColumn.appendChild(item._htmlSelectStatsStamina);
-			lastColumn.appendChild(item._htmlSelectStatsPull);
-			lastColumn.appendChild(item._htmlSelectIconPattern);
-			lastColumn.appendChild(item._htmlSelectIconEyeColor);
-		}
-		
-		if(item.removable){
-			item._htmlDeleteButton=document.createElement('button');
-			item._htmlDeleteButton.className='button colored red with-icon icon3 floating';
-			item._htmlDeleteButton.addEventListener('click', function(){
-				if(SavegameEditor.Settings.removeWarning){
-					MarcDialogs.confirm('Are you sure you want to delete <strong>'+item.getItemTranslation()+'</strong>?<br/><div style="color:red">Warning: use this feature at your own risk</div>', function(){
-						MarcDialogs.close();
-						SavegameEditor._removeItem(item.category, item.index);
-					});
-				}else{
-					SavegameEditor._removeItem(item.category, item.index);
-				}
-			});
-			lastColumn.appendChild(item._htmlDeleteButton);
-		}
-
-		var r=row([1,6,3,2],
-			img,
-			spanItemId,
-			document.createElement('div'), /* modifier column */
-			lastColumn
-		);
-		r.className+=' row-items';
-		r.id='row-item-'+item.category+'-'+item.index;
-		r.children[1].appendChild(itemNumber);
-		
-		return r;
-	},
-
-	_removeItem:function(catId, index){
-		var items=this.currentItems[catId];
-		if(typeof index==='object')
-			index=items.indexOf(index);
-
-		items.splice(index, 1);
-		document.getElementById('container-'+catId).removeChild(document.getElementById('container-'+catId).children[index]);
-
-		for(var i=index; i<items.length; i++){
-			items[i].index--;
-			document.getElementById('container-'+catId).children[i].querySelector('.item-number').innerHTML='#'+items[i].index;
-		}
-
-		var fakeItem;
-		if(catId==='weapons' || catId==='bows' || catId==='shields'){
-			fakeItem=new Equipment(catId, items.length, '', 0xffffffff, Equipment.MODIFIER_NO_BONUS, 0xffffffff);
-		}else if(catId==='armors'){
-			fakeItem=new Armor(items.length, '', Armor.DYE_NONE);
-		}else if(catId==='materials' || catId==='food' || catId==='devices' || catId==='key'){
-			fakeItem=new Item(catId, items.length, '', 0xffffffff)
-		}
-		fakeItem.save();
-	},
-
-	_findItem:function(catId, itemId){
-		var items=this.currentItems[catId];
-		for(var i=0; i<items.length; i++){
-			if(items[i].id===itemId)
-				return items[i];
-		}
-		return false;
 	},
 
 	addItem:function(catId, itemId, quantity){
-		var categoryHash=getInternalCategoryId(catId);
-		var maxItems=SavegameEditor.readU32('Pouch.'+categoryHash+'.Content.Name');
-
-		var lastItem=this.getLastItem(catId);
-
-		if(lastItem && lastItem.index===(maxItems -1)){
-			console.warn('not enough space in '+catId);
-			return false;
-		}
+		var pouch=this.pouches[catId];
 
 
 		if(typeof itemId==='string'){
 			quantity=typeof quantity==='number' && quantity>0? quantity : 1;
-			var foundItem=SavegameEditor._findItem(catId,itemId);
+			var foundItem=pouch.findItemById(itemId);
 			if(foundItem){
 				foundItem.quantity+=quantity;
-				foundItem._htmlInputQuantity.value=foundItem.quantity;
-			}else{
-				var newItem=new Item(catId, SavegameEditor.currentItems[catId].length, itemId, quantity);
-				newItem.removable=true;
-				SavegameEditor.currentItems[catId].push(newItem);
-				document.getElementById('container-'+catId).appendChild(SavegameEditor._createItemRow(newItem));
+				Pouch.updateItemRow(foundItem);
+			}else if(!pouch.isFull()){
+				var newItem=pouch.add({id:itemId, quantity:quantity});
+				document.getElementById('container-'+catId).appendChild(Pouch.updateItemRow(newItem));
 			}
 			return quantity;
 		}
 
+		if(pouch.isFull()){
+			console.warn('not enough space in '+catId);
+			return false;
+		}
+
+		var lastItem=pouch.getLast();
+
 		var itemListArray=this.getAvailableItems(catId);
 
 		var newId;
@@ -575,46 +389,65 @@ SavegameEditor={
 			var nextIndexId=itemListArray.indexOf(lastItem.id)+1;
 			if(nextIndexId===itemListArray.length)
 				nextIndexId=0;
+
 			newId=itemListArray[nextIndexId];
+
+			if(catId==='armors')
+				while(Armor.INFO[newId].base !== newId){
+					newId=itemListArray[nextIndexId++];
+				}
 		}else{
 			newId=itemListArray[0];
 		}
 
-		var newItem, maxItems;
-		if(catId==='weapons' || catId==='bows' || catId==='shields'){
-			newItem=lastItem? lastItem.copy(lastItem.index+1, newId) : new Equipment(catId, 0, newId);
-			if(lastItem)
-				newItem.restoreDurability();
-		}else if(catId==='armors'){
-			newItem=lastItem? lastItem.copy(lastItem.index+1, newId) : new Armor(0, newId);
-		}else if(catId==='arrows' || catId==='materials' || catId==='food' || catId==='devices' || catId==='key'){
-			newItem=lastItem? lastItem.copy(lastItem.index+1, newId) : new Item(catId, 0, newId);
+		var newItem;
+		if(lastItem){
+			var newItemData=lastItem.export();
+			newItemData.id=newId;
+			newItem=pouch.add(newItemData);
+		}else{
+			newItem=pouch.add({id:newId});
 		}
-		newItem.removable=true;
 
-	
 
-		this.currentItems[catId].push(newItem);
-		var row=this._createItemRow(newItem);
+		var row=Pouch.updateItemRow(newItem);
 		document.getElementById('container-'+newItem.category).appendChild(row);
-		row.scrollIntoView({behavior:'smooth',block:'center'});
+		Pouch.scrollToItem(newItem);
 
-		if(catId==='arrows')
+		if(catId==='arrows'){
+			var equipIndex=new Variable('Pouch.Arrow.EquipIndex', 'IntArray');
+			if(equipIndex.value[0]===-1){
+				equipIndex.value[0]=0;
+				equipIndex.save();
+				UI.toast('Fixed arrows equip index');
+			}
 			this.refreshAddArrowsButton();
+		}
+
+		SavegameEditor.fixItemAvailabilityFlag(newItem);
+
 		return true;
 	},
 
 
-	getLastItem:function(catId){
-		var lastIndex=-1;
-		for(var i=0; i<SavegameEditor.currentItems[catId].length; i++){
-			if(SavegameEditor.currentItems[catId][i].index > lastIndex)
-				lastIndex=SavegameEditor.currentItems[catId][i].index;
+	fixItemAvailabilityFlag:function(item){
+		if(item.category==='key'){
+			var fixed=false;
+
+			var variable;
+			if(/^Obj_SubstituteCloth_/.test(item.id)){
+				variable=new Variable('OwnedParasailPattern.'+item.id.replace('Obj_SubstituteCloth_','Pattern').replace('PatternDefault','Default'), 'Bool');
+			}else if(/^GameRomHorseReins_/.test(item.id)){
+				variable=new Variable('OwnedCustomizableHorseTack_Reins.'+item.id, 'Bool');
+			}else if(/^GameRomHorseSaddle_/.test(item.id)){
+				variable=new Variable('OwnedCustomizableHorseTack_Saddle.'+item.id, 'Bool');
+			}
+			if(variable && !variable.value){
+				variable.value=true;
+				variable.save();
+				UI.toast(_('Fixed necessary usability flags for %s').replace('%s', '<strong>'+_(item.getItemTranslation())+'</strong>'), 'flags-fixed');
+			}
 		}
-		if((lastIndex+1)===SavegameEditor.currentItems[catId].length)
-			return SavegameEditor.currentItems[catId][lastIndex];
-		console.error('invalid '+catId+' index');
-		return null;
 	},
 
 	getAvailableItems:function(catId){
@@ -639,7 +472,7 @@ SavegameEditor={
 			for(var i=0; i<itemList.length; i++){
 				var opt=document.createElement('option');
 				opt.value=itemList[i];
-				opt.innerHTML=Locale._(itemList[i]);
+				opt.innerHTML=_(itemList[i]);
 				this.selectItem.appendChild(opt);
 			}
 
@@ -654,46 +487,110 @@ SavegameEditor={
 			this.selectItem.value=item.id;
 		}
 
-		document.getElementById('item-name-'+item.category+'-'+item.index).innerHTML='';
-		document.getElementById('item-name-'+item.category+'-'+item.index).parentElement.appendChild(this.selectItem);
+		item._htmlItemId.style.display='none';
+		item._htmlRow.children[0].appendChild(this.selectItem);
 		this.selectItem.focus();
 		this.selectItem.click();
+
+		item.lastInputChanged='id';
+		for(var prop in item._htmlInputs){
+			item._htmlInputs[prop].disabled=true;
+		}
 	},
-	editItem2:function(item, newId){
-		item.id=newId;
-		if(typeof item.fixValues==='function'){
-			item.fixValues();
+
+	restoreDurability:function(equipment){
+		if(equipment.restoreDurability()){
+			Pouch.updateItemRow(equipment);
+			return true;
 		}
 
-		var oldRow=document.getElementById('row-item-'+item.category+'-'+item.index);
-		var newRow=this._createItemRow(item);
-		oldRow.parentElement.replaceChild(newRow, oldRow);
+		return false;
 	},
-
-	restoreDurability:function(catId){
-		this.currentItems[catId].forEach(function(equipment, i){
-			equipment.restoreDurability();
+	restoreDurabilityAll:function(catId){
+		var nChanges=0;
+		this.pouches[catId].items.forEach(function(equipment, i){
+			if(SavegameEditor.restoreDurability(equipment))
+				nChanges++;
 		});
+
+		UI.toast(_('%s '+catId+' were restored').replace('%s', nChanges), 'restore-durability');
+		return nChanges;
+	},
+	restoreDecay:function(equipment){
+		if(equipment.restoreDecay()){
+			Pouch.updateItemIcon(equipment);
+			return true;
+		}
+
+		return false;
+	},
+	restoreDecayAll:function(){
+		var nChanges=0;
+		this.pouches.weapons.items.forEach(function(equipment, i){
+			if(SavegameEditor.restoreDecay(equipment))
+				nChanges++;
+		});
+
+		UI.toast(_('%s weapons were switched to pristine').replace('%s', nChanges), 'restore-decay');
+		return nChanges;
+	},
+	setInfiniteDurability:function(equipment){
+		if(equipment.setInfiniteDurability()){
+			Pouch.updateItemRow(equipment);
+			return true;
+		}
+
+		Pouch.updateItemRow(equipment);
+		return false;
+	},
+	setInfiniteDurabilityAll:function(catId){
+		var nChanges=0;
+		this.pouches[catId].items.forEach(function(equipment, i){
+			if(SavegameEditor.setInfiniteDurability(equipment))
+				nChanges++;
+		});
+
+		UI.toast(_('%s '+catId+' have now infinite durability').replace('%s', nChanges), 'restore-durability');
+		return nChanges;
+	},
+	upgradeArmor:function(armor){
+		if(armor.upgrade()){
+			Pouch.updateItemRow(armor);
+			return true;
+		}
+
+		return false;
+	},
+	upgradeArmorAll:function(){
+		var nChanges=0;
+		this.pouches.armors.items.forEach(function(armor, i){
+			if(SavegameEditor.upgradeArmor(armor))
+				nChanges++;
+		});
+
+		UI.toast(_('%s armors were upgraded').replace('%s', nChanges), 'upgrade-armor');
+		return nChanges;
 	},
 
-	clearAllMapPins:function(){
+	clearAllMapPins:function(onlyIcon){
 		var count=0;
 		for(var i=0; i<this.currentItems.mapPins.length; i++){
-			if(this.currentItems.mapPins[i].clear())
+			if(this.currentItems.mapPins[i].clear(onlyIcon))
 				count++;
 		}
 
 		this.refreshCounterMapPins();
-		MarcDialogs.alert(count+' map pins removed');
+		UI.toast(_('%s map pins removed').replace('%s', count), 'map-pin-removed');
 		return count;
 	},
 	addMapPin:function(icon, x, y, z){
 		for(var i=0; i<this.currentItems.mapPins.length; i++){
 			if(this.currentItems.mapPins[i].isFree() && !MapPin.find(this.currentItems.mapPins, x, y, z)){
 				this.currentItems.mapPins[i].icon=icon;
-				this.currentItems.mapPins[i].coordinates={x:x, y:y};
+				this.currentItems.mapPins[i].coordinates={x:MapPin.formatFloat(x), y:MapPin.formatFloat(y)};
+				//console.log(z);
+				//console.log(hashReverse(MapPin.getMapByZ(z)));
 				this.currentItems.mapPins[i].map=MapPin.getMapByZ(z);
-				//this.refreshCounterMapPins();
 				return true;
 			}
 		}
@@ -701,17 +598,17 @@ SavegameEditor={
 	},
 	addLocationPins:function(flags, coordinates, icon, limit, valueFalse){
 		if(typeof icon==='string')
-			icon=murmurHash3.x86.hash32(icon);
+			icon=hash(icon);
 
 		if(typeof valueFalse==='string')
-			valueFalse=murmurHash3.x86.hash32(valueFalse);
+			valueFalse=hash(valueFalse);
 		else if(typeof valueFalse==='number')
 			valueFalse=valueFalse;
 		else
 			valueFalse=0;
 
 		if(typeof icon==='string')
-			icon=murmurHash3.x86.hash32(icon);
+			icon=hash(icon);
 
 		var count=0;
 		var offsets=this._getOffsetsByHashes(flags);
@@ -723,8 +620,13 @@ SavegameEditor={
 			}
 		}
 
-		this.refreshCounterMapPins();
-		MarcDialogs.alert(count+' map pins added');
+		if(count){
+			this.refreshCounterMapPins();
+			UI.toast(_('%s map pins added').replace('%s', '<strong>'+count+'</strong>'));
+		}else{
+			UI.toast(_('No map pins added'), 'map-pins-none');
+		}
+
 		return count;
 	},
 	addPinsShrines:function(){
@@ -736,17 +638,17 @@ SavegameEditor={
 	addPinsKoroksHidden:function(){
 		return this.addLocationPins(CompletismHashes.KOROKS_HIDDEN, Coordinates.KOROKS_HIDDEN, MapPin.ICON_LEAF, 50);
 	},
-	addPinsBubbuls:function(){
-		return this.addLocationPins(CompletismHashes.BUBBULS_DEFEATED, Coordinates.LOCATION_CAVES, MapPin.ICON_HEART, 50);
-	},
 	addPinsKoroksCarry:function(){
-		return this.addLocationPins(CompletismHashes.KOROKS_CARRY, Coordinates.KOROKS_CARRY, MapPin.ICON_LEAF, 25, 'NotClear');
+		return this.addLocationPins(CompletismHashes.KOROKS_CARRY, Coordinates.KOROKS_CARRY, MapPin.ICON_HUMAN, 25, 'NotClear');
+	},
+	addPinsBubbuls:function(){
+		return this.addLocationPins(CompletismHashes.BUBBULS_DEFEATED, Coordinates.LOCATION_BUBBULS, MapPin.ICON_HEART, 50);
 	},
 	addPinsLocationsCaves:function(){
-		return this.addLocationPins(CompletismHashes.LOCATION_CAVES_VISITED, Coordinates.LOCATION_CAVES, MapPin.ICON_HEART, 50);
+		return this.addLocationPins(CompletismHashes.LOCATION_CAVES_VISITED2, Coordinates.LOCATION_CAVES, MapPin.ICON_DIAMOND, 50);
 	},
 	addPinsLocationsWells:function(){
-		return this.addLocationPins(CompletismHashes.LOCATION_WELLS_VISITED, Coordinates.LOCATION_WELLS, MapPin.ICON_DIAMOND, 25);
+		return this.addLocationPins(CompletismHashes.LOCATION_WELLS_VISITED2, Coordinates.LOCATION_WELLS, MapPin.ICON_DIAMOND, 25);
 	},
 	addPinsBossesHinox:function(){
 		return this.addLocationPins(CompletismHashes.BOSSES_HINOXES_DEFEATED, Coordinates.BOSSES_HINOXES, MapPin.ICON_SKULL, 25);
@@ -766,6 +668,9 @@ SavegameEditor={
 	addPinsBossesGleeok:function(){
 		return this.addLocationPins(CompletismHashes.BOSSES_GLEEOKS_DEFEATED, Coordinates.BOSSES_GLEEOKS, MapPin.ICON_SKULL, 5);
 	},
+	addPinsOldMaps:function(){
+		return this.addLocationPins(CompletismHashes.TREASURE_MAPS_FOUND, Coordinates.TREASURE_MAPS, MapPin.ICON_CHEST);
+	},
 	addPinsSchematicsStone:function(){
 		return this.addLocationPins(CompletismHashes.SCHEMATICS_STONE_FOUND, Coordinates.SCHEMATICS_STONE, MapPin.ICON_CHEST);
 	},
@@ -791,7 +696,7 @@ SavegameEditor={
 		getField(container+'-counter').appendChild(progressBar);
 	},
 	refreshCounterMapPins:function(){
-		this._refreshCounter('pin', MapPin.count(this.currentItems.mapPins), MapPin.MAX);
+		SavegameEditor._refreshCounter('pin', MapPin.count(SavegameEditor.currentItems.mapPins), MapPin.MAX);
 	},
 	refreshCounterShrinesFound:function(){
 		this._refreshCounter('shrines-found', Completism.countShrinesFound(), CompletismHashes.SHRINES_FOUND.length);
@@ -838,6 +743,9 @@ SavegameEditor={
 	refreshCounterBossesGleeok:function(){
 		this._refreshCounter('boss-gleeok', Completism.countBossesGleeok(), CompletismHashes.BOSSES_GLEEOKS_DEFEATED.length);
 	},
+	refreshCounterOldMaps:function(){
+		this._refreshCounter('old-maps', Completism.countOldMaps(), CompletismHashes.TREASURE_MAPS_FOUND.length);
+	},
 	refreshCounterSchematicsStone:function(){
 		this._refreshCounter('schematics-stone', Completism.countSchematicsStone(), CompletismHashes.SCHEMATICS_STONE_FOUND.length);
 	},
@@ -847,6 +755,32 @@ SavegameEditor={
 	refreshCounterCompendium:function(){
 		this._refreshCounter('compendium', Completism.countCompendium(), CompletismHashes.COMPENDIUM_STATUS.length);
 	},
+	refreshCounterPristineWeapons:function(){
+		this._refreshCounter('pristine-weapons', ExperienceCalculator.countPristineWeapons(), ExperienceCalculator.BROKEN_WEAPON_HASHES.length);
+	},
+	refreshCounterAll:function(){
+		this.refreshCounterShrinesFound();
+		this.refreshCounterShrinesClear();
+		this.refreshCounterLighrootsFound();
+		this.refreshCounterLighrootsClear();
+		this.refreshCounterKoroksHidden();
+		this.refreshCounterKoroksCarry();
+		this.refreshCounterBubbuls();
+		this.refreshCounterLocationCaves();
+		this.refreshCounterLocationWells();
+		this.refreshCounterBossesHinox();
+		this.refreshCounterBossesTalus();
+		this.refreshCounterBossesMolduga();
+		this.refreshCounterBossesFlux();
+		this.refreshCounterBossesFrox();
+		this.refreshCounterBossesGleeok();
+		this.refreshCounterOldMaps();
+		this.refreshCounterSchematicsStone();
+		this.refreshCounterSchematicsYiga();
+		this.refreshCounterCompendium();
+		this.refreshCounterPristineWeapons();
+		this.refreshMissingPristineWeapons();
+	},
 
 
 	experienceCalculate:function(){
@@ -856,41 +790,41 @@ SavegameEditor={
 		document.getElementById('experience-enemy-tiers').innerHTML='';
 		ExperienceCalculator.getEnemyTiers(totalExperience).forEach(function(enemy, i){
 			var span=document.createElement('span');
-			span.innerHTML=Locale._(enemy);
+			span.innerHTML=_(enemy);
 			span.className='text-center';
 			span.style.display='inline-block';
 			span.style.minWidth='33%';
 			document.getElementById('experience-enemy-tiers').appendChild(span);
 		});
 	},
+	refreshMissingPristineWeapons:function(){
+		var missingPristineWeapons=ExperienceCalculator.getMissingPristineWeapons();
+		
+		$('#experience-pristine-weapons').empty();
 
-
-	experienceReset:function(){
-		MarcDialogs.confirm(Locale._('Do you want to reset all your defeated enemy count?<br/>Note: this can\'t be undone.'), function(){
-			Completism._set(ExperienceCalculator.generateHashes(), null, 0);
-			SavegameEditor.experienceCalculate();
-			MarcDialogs.close();
-		});
+		if(missingPristineWeapons.length){
+			missingPristineWeapons.forEach(function(weaponId){
+				var span=document.createElement('span');
+				span.innerHTML=_(weaponId);
+				span.className='text-center';
+				span.style.display='inline-block';
+				span.style.minWidth='33%';
+				document.getElementById('experience-pristine-weapons').appendChild(span);
+			});
+		}else{
+			$('<div></div>').addClass('text-center').html(_('None')).appendTo($('#experience-pristine-weapons'));
+		}
 	},
 
 
 	refreshItemTab:function(catId){
 		empty('container-'+catId);
-		SavegameEditor.currentItems[catId].forEach(function(item, j){
-			document.getElementById('container-'+item.category).appendChild(
-				SavegameEditor._createItemRow(item)
-			);
+		SavegameEditor.pouches[catId].items.forEach(function(item, j){
+			Pouch.updateItemRow(item);
+			document.getElementById('container-'+item.category).appendChild(item._htmlRow);
 		});
-		MarcTooltips.add('#container-'+catId+' select',{position:'bottom',align:'right'});
-		MarcTooltips.add('#container-'+catId+' input',{position:'bottom',align:'right'});
-	},
-	refreshItemTabs:function(){
-		if(this.currentItems){
-			var ITEM_CATS=['weapons','bows','shields','armors','arrows','materials','food','devices','key','horses'];
-			ITEM_CATS.forEach(function(catId, i){
-				SavegameEditor.refreshItemTab(catId);
-			});
-		}
+		MarcTooltips.add('#container-'+catId+' select',{position:'left'});
+		MarcTooltips.add('#container-'+catId+' input',{position:'left',align:'center'});
 	},
 
 	/* check if savegame is valid */
@@ -939,13 +873,127 @@ SavegameEditor={
 	},
 
 
-	preload:function(){
+	preload:function(){		
+		/* completiosnim mode */
+		$('#input-radio-completionism-map, #input-radio-completionism-unlock').on('change', function(evt){
+			if(this.value==='unlock'){
+				$('.completionism-actions-map').hide();
+				$('.completionism-actions-unlock').show();
+			}else{
+				$('.completionism-actions-map').show();
+				$('.completionism-actions-unlock').hide();
+			}
+		});
+		/* dropdown */
+		$('#dropdown-item-button-pristine').on('click', function(evt){
+			if(SavegameEditor.restoreDecay(currentEditingItem))
+				Pouch.updateItemRow(currentEditingItem);
+		});
+		$('#dropdown-item-button-durability').on('click', function(evt){
+			if(SavegameEditor.restoreDurability(currentEditingItem))
+				Pouch.updateItemRow(currentEditingItem);
+		});
+		$('#dropdown-item-button-infinite').on('click', function(evt){
+			if(SavegameEditor.setInfiniteDurability(currentEditingItem))
+				Pouch.updateItemRow(currentEditingItem);
+		});
+		$('#dropdown-item-button-upgrade').on('click', function(evt){
+			if(SavegameEditor.upgradeArmor(currentEditingItem))
+				Pouch.updateItemRow(currentEditingItem);
+		});
+		$('#dropdown-item-button-duplicate').on('click', function(evt){
+			var newItem=SavegameEditor.pouches[currentEditingItem.category].add(currentEditingItem);
+			if(newItem){
+				UI.toast(_('Item duplicated'), 'duplicate');
+				document.getElementById('container-'+newItem.category).appendChild(Pouch.updateItemRow(newItem));
+				Pouch.scrollToItem(newItem);
+			}
+		});
+		$('#dropdown-item-button-export').on('click', function(evt){
+			var myJson=currentEditingItem.export();
+			var blob = new Blob([JSON.stringify(myJson, null, '\t')], {type: 'application/json;charset=utf-8'});
+			var fileName='totk_'+currentEditingItem.category.replace(/s$/,'')+'_';
+			if(currentEditingItem.category==='horses')
+				fileName+=_(currentEditingItem.name);
+			else
+				fileName+=_(currentEditingItem.id);
+			if(currentEditingItem.category==='weapons' || currentEditingItem.category==='bows' || currentEditingItem.category==='shields')
+				fileName+='_'+myJson.modifier;
+
+			saveAs(blob, fileName+'.json');
+		});
+		$('#dropdown-item-button-import').on('click', function(evt){
+			$('#input-file-pouch-import').trigger('click');
+		});
+		$('#input-file-pouch-import').on('change', function(evt){
+			var fileReader=new FileReader();
+			fileReader.onload=function(evt){
+				try{
+					var jsonObject=JSON.parse(evt.target.result);
+					var pouch=SavegameEditor.pouches[currentEditingItem.category];
+					var pouchItems=pouch.items;
+					var index=pouchItems.indexOf(currentEditingItem);
+
+					if(Pouch.getCategoryItemStructId(currentEditingItem.category)===jsonObject.totkStruct){
+						if(currentEditingItem.category==='weapons' || currentEditingItem.category==='bows' || currentEditingItem.category==='shields'){
+							pouchItems[index]=new Equipment(currentEditingItem.category, jsonObject);
+						}else if(currentEditingItem.category==='armors'){
+							pouchItems[index]=new Armor(jsonObject);
+						}else if(currentEditingItem.category==='horses'){
+							pouchItems[index]=new Horse(jsonObject);
+						}else{
+							pouchItems[index]=new Item(currentEditingItem.category, jsonObject);
+						}
+
+						Pouch.updateItemRow(pouchItems[index]);
+						document.getElementById('container-'+currentEditingItem.category).replaceChild(pouchItems[index]._htmlRow, currentEditingItem._htmlRow);
+					}
+				}catch(err){
+					console.error(err);
+				}
+			};
+			fileReader.readAsText(event.target.files[0]);
+		});
+		$('#dropdown-item-button-delete').on('click', function(evt){
+			var showWarning=$('#checkbox-delete-item-warning').prop('checked');
+			if(showWarning){
+				$('#modal-delete-item-text').html(_('Are you sure you want to delete %s?').replace('%s', '<strong>'+currentEditingItem.getItemTranslation()+'</strong>'))
+				UI.modal('delete-item');
+			}else{
+				SavegameEditor._removeItem(currentEditingItem.category, currentEditingItem);
+			}
+		});
+		$('#btn-delete-item-confirm').on('click', function(evt){
+			SavegameEditor._removeItem(currentEditingItem.category, currentEditingItem);
+		});
+
+
+
+
+
+
+
+
+
+
+
+		
 		this.selectItem=document.createElement('select');
+		this.selectItem.addEventListener('change', function(){
+			//console.log('change');
+			currentEditingItem.id=this.value;
+			Pouch.updateItemIcon(currentEditingItem);
+		}, false);
 		this.selectItem.addEventListener('blur', function(){
 			//console.log('blur');
-			SavegameEditor.editItem2(currentEditingItem, this.value);
-			//document.getElementById('item-name-'+currentEditingItem.category+'-'+currentEditingItem.index).innerHTML=SavegameEditor._getItemTranslation(currentEditingItem.id);
-			//this.parentElement.removeChild(this);
+			for(var prop in currentEditingItem._htmlInputs){
+				currentEditingItem._htmlInputs[prop].disabled=false;
+			}
+			Pouch.updateItemRow(currentEditingItem);
+			SavegameEditor.fixItemAvailabilityFlag(currentEditingItem);
+			currentEditingItem._htmlItemId.style.display='inline';
+			this.parentElement.removeChild(this);
+
 			currentEditingItem=null;
 		}, false);
 
@@ -988,9 +1036,9 @@ SavegameEditor={
 						importedAutobuilder.index=autobuilderOld.index;
 						importedAutobuilder.isFavorite=autobuilderOld.isFavorite;
 						importedAutobuilder.save();
-						MarcDialogs.alert('Successfully imported schema at '+(importedAutobuilder.index+1));
+						UI.toast('Successfully imported schema at '+(selectedIndex+1));
 					}else{
-						MarcDialogs.alert('Error while importing schema at '+(importedAutobuilder.index+1));
+						UI.toast('Error while importing schema at '+(selectedIndex+1));
 					}
 				}
 			});
@@ -1007,28 +1055,96 @@ SavegameEditor={
 		});
 
 		/* experience */
-		get('button-experience-calculate').addEventListener('click', SavegameEditor.experienceCalculate);
-		get('button-experience-reset').addEventListener('click', SavegameEditor.experienceReset);
-		get('span-experience-edit').addEventListener('click', function(evt){
-			get('input-custom-filter').value='DefeatedEnemyNum.* OR EnemyBattleData.*';
-			showTab('master');
+		get('map-pins-edit').addEventListener('click', function(){
+			TOTKMasterEditor.mini(
+				new Struct('mapPins', [
+					{
+						structArray:'markers',
+						variablesInfo:[
+							{hash:'MapData.IconData.MapPinData.Type', type:'EnumArray', label:'Marker color', propertyName:'color', enumValues:['Invalid','Red','Blue','Yellow','Green','Purple','LightBlue']},
+							{hash:'MapData.IconData.MapPinData.Pos', type:'Vector3Array', label:'Marker position', propertyName:'position'}
+						]
+					},{
+						structArray:'teleporters',
+						variablesInfo:[
+							{hash:'MapData.IconData.WarpMarkerData.Index', type:'IntArray', label:'Teleporter index', propertyName:'index'},
+							{hash:'MapData.IconData.WarpMarkerData.Pos', type:'Vector3Array', label:'Teleporter position', propertyName:'position'},
+							{hash:'MapData.IconData.WarpMarkerData.Rot', type:'Vector3Array', label:'Teleporter rotation', propertyName:'rotation'}
+						]
+					},{
+						structArray:'pins',
+						variablesInfo:[
+							{hash:'MapData.IconData.StampData.Type', type:'EnumArray', label:'Pin icon', propertyName:'icon', enumValues:['Invalid','Sword','Pot','Human','Rhombus','Heart','Star','TreasureBox','Skull','Leaf','Ore']},
+							{hash:'MapData.IconData.StampData.Layer', type:'EnumArray', label:'Pin map', propertyName:'layer', enumValues:['Sky','Ground','Underground']},
+							{hash:'MapData.IconData.StampData.Pos', type:'Vector2Array', label:'Pin position', propertyName:'position'}
+						]
+					}
+				]),
+				null,
+				_('Map pins editor'),
+				SavegameEditor.refreshCounterMapPins
+			);
+		});
+		get('pristine-weapons-edit').addEventListener('click', function(){
+			TOTKMasterEditor.mini(
+				new Struct('brokenWeapons', Object.keys(Equipment.WEAPONS_DECAYED_TO_PRISTINE).map(function(weaponId){
+					return {
+						hash:'EquipmentDeathCount.'+weaponId,
+						label:_('Broken times')+' '+_(weaponId),
+						type:'Int'
+					};
+				})),
+				[
+					{label:'Unlock all', action:TOTKMasterEditor.miniSetAllToOneAtLeast},
+					{
+						label:'Reset ghost seeds', action:function(){
+							var nChanges=ExperienceCalculator.resetGhostStatuesSeeds();
+							if(nChanges)
+								UI.alert(nChanges+' ghost seeds were reset');
+						}
+					},
+				],
+				_('Broken weapons editor'),
+				function(){
+					SavegameEditor.refreshCounterPristineWeapons();
+					SavegameEditor.refreshMissingPristineWeapons();
+				}
+			);
+		});
+		get('span-experience-edit').addEventListener('click', function(){
+			TOTKMasterEditor.mini(
+				new Struct('experience', ExperienceCalculator.generateHashesTextAll().map(function(hashText){
+					return {
+						hash:hashText,
+						label:ExperienceCalculator.getPrettifiedHashLabel(hashText),
+						type:'Int'
+					};
+				})),
+				[{label:'Reset', action:TOTKMasterEditor.miniResetAll}],
+				_('Experience editor'),
+				SavegameEditor.experienceCalculate
+			);
 		});
 
-		/* settings */
-		select('language').value=this.Settings.lang;
-		get('checkbox-warning-delete').checked=this.Settings.removeWarning;
-		select('language').addEventListener('change', function(evt){
-			SavegameEditor.Settings.lang=this.value;
-			Locale.set(this.value);
-			SavegameEditor.saveSettings();
-			document.getElementById('warning-language').style.display='block';		
+		/* master editor mini */
+		$('#button-hash-editor-export').on('click', TOTKMasterEditor.miniExport);
+		$('#button-hash-editor-import').on('click', function(evt){
+			$('#input-file-hash-editor-import').trigger('click');
 		});
-		get('checkbox-warning-delete').addEventListener('change', function(evt){
-			SavegameEditor.Settings.removeWarning=this.checked;
-			SavegameEditor.saveSettings();
+		$('#input-file-hash-editor-import').on('change', function(evt){
+			var fileReader=new FileReader();
+			fileReader.onload=function(evt){
+				try{
+					var jsonObject=JSON.parse(evt.target.result);
+					TOTKMasterEditor.miniImport(jsonObject);
+				}catch(err){
+					console.error(err);
+				}
+			};
+			fileReader.readAsText(event.target.files[0]);
 		});
 
-		MarcTooltips.add('.tab-button',{className:'dark',fixed:true});
+		MarcTooltips.add('#nav button',{className:'dark',fixed:true});
 	},
 
 	_timeToString:function(timeVal){
@@ -1040,14 +1156,20 @@ SavegameEditor={
 	},
 
 	refreshAddArrowsButton:function(){
-		document.getElementById('button-add-arrows').disabled=!!this.currentItems.arrows.length;
+		document.getElementById('button-add-arrows').disabled=!!this.pouches.arrows.items.length;
 	},
 	/* load function */
 	load:function(){
 		tempFile.fileName='progress.sav';
 
+		$('#container-startup').hide();
+		Variable.resetCache();
+		UI.reset();
+		Horse.buildHorseOptions();
+
 		this.selectItem.lastCategory=null;
-	
+
+
 		/* prepare editor */
 		setValue('playtime', this._timeToString(this.readU32('Playtime')));
 
@@ -1063,25 +1185,27 @@ SavegameEditor={
 
 
 
+		/* read pouches */
+		this.pouches={
+			weapons:new Pouch('weapons'),
+			bows:new Pouch('bows'),
+			shields:new Pouch('shields'),
+			armors:new Pouch('armors'),
+			arrows:new Pouch('arrows'),
+			materials:new Pouch('materials'),
+			food:new Pouch('food'),
+			devices:new Pouch('devices'),
+			key:new Pouch('key'),
+			horses:new Pouch('horses')
+		}
+
+
+
+
 		/* read items */
 		this.currentItems={
-			'weapons':Equipment.readAll('weapons'),
-			'bows':Equipment.readAll('bows'),
-			'shields':Equipment.readAll('shields'),
-			'armors':Armor.readAll(),
-			'arrows':Item.readAll('arrows'),
-			'materials':Item.readAll('materials'),
-			'food':Item.readAll('food'),
-			'devices':Item.readAll('devices'),
-			'key':Item.readAll('key'),
-			
-			'horses':Horse.readAll(),
-			
 			'mapPins':MapPin.readAll()
 		};
-		this.refreshAddArrowsButton();
-		/* build item containers */
-		this.refreshItemTabs();
 
 
 
@@ -1095,24 +1219,7 @@ SavegameEditor={
 		this.refreshCounterMapPins();
 
 		/* completionism */
-		this.refreshCounterShrinesFound();
-		this.refreshCounterShrinesClear();
-		this.refreshCounterLighrootsFound();
-		this.refreshCounterLighrootsClear();
-		this.refreshCounterKoroksHidden();
-		this.refreshCounterKoroksCarry();
-		this.refreshCounterBubbuls();
-		this.refreshCounterLocationCaves();
-		this.refreshCounterLocationWells();
-		this.refreshCounterBossesHinox();
-		this.refreshCounterBossesTalus();
-		this.refreshCounterBossesMolduga();
-		this.refreshCounterBossesFlux();
-		this.refreshCounterBossesFrox();
-		this.refreshCounterBossesGleeok();
-		this.refreshCounterSchematicsStone();
-		this.refreshCounterSchematicsYiga();
-		this.refreshCounterCompendium();
+		this.refreshCounterAll();
 
 		/* experience */
 		SavegameEditor.experienceCalculate();
@@ -1120,17 +1227,20 @@ SavegameEditor={
 		if(TOTKMasterEditor.isLoaded())
 			TOTKMasterEditor.forceFindOffsets=true;
 
-		showTab('home');
+		UI.showTab('home');
+	},
+
+	unload:function(){
+		$('#container-startup').show();
 	},
 
 	/* save function */
 	save:function(){
-		if(currentTab==='master')
+		if(UI.getCurrentTab()==='master')
 			return false;
 
 		/* STATS */
 		this.writeU32('PlayerStatus.CurrentRupee', null, getValue('rupees'));
-		/*this.writeU32('Mons', getValue('mons'));*/
 		this.writeU32('PlayerStatus.MaxLife', null, getValue('max-hearts'));
 		this.writeU32('PlayerStatus.MaxStamina', null, getValue('max-stamina'));
 		this.writeF32('PlayerStatus.MaxEnergy', null, getValue('max-battery'));
@@ -1153,19 +1263,10 @@ SavegameEditor={
 		this._writeString(this.Offsets.MAPTYPE, getValue('pos-maptype'))*/
 
 
-		/* ITEMS */
-		['weapons','bows','shields','armors','arrows','materials','food','devices','key'].forEach(function(catId, i){
-			SavegameEditor.currentItems[catId].forEach(function(item, j){
-				item.save();
-			});
-		});
-		Item.fixKeyAvailabilityFlags();
-
-
-		/* HORSES */
-		for(var i=0; i<SavegameEditor.currentItems.horses.length; i++){
-			SavegameEditor.currentItems.horses[i].save();
-		}
+		/* save pouches */
+		for(var pouchId in SavegameEditor.pouches){
+			SavegameEditor.pouches[pouchId].save();
+		};
 
 
 		/* MAP PINS */
@@ -1179,28 +1280,6 @@ SavegameEditor={
 
 
 
-/* TABS */
-var availableTabs=['home','weapons','bows','shields','armors','materials','food','devices','key','horses','master','settings'];
-
-
-var currentTab;
-function showTab(newTab){
-	currentTab=newTab;
-	for(var i=0; i<availableTabs.length; i++){
-		document.getElementById('tab-button-'+availableTabs[i]).className=currentTab===availableTabs[i]?'tab-button active':'tab-button';
-		document.getElementById('tab-'+availableTabs[i]).style.display=currentTab===availableTabs[i]?'block':'none';
-	}
-
-	if(newTab==='master'){
-		if(TOTKMasterEditor.isLoaded()){
-			if(TOTKMasterEditor.forceFindOffsets)
-				TOTKMasterEditor.findOffsets();
-			TOTKMasterEditor.focus();
-		}else{
-			TOTKMasterEditor.initialize();
-		}
-	}
-}
 
 
 
@@ -1212,25 +1291,206 @@ var MarcTooltips=function(){var n=/MSIE 8/.test(navigator.userAgent);function d(
 
 window.addEventListener('DOMContentLoaded', function(){
 	SavegameEditor.loadSettings();
+	$('#select-language').val(SavegameEditor.Settings.lang);
 	Locale.set(SavegameEditor.Settings.lang);
+
+	UI._attachEvents();
 });
 
 
+
+
+
+
+
+
+
+
 var UI=(function(sge){
-	return{
-		setSelectLanguageStatus:function(status){
-			document.getElementById('select-language').disabled=!status;	
-		},
-		translate:function(){
-			sge.refreshItemTabs();
-		},
-		toast:function(msg){
-			if(msg){
-				document.getElementById('toast-loading').innerHTML=msg;
-				document.getElementById('toast-loading').style.display='block';
+	var _attachedEvents=false;
+
+	var REFRESHABLE_TABS=['weapons','bows','shields','armors','materials','food','devices','key','horses'];
+	var tabCache;
+	var currentTab;
+	var _showTab=function (newTab){
+		currentTab=newTab;
+		$('#nav .nav-link').each(function(i, navLink){
+			if(navLink.dataset.target===newTab){
+				navLink.className='nav-link active';
+				document.getElementById('tab-'+navLink.dataset.target).style.display='block';
 			}else{
-				document.getElementById('toast-loading').style.display='none';
+				navLink.className='nav-link';
+				document.getElementById('tab-'+navLink.dataset.target).style.display='none';
 			}
+		});
+
+		if(!tabCache[newTab] && REFRESHABLE_TABS.indexOf(newTab)!==-1){
+			SavegameEditor.refreshItemTab(newTab);
+			if(newTab==='bows'){
+				SavegameEditor.refreshItemTab('arrows');
+				SavegameEditor.refreshAddArrowsButton();
+			}
+			tabCache[newTab]=true;
+		}else if(newTab==='master'){
+			if(TOTKMasterEditor.isLoaded()){
+				if(TOTKMasterEditor.forceFindOffsets)
+					TOTKMasterEditor.findOffsets();
+				TOTKMasterEditor.focus();
+			}else{
+				TOTKMasterEditor.initialize();
+			}
+		}
+	}
+
+
+
+
+
+	var _setLockScroll=function(status){
+		document.body.style.overflow=status? 'hidden':'';
+	};
+	var _closeMyModal=function(evt){
+		$(this).closest('dialog.modal').get(0).close();
+	};
+	var _showDropdown=function(dropdownMenu){
+		var offset=$(dropdownMenu.attachedTo).offset();
+		//offset.right=($(window).width() - (offset.left + $(trigger).outerWidth()));
+		$(dropdownMenu)
+			.css('top', Math.floor(offset.top + 8)+'px')
+			//.css('right', Math.floor(offset.right)+'px')
+			.css('left', Math.floor(offset.left + 8)+'px');
+	};
+
+	return{
+		_attachEvents:function(){
+			if(_attachedEvents)
+				return;
+
+			/* nav */
+			$('#toolbar button.nav-link[data-target]').on('click', function(evt){
+				_showTab(this.dataset.target);
+			});
+
+			/* modals */
+			$('button[data-dismiss="modal"]').on('click', _closeMyModal);
+
+			/* dropdowns */
+			$(document.body).on('click', function(){
+				$('.dropdown-menu').hide();
+			});
+			$(window).on('resize', function(){
+				var dropdownMenus=document.querySelectorAll('.dropdown-menu');
+				for(var i=0; i<dropdownMenus.length; i++){
+					if(dropdownMenus[i].style.display==='block')
+						_showDropdown(dropdownMenus[i]);
+				}
+			});
+
+			/* language selector */
+			$('#select-language').on('change', function(evt){
+				SavegameEditor.Settings.lang=this.value;
+				Locale.set(this.value);
+				SavegameEditor.saveSettings();	
+			});
+			_attachedEvents=true;
+		},
+		reset:function(){
+			tabCache={};
+			$('#checkbox-delete-item-warning').prop('checked', true);
+			
+			$('.completionism-actions-map, .completionism-actions-unlock').hide();
+			$('#input-radio-completionism-map, #input-radio-completionism-unlock').prop('checked', false);
+		},
+		showTab:function(newTab){
+			_showTab(newTab);
+		},
+		getCurrentTab:function(){
+			return currentTab;
+		},
+
+
+		dropdown:function(dropdownId, attachTo){
+			var dropdownMenu=document.getElementById('dropdown-'+dropdownId);
+			dropdownMenu.attachedTo=attachTo;
+			_showDropdown(dropdownMenu);
+			dropdownMenu.style.display='block';
+		},
+		toast:function(msg, id, timeoutClose){
+			var toastId='toast-'+(id || (new Date()).getTime());
+			var exists=document.getElementById(toastId);
+
+			if(exists && exists.closeTimeout){
+				window.clearTimeout(exists.closeTimeout);
+			}
+
+			var toast=exists || $('<div></div>').attr('id', toastId).addClass('toast').appendTo($('#toasts-container')).get(0);
+			if(msg)
+				$(toast).html(msg);
+			else
+				$(toast).remove();
+			
+
+			if(typeof timeoutClose==='undefined')
+				timeoutClose=3000;
+
+
+			if(msg && timeoutClose){
+				toast.closeTimeout=window.setTimeout(function(){
+					$(toast).remove();
+				}, timeoutClose)
+			}
+		},
+		octicon:function(iconId){
+			var img=new Image();
+			img.src='assets/octicons/octicon_'+iconId+'.svg'
+			img.className='octicon';
+			return img;
+		},
+		modal:function(id){
+			_setLockScroll(true);
+			
+			var dialog=document.getElementById('modal-'+id);
+			if(!dialog.initialized){
+				dialog.addEventListener('close', function(){
+					_setLockScroll(false);
+				});
+				dialog.initialized=true;
+			}
+			dialog.showModal();
+		},
+		alert:function(text){
+			$('<dialog></dialog>')
+				.addClass('modal')
+				.append($('<div></div>').addClass('modal-body text-center').html(text))
+				.append(
+					$('<div></div>')
+						.addClass('modal-footer text-center')
+						.append($('<button></button>').addClass('btn').html(_('Accept')).on('click', _closeMyModal))
+				)
+				.appendTo(document.body)
+				.on('close', function(evt){
+					$(this).remove();
+				})
+				.get(0).showModal();
+		},
+		confirm:function(text, onConfirm){
+			$('<dialog></dialog>')
+				.addClass('modal')
+				.append($('<div></div>').addClass('modal-body text-center').html(text))
+				.append(
+					$('<div></div>')
+						.addClass('modal-footer text-center')
+						.append($('<button></button>').addClass('btn').html(_('Cancel')).on('click', _closeMyModal))
+						.append($('<button></button>').addClass('btn btn-primary').html(_('Accept')).on('click', function(evt){
+							_closeMyModal(evt);
+							onConfirm.call();
+						}))
+				)
+				.appendTo(document.body)
+				.on('close', function(evt){
+					$(this).remove();
+				})
+				.get(0).showModal();
 		}
 	}
 }(SavegameEditor));
@@ -1246,4 +1506,4 @@ function getInternalCategoryId(catId){
 	
 	//else: weapon,bow,arrow,armor,material,food
 	return (catId.charAt(0).toUpperCase() + catId.substr(1)).replace(/s$/, '')
-}
+}
\ No newline at end of file
diff --git a/zelda-totk/zelda-totk.locale.js b/zelda-totk/zelda-totk.locale.js
index c047b9a..dac95c7 100644
--- a/zelda-totk/zelda-totk.locale.js
+++ b/zelda-totk/zelda-totk.locale.js
@@ -11,6 +11,10 @@ var Locale=(function(ui){
 	var _currentLocaleAlt=null;
 	var _cachedLocales={};
 
+	var _setSelectLanguageStatus=function(status){
+		if(document.getElementById('select-language'))
+			document.getElementById('select-language').disabled=!status;	
+	};
 	var _setLocale=function(langCode){
 		_currentLocale=_cachedLocales[langCode];
 		if(/_alt$/.test(langCode)){
@@ -19,9 +23,6 @@ var Locale=(function(ui){
 			_currentLocaleAlt=null;
 		}
 
-		if(ui && typeof ui.translate==='function')
-			ui.translate();
-
 		document.querySelectorAll('*[data-translate-title]')
 			.forEach(function(elem){
 				elem.setAttribute('title','');
@@ -48,20 +49,19 @@ var Locale=(function(ui){
 			}else if(VALID_LOCALES.indexOf(langCode)!==-1){
 				var langCodeAll=langCode.replace('_alt','');
 
-				ui.toast('Loading '+langCodeAll.toUpperCase()+' translation...');
-				ui.setSelectLanguageStatus(false);
+				ui.toast('Loading '+langCodeAll.toUpperCase()+' translation...', 'locale');
+				_setSelectLanguageStatus(false);
 
 				var script=document.createElement('script');
 				script.type='text/javascript';
 				script.onload=function(){
-					ui.toast(false);
-					ui.setSelectLanguageStatus(true);
+					ui.toast(false, 'locale');
+					_setSelectLanguageStatus(true);
 					_setLocale(langCode);
 				}
 				script.onerror=function(){
-					ui.toast(false);
-					ui.setSelectLanguageStatus(true);
-					alert('Unexpected error: can\'t download locale file');
+					ui.toast('Unexpected error: can\'t download locale file', 'locale');
+					_setSelectLanguageStatus(true);
 				}
 				script.src='./locale/zelda-totk.locale.'+langCodeAll+'.js';
 				document.head.appendChild(script);
@@ -71,4 +71,9 @@ var Locale=(function(ui){
 			_cachedLocales[langCode]=strings;
 		}
 	}
-}(UI));
\ No newline at end of file
+}(UI));
+
+
+function _(str){
+	return Locale._(str);
+}
\ No newline at end of file
diff --git a/zelda-totk/zelda-totk.master.js b/zelda-totk/zelda-totk.master.js
index 819da1e..a216cc0 100644
--- a/zelda-totk/zelda-totk.master.js
+++ b/zelda-totk/zelda-totk.master.js
@@ -1,5 +1,5 @@
 /*
-	The legend of Zelda: Tears of the Kingdom - Master editor v20230615
+	The legend of Zelda: Tears of the Kingdom - Master editor v20230617
 	by Marc Robledo 2023	
 	
 	thanks to the immeasurable work, hash crack and research of MacSpazzy, MrCheeze and Karlos007
@@ -13,6 +13,8 @@ var TOTKMasterEditor=(function(){
 	var allHashes=[];
 	var filteredHashes;
 
+	var currentMini;
+
 	var _parseHashFile=function(responseText){
 		var enumValues=[];
 		var lines=responseText.split('\n');
@@ -22,7 +24,7 @@ var TOTKMasterEditor=(function(){
 				var data=lines[i].split(';');
 				var matches=data[1].split(',');
 				var options=data[2].split(',').map(function(value){
-					return {value:murmurHash3.x86.hash32(value), name:value};
+					return {value:hash(value), name:value};
 				});
 				for(var j=0; j<matches.length; j++){
 					enumValues.push({
@@ -49,8 +51,8 @@ var TOTKMasterEditor=(function(){
 				hashes.push({
 					hash:hashInt,
 					hashHex:data[0],
+					hashText:data[2],
 					type:data[1],
-					id:data[2],
 					enumValues:options
 				});
 				allHashes.push(hashInt);
@@ -58,6 +60,7 @@ var TOTKMasterEditor=(function(){
 		}
 	};
 
+
 	var _setBoolean=function(){
 		tempFile.writeU32(this.offset, this.checked? 1: 0);
 	}
@@ -90,18 +93,18 @@ var TOTKMasterEditor=(function(){
 		tempFile.writeF32(this.offset, val? -val : 0); //just in case, avoid storing -0
 	}
 
-	var _createHashInputRow=function(container, hash, arrayIndex){
+	var _createHashInputRow=function(container, hashInfo, arrayIndex){
 		var tr=document.createElement('tr');
 		tr.appendChild(document.createElement('td'));
 		tr.appendChild(document.createElement('td'));
 
-		var offset=hash.offset;
+		var offset=hashInfo.offset;
 		if(!offset)
 			return;
 
-		var hashType=hash.type;
+		var hashType=hashInfo.type;
 		if(/String|Vector|Array/.test(hashType)){
-			offset=tempFile.readU32(hash.offset);
+			offset=tempFile.readU32(hashInfo.offset);
 			
 			if(/Array$/.test(hashType)){
 				if(typeof arrayIndex==='number'){
@@ -122,17 +125,18 @@ var TOTKMasterEditor=(function(){
 				}else{
 					var len=tempFile.readU32(offset);
 					for(var i=0; i<len; i++){
-						_createHashInputRow(container, hash, i);
+						_createHashInputRow(container, hashInfo, i);
 					}
 					return;
 				}
 			}
 		}
 
-		var fieldId=hash.hashHex+(typeof arrayIndex==='number'? '_'+arrayIndex:'');
+		var fieldId=hashInfo.hashHex+(typeof arrayIndex==='number'? '_'+arrayIndex:'');
+		var hashLabel=hashInfo.label || hashInfo.hashText;
 
-		tr.children[0].appendChild(label(fieldId, hash.id+(typeof arrayIndex==='number'? ' ['+arrayIndex+']':'')));
-		tr.children[0].title='Hash: '+hash.hashHex+' - Offset: '+SavegameEditor._toHexInt(hash.offset);
+		tr.children[0].appendChild(label(fieldId, hashLabel+(typeof arrayIndex==='number'? ' ['+arrayIndex+']':'')));
+		tr.children[0].title='Hash: '+hashInfo.hashHex+' - Offset: '+SavegameEditor._toHexInt(hashInfo.offset);
 		tr.children[1].className='text-right';
 
 
@@ -159,12 +163,12 @@ var TOTKMasterEditor=(function(){
 				field.className='text-right';
 				field.offset=offset;
 				field.arrayIndex=arrayIndex;
-				field.addEventListener('change', _setS32);
+				field.addEventListener('change',_setS32);
 			}
 
 			tr.children[1].appendChild(field);
-		}else if(hashType==='Enum' && hash.enumValues){
-			var field=select(fieldId, hash.enumValues, null, tempFile.readU32(offset));
+		}else if(hashType==='Enum' && hashInfo.enumValues){
+			var field=select(fieldId, hashInfo.enumValues, null, tempFile.readU32(offset));
 			field.offset=offset;
 			field.arrayIndex=arrayIndex;
 			field.addEventListener('change', _setU32);
@@ -270,7 +274,7 @@ var TOTKMasterEditor=(function(){
 				hashes[i].offset=offsets[hashes[i].hash];
 
 				/*if(hashes[i].offset){
-					debugText+=hashes[i].hashHex+';'+hashes[i].type+';'+hashes[i].id;
+					debugText+=hashes[i].hashHex+';'+hashes[i].type+';'+hashes[i].hashText;
 					if(hashes[i].enumValues)
 						debugText+=';'+hashes[i].enumValues.map(function(a){return a.name}).join(',');
 					debugText+='\n<br/>';
@@ -320,7 +324,7 @@ var TOTKMasterEditor=(function(){
 
 			if(regexFilter){
 				filteredHashes=hashes.filter(function(a){
-					return regexFilter.test(a.id);
+					return regexFilter.test(a.hashText);
 				});
 			}else{
 				filteredHashes=hashes;
@@ -348,10 +352,11 @@ var TOTKMasterEditor=(function(){
 				var paginatedHashes=filteredHashes.slice(this.currentPage*HASHES_PER_PAGE, HASHES_PER_PAGE+this.currentPage*HASHES_PER_PAGE);
 				empty('table');
 				var container=document.createElement('tbody');
-				for(var i=0; i<paginatedHashes.length; i++){
-					var hash=paginatedHashes[i];
 
-					_createHashInputRow(container, hash, null);
+				for(var i=0; i<paginatedHashes.length; i++){
+					var hashInfo=paginatedHashes[i];
+
+					_createHashInputRow(container, hashInfo, null);
 				}
 				window.requestAnimationFrame(function(){get('table').appendChild(container)});;
 			}			
@@ -370,6 +375,99 @@ var TOTKMasterEditor=(function(){
 			}else{
 				this.filterHashes(null);
 			}
+		},
+
+
+
+
+
+
+
+		mini:function(struct, buttons, modalTitle, onSave){
+			currentMini={
+				struct:struct,
+				onSave:onSave,
+			};
+
+			var container=$('#modal-hash-editor-body').empty();
+			struct.buildHtmlInputRows().forEach(function(row){
+				container.append(row);
+			});
+
+			$('#modal-hash-editor-footer-right').empty();
+
+			$('#modal-hash-editor-footer-right')
+				.append(
+					$('<button></button>')
+						.addClass('btn')
+						.html(Locale._('Cancel'))
+						.on('click', function(){
+							$(this).parent().parent().parent().get(0).close();
+						})
+				)
+			if(buttons){
+				if(!buttons.length)
+					buttons=[buttons];
+
+				for(var i=0; i<buttons.length; i++){
+					$('#modal-hash-editor-footer-right')
+						.append(
+							$('<button></button>')
+								.addClass('btn')
+								.html(Locale._(buttons[i].label))
+								.on('click', buttons[i].action)
+						);
+				}
+			}
+			$('#modal-hash-editor-footer-right')
+				.append(
+					$('<button></button>')
+						.html(Locale._('Save'))
+						.addClass('btn btn-primary')
+						.on('click', function(){
+							currentMini.struct.saveAll();
+							if(currentMini.onSave)
+								currentMini.onSave.call();
+							$(this).parent().parent().parent().get(0).close();
+						})
+				);
+
+			$('#modal-hash-editor-header').html(modalTitle)
+			UI.modal('hash-editor');
+		},
+		miniResetAll:function(){
+			var nChanges=0;
+			currentMini.struct.variables.forEach(function(variable){
+				if(variable._structId)
+					return false;
+				if(variable.value!==0){
+					variable.value=0;
+					variable.updateHtmlInputValue();
+					nChanges++;
+				}
+			});
+			return nChanges;
+		},
+		miniSetAllToOneAtLeast:function(){
+			var nChanges=0;
+			currentMini.struct.variables.forEach(function(variable){
+				if(variable._structId)
+					return false;
+				if(variable.value===0){
+					variable.value=1;
+					variable.updateHtmlInputValue();
+					nChanges++;
+				}
+			});
+			return nChanges;
+		},
+		miniExport:function(){
+			var myJson=currentMini.struct.export();
+			var blob = new Blob([JSON.stringify(myJson, null, '\t')], {type: 'application/json;charset=utf-8'});
+			saveAs(blob, 'totk_'+currentMini.struct._structId+'.json');
+		},
+		miniImport:function(importedObject){
+			return currentMini.struct.import(importedObject);
 		}
 	}
 }());
\ No newline at end of file
diff --git a/zelda-totk/zelda-totk.variables.js b/zelda-totk/zelda-totk.variables.js
new file mode 100644
index 0000000..0e385f1
--- /dev/null
+++ b/zelda-totk/zelda-totk.variables.js
@@ -0,0 +1,699 @@
+/*
+	The legend of Zelda: Tears of the Kingdom savegame editor - variable reader/writer (last update 2023-07-08)
+	by Marc Robledo 2023
+*/
+
+
+
+const RAW_COORDINATES_TRANSFORM=true;
+
+
+function Struct(structId, variablesInfo, structArray){
+	this._structId=structId;
+	this._originalStructData=variablesInfo;
+	this.variables=[];
+
+	for(var i=0; i<variablesInfo.length; i++){
+		if(typeof variablesInfo[i].structArray==='string' && typeof variablesInfo[i].variablesInfo==='object'){
+			this.variables.push(new Struct(variablesInfo[i].structArray, variablesInfo[i].variablesInfo, true));
+		}else{
+			var variable=new Variable(variablesInfo[i].hash, variablesInfo[i].type, variablesInfo[i].enumValues);
+			if(structArray && !variable.isArray()){
+				throw new Error('Struct array variable['+i+'] is not an Array');
+			}
+			if(variablesInfo[i].label)
+				variable.setLabel(variablesInfo[i].label);
+			this.variables.push(variable);
+		}
+	}
+}
+Struct.prototype.buildHtmlInputRows=function(autosave){
+	var inputRows=[];
+	for(var i=0; i<this.variables.length; i++){
+		var variableInputRows;
+		if(this.variables[i]._structId){
+			variableInputRows=this.variables[i].buildHtmlInputRows(autosave).sort(function(a,b){
+				return a.arrayIndex - b.arrayIndex;
+			});
+		}else{
+			variableInputRows=this.variables[i].buildHtmlInputs(autosave, true);
+		}
+		inputRows=inputRows.concat(variableInputRows);
+	}
+
+	return inputRows;
+}
+Struct.prototype.saveAll=function(){
+	for(var i=0; i<this.variables.length; i++){
+		if(this.variables[i]._structId){
+			this.variables[i].saveAll();
+		}else{
+			this.variables[i].save();
+		}
+	}
+}
+Struct.prototype.export=function(arrayIndex){
+	var jsonObject={totkStruct:this._structId};
+
+	for(var i=0; i<this.variables.length; i++){
+		var propertyName;
+		if(this.variables[i]._structId)
+			propertyName=this.variables[i]._structId;
+		else if(typeof this._originalStructData[i].propertyName==='string')
+			propertyName=this._originalStructData[i].propertyName;
+		else if(typeof this._originalStructData[i].hash==='string')
+			propertyName=this._originalStructData[i].hash;
+		else
+			throw new Error('invalid JSON object property name while exporting');
+
+		if(this.variables[i]._structId){
+			var arrayLen=this.variables[i].variables[0].value.length;
+			var objs=new Array(arrayLen);
+			for(var j=0; j<arrayLen; j++){
+				objs[j]={};
+				for(var k=0; k<this.variables[i].variables.length; k++){
+					var propertyName2;
+					if(this.variables[i].variables[k]._structId)
+						propertyName2=this.variables[i].variables[k]._structId;
+					else if(typeof this.variables[i]._originalStructData[k].propertyName==='string')
+						propertyName2=this.variables[i]._originalStructData[k].propertyName;
+					else if(typeof this.variables[i]._originalStructData[k].hash==='string')
+						propertyName2=this.variables[i]._originalStructData[k].hash;
+					else
+						throw new Error('invalid JSON object property name while exporting');
+					if(this.variables[i].variables[k]._structId){
+						objs[j][propertyName2]=this.variables[i].variables[k].export();
+					}else{
+		
+						if(typeof this.variables[i]._originalStructData[k].arrayPartitionSize==='number'){
+							var arrayPartitionSize=this.variables[i]._originalStructData[k].arrayPartitionSize;
+							if(arrayPartitionSize<2 || this.variables[i].variables[0].value.length%arrayPartitionSize!==0){
+								throw new Error('Invalid arrayPartitionSize for '+this.variables[i].variablesInfo[k].propertyName);
+							}
+							objs[j][propertyName2]=(this.variables[i].variables[k].export()).slice(j*arrayPartitionSize, j*arrayPartitionSize + arrayPartitionSize);
+						}else{
+							objs[j][propertyName2]=(this.variables[i].variables[k].export())[j];
+						}
+					}
+				}
+			}
+			jsonObject[propertyName]=objs;
+		}else{
+			jsonObject[propertyName]=this.variables[i].export();
+		}
+	}
+	return jsonObject;
+}
+Struct.prototype.import=function(jsonObject){
+	if(this._structId !== jsonObject.totkStruct)
+		throw new Error('Struct ids don\'t match');
+
+	var nChanges=0;
+
+	for(var i=0; i<this.variables.length; i++){
+		var propertyName;
+		if(this.variables[i]._structId)
+			propertyName=this.variables[i]._structId;
+		else if(typeof this._originalStructData[i].propertyName==='string')
+			propertyName=this._originalStructData[i].propertyName;
+		else if(typeof this._originalStructData[i].hash==='string')
+			propertyName=this._originalStructData[i].hash;
+		else
+			throw new Error('invalid JSON object property name while importing');
+
+		if(typeof jsonObject[propertyName] === 'undefined'/* || (typeof jsonObject[propertyName]!==typeof this.variables[i].value && this.variables[i].type!=='Enum')*/)
+			continue;
+
+		if(this.variables[i]._structId){
+			nChanges+=this.variables[i].import(jsonObject[propertyName]);
+		}else{
+			var newValue=this.variables[i].type==='Enum' && typeof this.variables[i].value==='string'? hash() : this.variables[i].value;
+			var changed=(this.variables[i].value !== jsonObject[propertyName]);
+			this.variables[i].value=jsonObject[propertyName];
+			if(changed){
+				nChanges++;
+				this.variables[i].updateHtmlInputValue();
+			}
+		}
+	}
+
+	return nChanges;
+}
+
+function Variable(hashText, type, enumValues){
+	if(typeof hashText==='string'){
+		this.hash=hash(hashText);
+		this.hashHex=Variable.toHexString(this.hash);
+		this.hashText=hashText;
+	}else if(typeof hashText==='number'){
+		this.hash=(hashText & 0xffffffff) >>> 0;
+		this.hashHex=Variable.toHexString(this.hash);
+		this.hashText=this.hashHex;
+	}
+	this.setLabel(this.hashText);
+
+	this.type=type;
+	if(Variable.cachedOffsets[this.hash]){
+		this.offset=Variable.cachedOffsets[this.hash];
+	}else{
+		var offset=Variable._getHashOffset(this.hash);
+		if(this.isPointer())
+			offset=Variable._read(offset, 'UInt');
+		this.offset=Variable.cachedOffsets[this.hash]=offset;
+	}
+
+	this.enumValues=enumValues || [];
+	if(this.isEnum()){
+		this.enumValues.forEach(function(enumValue){
+			if(typeof enumValue==='string')
+				hash(enumValue);
+		});
+	}
+
+	this.read();
+}
+Variable.prototype.export=function(){
+	return this.value;
+}
+Variable.prototype.isPointer=function(){
+	return /Array|Vector|String|UInt64/.test(this.type);
+}
+Variable.prototype.isVector=function(){
+	return /Vector/.test(this.type);
+}
+Variable.prototype.isArray=function(){
+	return /Array/.test(this.type);
+}
+Variable.prototype.isEnum=function(){
+	return /Enum/.test(this.type);
+}
+Variable.prototype.getTypeSingle=function(){
+	return this.type.replace('Array','');
+}
+Variable.prototype.setLabel=function(label){
+	this.label=label;
+}
+Variable.prototype.read=function(){
+	if(!this.isArray()){
+		this.value=Variable._read(this.offset, this.type);
+	}else{
+		var typeSingle=this.getTypeSingle();
+		var typeSize=Variable.getVariableSize(typeSingle);
+		var offset=this.offset + 4;
+		var maxLen=Variable._read(this.offset, 'UInt');
+		this.value=new Array(maxLen);
+		for(var i=0; i<maxLen && i<this.value.length; i++){
+			this.value[i]=Variable._read(offset, typeSingle);
+			offset+=typeSize;
+		}
+	}
+}
+Variable.prototype.secondsToTime=function(){
+	var seconds=this.value%60;
+	if(seconds<10) seconds='0'+seconds;
+	var minutes=parseInt(this.value/60)%60;
+	if(minutes<10) minutes='0'+minutes;
+	return {
+		hours: parseInt(this.value/3600),
+		minutes: minutes,
+		seconds: seconds
+	};
+}
+Variable.prototype.save=function(){
+	if(!this.isArray()){
+		Variable._save(this.offset, this.type, this.value);
+	}else{
+		var typeSingle=this.getTypeSingle();
+		var typeSize=Variable.getVariableSize(typeSingle);
+		var offset=this.offset + 4;
+		var maxLen=Variable._read(this.offset, 'UInt');
+		for(var i=0; i<maxLen && i<this.value.length; i++){
+			Variable._save(offset, typeSingle, this.value[i]);
+			offset+=typeSize;
+		}
+	}
+}
+
+
+Variable._onChangeInputNumberFix=function(evt){
+	var val=this.value.replace(/[^0-9\-\.]/g, '');
+	if(this.floatValue)
+		val=parseFloat(val);
+	else
+		val=parseInt(val);
+
+	if(isNaN(val) || val<this.minValue)
+		val=this.minValue;
+	else if(val > this.maxValue)
+		val=this.maxValue;
+
+	if(val===-0)
+		val=0; //avoid negative zero
+	this.value=val;
+
+	if(this.variable.isArray())
+		if(this.vectorCoordinate)
+			this.variable.value[this.arrayIndex][this.vectorCoordinate]=val;
+		else
+			this.variable.value[this.arrayIndex][this.vectorCoordinate]=val;
+	else
+		if(this.vectorCoordinate)
+			this.variable.value[this.vectorCoordinate]=val;
+		else
+			this.variable.value=val;
+}
+
+Variable.prototype.buildHtmlInputs=function(autosave, row){
+	var typeSingle=this.getTypeSingle();
+	var inputElements;
+	if(typeSingle==='Bool'){
+		inputElements=Variable._buildHtmlInput(this, 'checkbox', this.value, autosave);
+	}else if(typeSingle==='Int'){
+		inputElements=Variable._buildHtmlInput(this, 'integer', this.value, autosave);
+	}else if(typeSingle==='UInt'){
+		inputElements=Variable._buildHtmlInput(this, 'unsigned_integer', this.value, autosave);
+	}else if(typeSingle==='Float'){
+		inputElements=Variable._buildHtmlInput(this, 'float', this.value, autosave);
+	}else if(typeSingle==='Enum'){
+		inputElements=Variable._buildHtmlInput(this, 'select', this.value, autosave, this.enumValues);
+	}else if(typeSingle==='Vector2'){
+		inputElements=Variable._buildHtmlInput(this, 'float2', this.value, autosave);
+	}else if(typeSingle==='Vector3'){
+		inputElements=Variable._buildHtmlInput(this, 'float3', this.value, autosave);
+	}else if(typeSingle==='UInt64'){
+		inputElements=$('<span></span>').html(this.value.toString()).get(0);
+	}else if(typeSingle==='String64'){
+		inputElements=Variable._buildHtmlInput(this, 'string', this.value, autosave, this.enumValues);
+	}else if(typeSingle==='WString16'){
+		inputElements=Variable._buildHtmlInput(this, 'string', this.value, autosave);
+	}else{
+		inputElements=$('<span></span>').html('Type: '+typeSingle).get(0);
+	}
+	
+	this._htmlInputs=inputElements;
+	if(row){
+		if(!this.isArray())
+			inputElements=[inputElements];
+
+		var rows=new Array(inputElements.length);
+
+		for(var i=0; i<inputElements.length; i++){
+			var offset=this.offset;
+			var fieldId='variable_'+this.hashHex;
+			var labelText=this.label;
+			if(this.isArray()){
+				fieldId+='_'+i;
+				offset+=4 + i*Variable.getVariableSize(typeSingle);
+				labelText='<span class="mono">['+i+'] </span>'+labelText;
+			}
+
+
+			var label=$('<label></label>')
+				.html(labelText)
+				.prop('for', fieldId)
+				.prop('title', 'Hash: '+this.hashHex+' - Offset: '+Variable.toHexString(offset))
+				.get(0);
+
+			if(this.isVector()){
+				inputElements[i][0].id=fieldId;
+				$(inputElements[i]).addClass('coordinate');
+			}else{
+				inputElements[i].id=fieldId;
+			}
+
+			rows[i]=$('<div></div>')
+				.addClass('row mb-5 row-master-mini')
+				.append(label)
+				.append($('<div></div>').addClass('text-right').append(inputElements[i]))
+				.get(0);
+			rows[i].arrayIndex=i;
+		}
+
+		return this.isArray()? rows : rows[0];
+	}else{
+		return inputElements;
+	}
+}
+Variable.prototype.updateHtmlInputValue=function(){
+	if(!this._htmlInputs)
+		return false;
+
+	if(this.type==='Bool'){
+		var newValue=!!this.value;
+		if(this._htmlInputs.checked!==newValue){
+			$(this._htmlInputs).prop('checked', newValue).addClass('changed');
+			return true;
+		}else{
+			$(this._htmlInputs).removeClass('changed');
+			return false;
+		}
+	}else if(this.type==='Vector2'){
+		this._htmlInputs[0].value=this.value.x;
+		this._htmlInputs[1].value=this.value.y;
+	}else if(this.type==='Vector3'){
+		var nChanges=0;
+		var newValueX=this.value.x;
+		var newValueY=this.value.y;
+		var newValueZ=this.value.z;
+
+		if(this._htmlInputs[0].value!=newValueX){
+			$(this._htmlInputs[0]).val(newValueX).addClass('changed');
+			nChanges++;
+		}else{
+			$(this._htmlInputs[0]).removeClass('changed');
+		}
+		if(this._htmlInputs[1].value!=newValueY){
+			$(this._htmlInputs[1]).val(newValueY).addClass('changed');
+			nChanges++;
+		}else{
+			$(this._htmlInputs[1]).removeClass('changed');
+		}
+		if(this._htmlInputs[2].value!=newValueZ){
+			$(this._htmlInputs[2]).val(newValueZ).addClass('changed');
+			nChanges++;
+		}else{
+			$(this._htmlInputs[2]).removeClass('changed');
+		}
+
+		return nChanges;
+	}else{ //Int, UInt, Float, Enum, String64, WString16
+		var newValue=this.value;
+		if(this.type==='Enum' && typeof newValue==='string')
+			newValue=hash(newValue);
+
+		if(this._htmlInputs.value!=newValue){
+			$(this._htmlInputs).val(newValue).addClass('changed');
+			return true;
+		}else{
+			$(this._htmlInputs).removeClass('changed');
+			return false;
+		}
+	}
+}
+
+Variable._read=function(offset, type){
+	if(type==='Bool'){
+		return tempFile.readU32(offset);
+	}else if(type==='Int'){
+		return tempFile.readS32(offset);
+	}else if(type==='UInt'){
+		return tempFile.readU32(offset);
+	}else if(type==='Enum'){
+		var value=tempFile.readU32(offset);
+		return Variable.cachedHashesReverse[value] || value;
+	}else if(type==='Float'){
+		return tempFile.readF32(offset);
+	}else if(type==='Vector2'){
+		return {
+			x: tempFile.readF32(offset),
+			y: tempFile.readF32(offset+4)
+		};
+	}else if(type==='Vector3'){
+		if(RAW_COORDINATES_TRANSFORM){
+			return {
+				x: tempFile.readF32(offset),
+				y: -tempFile.readF32(offset+8),
+				z: tempFile.readF32(offset+4)-105
+			};
+		}else{
+			return {
+				x: tempFile.readF32(offset),
+				y: tempFile.readF32(offset+4),
+				z: tempFile.readF32(offset+8)
+			};
+		}
+	}else if(type==='UInt64'){
+		var lower=Variable.toHexString(tempFile.readU32(offset)).replace('0x','');
+		var upper=Variable.toHexString(tempFile.readU32(offset+4));
+		return BigInt(upper+lower);
+	}else if(type==='String64'){
+		return tempFile.readString(offset, 0x40);
+	}else if(type==='WString16'){
+		var str='';
+		for(var i=0; i<0x20; i+=2){
+			var charCode=tempFile.readU16(offset+i);
+			if(!charCode)
+				break;
+			str+=String.fromCharCode(charCode);
+		}
+		return str.replace(/\u0000+$/g,'');
+	}else{
+		throw new Error('Invalid variable type: '+type);
+	}
+}
+Variable._save=function(offset, type, value){
+	if(type==='Bool'){
+		tempFile.writeU32(offset, !!value? 1: 0);
+	}else if(type==='Int'){
+		tempFile.writeS32(offset, value);
+	}else if(type==='UInt'){
+		tempFile.writeU32(offset, value);
+	}else if(type==='Enum'){
+		if(typeof value==='string')
+			tempFile.writeU32(offset, hash(value));
+		else
+			tempFile.writeU32(offset, value);
+	}else if(type==='Float'){
+		tempFile.writeF32(offset, value);
+	}else if(type==='Vector2'){
+		tempFile.writeF32(offset, value.x);
+		tempFile.writeF32(offset+4, value.y);
+	}else if(type==='Vector3'){
+		if(RAW_COORDINATES_TRANSFORM){
+			tempFile.writeF32(offset, value.x);
+			tempFile.writeF32(offset+4, value.z+105);
+			tempFile.writeF32(offset+8, -value.y);
+		}else{
+			tempFile.writeF32(offset, value.x);
+			tempFile.writeF32(offset+4, value.y);
+			tempFile.writeF32(offset+8, value.z);
+		}
+	}else if(type==='UInt64' && typeof value==='bigint'){
+		var hex=value.toString(16);
+		while(hex.length<16)
+			hex='0'+hex;
+		tempFile.writeU32(offset, parseInt(hex.substr(8,8), 16));
+		tempFile.writeU32(offset+4, parseInt(hex.substr(0,8), 16));
+	}else if(type==='String64'){
+		tempFile.writeString(offset, value, Math.min(value.length+1, 0x40));
+	}else if(type==='WString16'){
+		var bytes=new Array(0x20);
+		for(var i=0; i<value.length; i++){
+			var charCode=value.charCodeAt(i);
+			bytes[i*2 + 0]=charCode & 0xff;
+			bytes[i*2 + 1]=charCode >>> 8;
+		}
+		for(i=i*2; i<bytes.length; i++){
+			bytes[i]=0;
+		}
+		tempFile.writeBytes(offset, bytes);
+	}else{
+		throw new Error('Invalid variable type: '+type);
+	}
+}
+
+Variable._buildHtmlInput=function(variable, inputType, defaultValue, autosave, enumValues, arrayIndex){
+	var input;
+	if(variable.isArray() && typeof arrayIndex!=='number'){
+		var inputs=new Array(variable.value.length);
+		for(var i=0; i<variable.value.length; i++){
+			inputs[i]=Variable._buildHtmlInput(variable, inputType, defaultValue[i], autosave, enumValues, i);
+		}
+		return inputs;
+	}else if(inputType==='checkbox'){
+		input=$('<input></input>')
+			.prop('type','checkbox')
+			.prop('checked', !!defaultValue)
+			.on('change', function(){
+				if(variable.isArray())
+					this.variable.value[arrayIndex]=this.checked;
+				else
+					this.variable.value=this.checked;
+			})
+			.get(0);
+	}else if(inputType==='integer' || inputType==='unsigned_integer'){
+		input=$('<input></input>')
+			.prop('type','text')
+			.val(defaultValue)
+			.addClass('text-right')
+			.on('change', Variable._onChangeInputNumberFix)
+			/*.on('change', function(evt){
+				if(variable.isArray())
+					this.variable.value[arrayIndex]=parseInt(this.value);
+				else
+					this.variable.value=parseInt(this.value);
+			})*/
+			.get(0);
+
+		input.floatValue=false;
+		if(inputType==='unsigned_integer'){
+			input.minValue=0;
+			input.maxValue=4294967295;
+		}else{
+			input.minValue=-2147483648;
+			input.maxValue=2147483647;
+		}
+	}else if(inputType==='float'){
+		input=$('<input></input>')
+			.prop('type','text')
+			.val(defaultValue)
+			.addClass('text-right')
+			.on('change', Variable._onChangeInputNumberFix)
+			/*.on('change', function(evt){
+				if(variable.isArray())
+					if(typeof enumValues==='string')
+						this.variable.value[arrayIndex][enumValues]=parseFloat(this.value);
+					else
+						this.variable.value[arrayIndex]=parseFloat(this.value);
+				else
+					if(typeof enumValues==='string')
+						this.variable.value[enumValues]=parseFloat(this.value);
+					else
+						this.variable.value=parseFloat(this.value);
+
+			})*/
+			.get(0);
+
+		input.floatValue=true;
+		if(enumValues)
+			input.vectorCoordinate=enumValues;
+		input.minValue=-2147483648;
+		input.maxValue=2147483647;
+	}else if(inputType==='float2'){
+		input=[
+			Variable._buildHtmlInput(variable, 'float', defaultValue.x, autosave, 'x', arrayIndex),
+			Variable._buildHtmlInput(variable, 'float', defaultValue.y, autosave, 'y', arrayIndex)
+		];
+	}else if(inputType==='float3'){
+		input=[
+			Variable._buildHtmlInput(variable, 'float', defaultValue.x, autosave, 'x', arrayIndex),
+			Variable._buildHtmlInput(variable, 'float', defaultValue.y, autosave, 'y', arrayIndex),
+			Variable._buildHtmlInput(variable, 'float', defaultValue.z, autosave, 'z', arrayIndex)
+		];
+	}else if(inputType==='select'){
+		input=$('<select></select>')
+			.val(this.value)
+			.on('change', function(){
+				if(variable.isArray())
+					this.variable.value[arrayIndex]=this.value;
+				else
+					this.variable.value=this.value;
+			})
+			.get(0);
+
+		var found=false;
+		if(enumValues){
+			for(var i=0; i<enumValues.length; i++){
+				if(enumValues[i]===defaultValue)
+					found=true;
+				input.appendChild(
+					$('<option></option>').val(hash(enumValues[i])).html(enumValues[i]).get(0)
+				);
+			}
+		}
+		if(!found){
+			input.appendChild(
+				$('<option></option>').val(defaultValue).html('['+Variable.toHexString(defaultValue)+']').get(0)
+			);
+		}
+		input.value=typeof defaultValue==='string'? hash(defaultValue) : defaultValue;
+	}else if(inputType==='text'){
+		//to-do
+	}else{
+		throw new Error('Invalid HTML input type');
+	}
+
+	input.variable=variable;
+	input.arrayIndex=arrayIndex;
+	if(autosave){
+		$(input).on('change', function(){
+			this.variable.save();
+		});
+	}
+
+	return input;
+}
+Variable.getVariableSize=function(type){
+	if(type==='Bool' || type==='Int' || type==='UInt' || type==='Enum' || type==='Float'){
+		return 4;
+	}else if(type==='Vector2' || type==='UInt64'){
+		return 8;
+	}else if(type==='Vector3'){
+		return 12;
+	}else if(type==='String64'){
+		return 0x40;
+	}else if(type==='WString16'){
+		return 0x20;
+	}else{
+		throw new Error('Invalid array type: '+type);
+	}
+};
+Variable.getArraySize=function(hash){
+	var offset=tempFile.readU32(Variable._getHashOffset(hash));
+	return tempFile.readU32(offset)
+};
+Variable._getHashOffset=function(hashInt){
+	if(typeof hashInt==='string')
+		hashInt=hash(hashInt);
+	else if(typeof hashInt!=='number')
+		throw new Error('Invalid integer hash passed to Variable._getHashOffset');
+
+	if(Variable.cachedOffsets[hashInt])
+		return Variable.cachedOffsets[hashInt];
+
+	for(var i=0x000028; i<0x03c800; i+=8){
+		var currentHash=tempFile.readU32(i);
+		if(currentHash===hashInt){
+			return i+4;
+		}else if(hashInt===0xa3db7114){ //found MetaData.SaveTypeHash
+			break;
+		}
+	}
+	throw new Error('Hash '+Variable.toHexString(hashInt)+' not found');
+};
+Variable.toHexString=function(u32){
+	var str=u32.toString(16);
+	while(str.length<8)
+		str='0'+str;
+	return '0x'+str;
+};
+Variable.enumToInt=function(param, defaultValue){
+	if(typeof param==='string')
+		return hash(param);
+	else if(typeof param==='number')
+		return param;
+	return Variable.enumToInt(defaultValue || 'None');
+};
+Variable.enumToString=function(param){
+	if(typeof param==='number'){
+		try{
+			return hashReverse(param);
+		}catch(err){
+		}
+	}
+	return param;
+};
+
+
+Variable.cachedOffsets={};
+Variable.resetCache=function(){
+	Variable.cachedOffsets={};
+};
+
+
+
+Variable.cachedHashes={};
+Variable.cachedHashesReverse={};
+function hash(hashText){
+	if(!Variable.cachedHashes[hashText]){
+		var hashedEnumValue=murmurHash3.x86.hash32(hashText);
+		Variable.cachedHashes[hashText]=hashedEnumValue;
+		Variable.cachedHashesReverse[hashedEnumValue]=hashText;
+	}
+	return Variable.cachedHashes[hashText];
+}
+function hashReverse(hash){
+	if(Variable.cachedHashesReverse[hash])
+		return Variable.cachedHashesReverse[hash];
+	throw new Error('Hash '+Variable.toHexString(hash)+' has no precalculated reverse hash');
+}
\ No newline at end of file