diff --git a/src/main/java/io/github/magicquartz/environmentalarmor/armor/Materials.java b/src/main/java/io/github/magicquartz/environmentalarmor/armor/Materials.java
index 637e1a0..059a577 100644
--- a/src/main/java/io/github/magicquartz/environmentalarmor/armor/Materials.java
+++ b/src/main/java/io/github/magicquartz/environmentalarmor/armor/Materials.java
@@ -21,7 +21,8 @@ public class Materials {
 	public static final RegistryEntry<ArmorMaterial> WATER_GLASS;
 	public static final RegistryEntry<ArmorMaterial> GLASSES;
 	public static final RegistryEntry<ArmorMaterial> TITANIUM;
-	public static final RegistryEntry<ArmorMaterial> TITANIUM_COATED;
+	public static final RegistryEntry<ArmorMaterial> TITANIUM_COATED_GLASS;
+	public static final RegistryEntry<ArmorMaterial> TITANIUM_COATED_WATER_GLASS;
 	
 	static {
 		GLASS = Registry.registerReference(Registries.ARMOR_MATERIAL, Main.identifier("glass"), new ArmorMaterial(Util.make(new EnumMap(ArmorItem.Type.class), (map) -> {
@@ -37,7 +38,7 @@ public class Materials {
 			map.put(ArmorItem.Type.CHESTPLATE, 1);
 			map.put(ArmorItem.Type.HELMET, 1);
 			map.put(ArmorItem.Type.BODY, 1);
-		}), 0, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, () -> Ingredient.ofItems(Items.GLASS), List.of(new ArmorMaterial.Layer(Main.identifier("water_glass"))), 1, 2));
+		}), 0, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, () -> Ingredient.ofItems(Items.GLASS), List.of(new ArmorMaterial.Layer(Main.identifier("water_glass"))), 1, 0));
 		GLASSES = Registry.registerReference(Registries.ARMOR_MATERIAL, Main.identifier("glasses"), new ArmorMaterial(Util.make(new EnumMap(ArmorItem.Type.class), (map) -> {
 			map.put(ArmorItem.Type.BOOTS, 1);
 			map.put(ArmorItem.Type.LEGGINGS, 1);
@@ -51,13 +52,20 @@ public class Materials {
 			map.put(ArmorItem.Type.CHESTPLATE, 5);
 			map.put(ArmorItem.Type.HELMET, 2);
 			map.put(ArmorItem.Type.BODY, 4);
-		}), 10, SoundEvents.ITEM_ARMOR_EQUIP_CHAIN, () -> Ingredient.ofItems(ModItems.TITANIUM_INGOT), List.of(new ArmorMaterial.Layer(Main.identifier("titanium"))), 4F, 0.5F));
-		TITANIUM_COATED = Registry.registerReference(Registries.ARMOR_MATERIAL, Main.identifier("titanium_coated_glass"), new ArmorMaterial(Util.make(new EnumMap(ArmorItem.Type.class), (map) -> {
+		}), 10, SoundEvents.ITEM_ARMOR_EQUIP_CHAIN, () -> Ingredient.ofItems(ModItems.TITANIUM_INGOT), List.of(new ArmorMaterial.Layer(Main.identifier("titanium"))), 4F, 0.25F));
+		TITANIUM_COATED_GLASS = Registry.registerReference(Registries.ARMOR_MATERIAL, Main.identifier("titanium_coated_glass"), new ArmorMaterial(Util.make(new EnumMap(ArmorItem.Type.class), (map) -> {
 			map.put(ArmorItem.Type.BOOTS, 2);
 			map.put(ArmorItem.Type.LEGGINGS, 2);
 			map.put(ArmorItem.Type.CHESTPLATE, 2);
 			map.put(ArmorItem.Type.HELMET, 2);
 			map.put(ArmorItem.Type.BODY, 2);
 		}), 0, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, () -> Ingredient.ofItems(ModItems.TITANIUM_INGOT), List.of(new ArmorMaterial.Layer(Main.identifier("titanium_coated_glass"))), 1, 0));
+		TITANIUM_COATED_WATER_GLASS = Registry.registerReference(Registries.ARMOR_MATERIAL, Main.identifier("titanium_coated_water_glass"), new ArmorMaterial(Util.make(new EnumMap(ArmorItem.Type.class), (map) -> {
+			map.put(ArmorItem.Type.BOOTS, 2);
+			map.put(ArmorItem.Type.LEGGINGS, 2);
+			map.put(ArmorItem.Type.CHESTPLATE, 2);
+			map.put(ArmorItem.Type.HELMET, 2);
+			map.put(ArmorItem.Type.BODY, 2);
+		}), 0, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, () -> Ingredient.ofItems(ModItems.TITANIUM_INGOT), List.of(new ArmorMaterial.Layer(Main.identifier("titanium_coated_water_glass"))), 1, 0));
 	}
 }
diff --git a/src/main/java/io/github/magicquartz/environmentalarmor/mixin/BrewingRecipeRegistryMixin.java b/src/main/java/io/github/magicquartz/environmentalarmor/mixin/BrewingRecipeRegistryMixin.java
index 317ce62..f491b42 100644
--- a/src/main/java/io/github/magicquartz/environmentalarmor/mixin/BrewingRecipeRegistryMixin.java
+++ b/src/main/java/io/github/magicquartz/environmentalarmor/mixin/BrewingRecipeRegistryMixin.java
@@ -1,6 +1,7 @@
 package io.github.magicquartz.environmentalarmor.mixin;
 
 import io.github.magicquartz.environmentalarmor.registry.ModEffects;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.item.Items;
 import net.minecraft.potion.Potions;
 import net.minecraft.recipe.BrewingRecipeRegistry;
@@ -14,7 +15,9 @@ public class BrewingRecipeRegistryMixin {
 
     @Inject(method = "registerDefaults", at = @At("HEAD"))
     private static void addPotionRecipes(BrewingRecipeRegistry.Builder builder, CallbackInfo ci) {
-        builder.registerPotionRecipe(Potions.AWKWARD, Items.TURTLE_SCUTE, ModEffects.WATER_RESISTANCE_POTION_SHORT);
-        builder.registerPotionRecipe(ModEffects.WATER_RESISTANCE_POTION_SHORT, Items.REDSTONE, ModEffects.WATER_RESISTANCE_POTION_LONG);
+        if(!FabricLoader.getInstance().isModLoaded("hwr")) {
+            builder.registerPotionRecipe(Potions.AWKWARD, Items.TURTLE_SCUTE, ModEffects.WATER_RESISTANCE_POTION_SHORT);
+            builder.registerPotionRecipe(ModEffects.WATER_RESISTANCE_POTION_SHORT, Items.REDSTONE, ModEffects.WATER_RESISTANCE_POTION_LONG);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/io/github/magicquartz/environmentalarmor/registry/ModArmor.java b/src/main/java/io/github/magicquartz/environmentalarmor/registry/ModArmor.java
index e441a47..2a8ed54 100644
--- a/src/main/java/io/github/magicquartz/environmentalarmor/registry/ModArmor.java
+++ b/src/main/java/io/github/magicquartz/environmentalarmor/registry/ModArmor.java
@@ -17,8 +17,8 @@ public class ModArmor {
     public static final Item GLASSES = new ArmorItem(Materials.GLASSES, ArmorItem.Type.HELMET, new Item.Settings().rarity(Rarity.COMMON).maxDamage(ArmorItem.Type.HELMET.getMaxDamage(5)));
 
     //Titanium Coated
-    public static final Item TITANIUM_COATED_GLASS_HELMET = new ArmorItem(Materials.TITANIUM_COATED, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(165)));
-    public static final Item TITANIUM_COATED_WATER_GLASS_BOWL = new ArmorItem(Materials.TITANIUM_COATED, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(165)));
+    public static final Item TITANIUM_COATED_GLASS_HELMET = new ArmorItem(Materials.TITANIUM_COATED_GLASS, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(15)));
+    public static final Item TITANIUM_COATED_WATER_GLASS_BOWL = new ArmorItem(Materials.TITANIUM_COATED_WATER_GLASS, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(15)));
 
     // Titanium armor
     public static final Item TITANIUM_HELMET = new ArmorItem(Materials.TITANIUM, ArmorItem.Type.HELMET, new Item.Settings().maxDamage(ArmorItem.Type.HELMET.getMaxDamage(30)));
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots.json b/src/main/resources/assets/enva/models/item/titanium_boots.json
index 183baf1..f79604b 100644
--- a/src/main/resources/assets/enva/models/item/titanium_boots.json
+++ b/src/main/resources/assets/enva/models/item/titanium_boots.json
@@ -1,5 +1,67 @@
 {
   "parent": "item/generated",
+  "overrides": [
+    {
+      "model": "enva:item/titanium_boots_quartz_trim",
+      "predicate": {
+        "trim_type": 0.1
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_iron_trim",
+      "predicate": {
+        "trim_type": 0.2
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_netherite_trim",
+      "predicate": {
+        "trim_type": 0.3
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_redstone_trim",
+      "predicate": {
+        "trim_type": 0.4
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_copper_trim",
+      "predicate": {
+        "trim_type": 0.5
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_gold_trim",
+      "predicate": {
+        "trim_type": 0.6
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_emerald_trim",
+      "predicate": {
+        "trim_type": 0.7
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_diamond_trim",
+      "predicate": {
+        "trim_type": 0.8
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_lapis_trim",
+      "predicate": {
+        "trim_type": 0.9
+      }
+    },
+    {
+      "model": "enva:item/titanium_boots_amethyst_trim",
+      "predicate": {
+        "trim_type": 1.0
+      }
+    }
+  ],
   "textures": {
     "layer0": "enva:item/titanium_boots"
   }
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_amethyst_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_amethyst_trim.json
new file mode 100644
index 0000000..6dc8b5b
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_amethyst_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_amethyst"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_copper_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_copper_trim.json
new file mode 100644
index 0000000..596af19
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_copper_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_copper"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_diamond_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_diamond_trim.json
new file mode 100644
index 0000000..3c3d08d
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_diamond_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_diamond"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_emerald_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_emerald_trim.json
new file mode 100644
index 0000000..86a1934
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_emerald_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_emerald"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_gold_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_gold_trim.json
new file mode 100644
index 0000000..66efb83
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_gold_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_gold"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_iron_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_iron_trim.json
new file mode 100644
index 0000000..a3bc073
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_iron_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_iron"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_lapis_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_lapis_trim.json
new file mode 100644
index 0000000..a36c353
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_lapis_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_lapis"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_netherite_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_netherite_trim.json
new file mode 100644
index 0000000..e5a9792
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_netherite_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_netherite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_quartz_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_quartz_trim.json
new file mode 100644
index 0000000..efa2869
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_quartz_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_quartz"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_boots_redstone_trim.json b/src/main/resources/assets/enva/models/item/titanium_boots_redstone_trim.json
new file mode 100644
index 0000000..486c8d3
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_boots_redstone_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_boots",
+    "layer1": "minecraft:trims/items/boots_trim_redstone"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate.json b/src/main/resources/assets/enva/models/item/titanium_chestplate.json
index c2c7741..d6eb8f2 100644
--- a/src/main/resources/assets/enva/models/item/titanium_chestplate.json
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate.json
@@ -1,5 +1,67 @@
 {
   "parent": "item/generated",
+  "overrides": [
+    {
+      "model": "enva:item/titanium_chestplate_quartz_trim",
+      "predicate": {
+        "trim_type": 0.1
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_iron_trim",
+      "predicate": {
+        "trim_type": 0.2
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_netherite_trim",
+      "predicate": {
+        "trim_type": 0.3
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_redstone_trim",
+      "predicate": {
+        "trim_type": 0.4
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_copper_trim",
+      "predicate": {
+        "trim_type": 0.5
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_gold_trim",
+      "predicate": {
+        "trim_type": 0.6
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_emerald_trim",
+      "predicate": {
+        "trim_type": 0.7
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_diamond_trim",
+      "predicate": {
+        "trim_type": 0.8
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_lapis_trim",
+      "predicate": {
+        "trim_type": 0.9
+      }
+    },
+    {
+      "model": "enva:item/titanium_chestplate_amethyst_trim",
+      "predicate": {
+        "trim_type": 1.0
+      }
+    }
+  ],
   "textures": {
     "layer0": "enva:item/titanium_chestplate"
   }
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_amethyst_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_amethyst_trim.json
new file mode 100644
index 0000000..3887715
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_amethyst_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_amethyst"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_copper_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_copper_trim.json
new file mode 100644
index 0000000..99d3360
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_copper_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_copper"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_diamond_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_diamond_trim.json
new file mode 100644
index 0000000..4546e9f
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_diamond_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_diamond"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_emerald_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_emerald_trim.json
new file mode 100644
index 0000000..b2c60ad
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_emerald_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_emerald"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_gold_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_gold_trim.json
new file mode 100644
index 0000000..b845634
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_gold_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_gold"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_iron_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_iron_trim.json
new file mode 100644
index 0000000..9dbf404
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_iron_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_iron"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_lapis_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_lapis_trim.json
new file mode 100644
index 0000000..76c4516
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_lapis_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_lapis"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_netherite_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_netherite_trim.json
new file mode 100644
index 0000000..9f9f8d2
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_netherite_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_netherite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_quartz_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_quartz_trim.json
new file mode 100644
index 0000000..75ac6a5
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_quartz_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_quartz"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_chestplate_redstone_trim.json b/src/main/resources/assets/enva/models/item/titanium_chestplate_redstone_trim.json
new file mode 100644
index 0000000..058661f
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_chestplate_redstone_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_redstone"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet.json b/src/main/resources/assets/enva/models/item/titanium_helmet.json
index f7c57b2..ac6d945 100644
--- a/src/main/resources/assets/enva/models/item/titanium_helmet.json
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet.json
@@ -1,5 +1,67 @@
 {
   "parent": "item/generated",
+  "overrides": [
+    {
+      "model": "enva:item/titanium_helmet_quartz_trim",
+      "predicate": {
+        "trim_type": 0.1
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_iron_trim",
+      "predicate": {
+        "trim_type": 0.2
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_netherite_trim",
+      "predicate": {
+        "trim_type": 0.3
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_redstone_trim",
+      "predicate": {
+        "trim_type": 0.4
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_copper_trim",
+      "predicate": {
+        "trim_type": 0.5
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_gold_trim",
+      "predicate": {
+        "trim_type": 0.6
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_emerald_trim",
+      "predicate": {
+        "trim_type": 0.7
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_diamond_trim",
+      "predicate": {
+        "trim_type": 0.8
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_lapis_trim",
+      "predicate": {
+        "trim_type": 0.9
+      }
+    },
+    {
+      "model": "enva:item/titanium_helmet_amethyst_trim",
+      "predicate": {
+        "trim_type": 1.0
+      }
+    }
+  ],
   "textures": {
     "layer0": "enva:item/titanium_helmet"
   }
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_amethyst_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_amethyst_trim.json
new file mode 100644
index 0000000..27e4ab6
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_amethyst_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_amethyst"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_copper_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_copper_trim.json
new file mode 100644
index 0000000..a914fa8
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_copper_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_copper"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_diamond_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_diamond_trim.json
new file mode 100644
index 0000000..46ceba3
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_diamond_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_diamond"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_emerald_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_emerald_trim.json
new file mode 100644
index 0000000..a45a9d8
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_emerald_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_emerald"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_gold_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_gold_trim.json
new file mode 100644
index 0000000..9cb17d5
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_gold_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_gold"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_iron_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_iron_trim.json
new file mode 100644
index 0000000..48bfb14
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_iron_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_iron"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_lapis_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_lapis_trim.json
new file mode 100644
index 0000000..48bb18a
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_lapis_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_lapis"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_netherite_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_netherite_trim.json
new file mode 100644
index 0000000..d8a20cf
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_netherite_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_netherite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_quartz_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_quartz_trim.json
new file mode 100644
index 0000000..32e44a2
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_quartz_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_quartz"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_helmet_redstone_trim.json b/src/main/resources/assets/enva/models/item/titanium_helmet_redstone_trim.json
new file mode 100644
index 0000000..1e31a4e
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_helmet_redstone_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_redstone"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings.json b/src/main/resources/assets/enva/models/item/titanium_leggings.json
index fbd4943..57911e3 100644
--- a/src/main/resources/assets/enva/models/item/titanium_leggings.json
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings.json
@@ -1,5 +1,67 @@
 {
   "parent": "item/generated",
+  "overrides": [
+    {
+      "model": "enva:item/titanium_leggings_quartz_trim",
+      "predicate": {
+        "trim_type": 0.1
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_iron_trim",
+      "predicate": {
+        "trim_type": 0.2
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_netherite_trim",
+      "predicate": {
+        "trim_type": 0.3
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_redstone_trim",
+      "predicate": {
+        "trim_type": 0.4
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_copper_trim",
+      "predicate": {
+        "trim_type": 0.5
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_gold_trim",
+      "predicate": {
+        "trim_type": 0.6
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_emerald_trim",
+      "predicate": {
+        "trim_type": 0.7
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_diamond_trim",
+      "predicate": {
+        "trim_type": 0.8
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_lapis_trim",
+      "predicate": {
+        "trim_type": 0.9
+      }
+    },
+    {
+      "model": "enva:item/titanium_leggings_amethyst_trim",
+      "predicate": {
+        "trim_type": 1.0
+      }
+    }
+  ],
   "textures": {
     "layer0": "enva:item/titanium_leggings"
   }
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_amethyst_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_amethyst_trim.json
new file mode 100644
index 0000000..5b8d6b6
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_amethyst_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_amethyst"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_copper_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_copper_trim.json
new file mode 100644
index 0000000..7fd5947
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_copper_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_copper"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_diamond_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_diamond_trim.json
new file mode 100644
index 0000000..e3146cb
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_diamond_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_diamond"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_emerald_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_emerald_trim.json
new file mode 100644
index 0000000..e6f537e
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_emerald_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_emerald"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_gold_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_gold_trim.json
new file mode 100644
index 0000000..33db14e
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_gold_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_gold"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_iron_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_iron_trim.json
new file mode 100644
index 0000000..9f14ba1
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_iron_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_iron"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_lapis_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_lapis_trim.json
new file mode 100644
index 0000000..7c9b0ff
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_lapis_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_lapis"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_netherite_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_netherite_trim.json
new file mode 100644
index 0000000..72384b3
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_netherite_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_netherite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_quartz_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_quartz_trim.json
new file mode 100644
index 0000000..2a7a68e
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_quartz_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_quartz"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/models/item/titanium_leggings_redstone_trim.json b/src/main/resources/assets/enva/models/item/titanium_leggings_redstone_trim.json
new file mode 100644
index 0000000..659aa2c
--- /dev/null
+++ b/src/main/resources/assets/enva/models/item/titanium_leggings_redstone_trim.json
@@ -0,0 +1,7 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "enva:item/titanium_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_redstone"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/enva/textures/models/armor/glasses_layer_1.png b/src/main/resources/assets/enva/textures/models/armor/glasses_layer_1.png
index bd65c9b..ae94c3b 100644
Binary files a/src/main/resources/assets/enva/textures/models/armor/glasses_layer_1.png and b/src/main/resources/assets/enva/textures/models/armor/glasses_layer_1.png differ
diff --git a/src/main/resources/assets/enva/textures/models/armor/titanium_coated_water_glass_layer_1.png b/src/main/resources/assets/enva/textures/models/armor/titanium_coated_water_glass_layer_1.png
new file mode 100644
index 0000000..3277870
Binary files /dev/null and b/src/main/resources/assets/enva/textures/models/armor/titanium_coated_water_glass_layer_1.png differ
diff --git a/src/main/resources/assets/enva/textures/models/armor/water_glass_layer_1.png b/src/main/resources/assets/enva/textures/models/armor/water_glass_layer_1.png
index bd65c9b..cf837b8 100644
Binary files a/src/main/resources/assets/enva/textures/models/armor/water_glass_layer_1.png and b/src/main/resources/assets/enva/textures/models/armor/water_glass_layer_1.png differ
diff --git a/src/main/resources/data/enva/loot_tables/blocks/air_filter.json b/src/main/resources/data/enva/loot_table/blocks/air_filter.json
similarity index 100%
rename from src/main/resources/data/enva/loot_tables/blocks/air_filter.json
rename to src/main/resources/data/enva/loot_table/blocks/air_filter.json
diff --git a/src/main/resources/data/enva/loot_tables/blocks/titanium_block.json b/src/main/resources/data/enva/loot_table/blocks/titanium_block.json
similarity index 100%
rename from src/main/resources/data/enva/loot_tables/blocks/titanium_block.json
rename to src/main/resources/data/enva/loot_table/blocks/titanium_block.json
diff --git a/src/main/resources/data/enva/loot_tables/blocks/titanium_ore.json b/src/main/resources/data/enva/loot_table/blocks/titanium_ore.json
similarity index 100%
rename from src/main/resources/data/enva/loot_tables/blocks/titanium_ore.json
rename to src/main/resources/data/enva/loot_table/blocks/titanium_ore.json
diff --git a/src/main/resources/data/enva/recipes/air_filter.json b/src/main/resources/data/enva/recipe/air_filter.json
similarity index 91%
rename from src/main/resources/data/enva/recipes/air_filter.json
rename to src/main/resources/data/enva/recipe/air_filter.json
index 7805879..9a8023a 100644
--- a/src/main/resources/data/enva/recipes/air_filter.json
+++ b/src/main/resources/data/enva/recipe/air_filter.json
@@ -20,7 +20,7 @@
     }
   },
   "result": {
-    "item": "enva:air_filter",
+    "id": "enva:air_filter",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/glass_bowl.json b/src/main/resources/data/enva/recipe/glass_bowl.json
similarity index 85%
rename from src/main/resources/data/enva/recipes/glass_bowl.json
rename to src/main/resources/data/enva/recipe/glass_bowl.json
index fb2f422..c687379 100644
--- a/src/main/resources/data/enva/recipes/glass_bowl.json
+++ b/src/main/resources/data/enva/recipe/glass_bowl.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "enva:glass_bowl",
+    "id": "enva:glass_bowl",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/glass_helmet.json b/src/main/resources/data/enva/recipe/glass_helmet.json
similarity index 84%
rename from src/main/resources/data/enva/recipes/glass_helmet.json
rename to src/main/resources/data/enva/recipe/glass_helmet.json
index 0ca3146..c50d8a6 100644
--- a/src/main/resources/data/enva/recipes/glass_helmet.json
+++ b/src/main/resources/data/enva/recipe/glass_helmet.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "enva:glass_helmet",
+    "id": "enva:glass_helmet",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/glasses.json b/src/main/resources/data/enva/recipe/glasses.json
similarity index 85%
rename from src/main/resources/data/enva/recipes/glasses.json
rename to src/main/resources/data/enva/recipe/glasses.json
index a280df5..34cd84a 100644
--- a/src/main/resources/data/enva/recipes/glasses.json
+++ b/src/main/resources/data/enva/recipe/glasses.json
@@ -9,7 +9,7 @@
     }
   },
   "result": {
-    "item": "enva:glasses",
+    "id": "enva:glasses",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/sunscreen.json b/src/main/resources/data/enva/recipe/sunscreen.json
similarity index 92%
rename from src/main/resources/data/enva/recipes/sunscreen.json
rename to src/main/resources/data/enva/recipe/sunscreen.json
index dddb18b..a6577d8 100644
--- a/src/main/resources/data/enva/recipes/sunscreen.json
+++ b/src/main/resources/data/enva/recipe/sunscreen.json
@@ -20,7 +20,7 @@
     }
   },
   "result": {
-    "item": "enva:sunscreen",
+    "id": "enva:sunscreen",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/titanium_block.json b/src/main/resources/data/enva/recipe/titanium_block.json
similarity index 84%
rename from src/main/resources/data/enva/recipes/titanium_block.json
rename to src/main/resources/data/enva/recipe/titanium_block.json
index 4361f25..51cab7e 100644
--- a/src/main/resources/data/enva/recipes/titanium_block.json
+++ b/src/main/resources/data/enva/recipe/titanium_block.json
@@ -11,7 +11,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_block",
+    "id": "enva:titanium_block",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/titanium_boots.json b/src/main/resources/data/enva/recipe/titanium_boots.json
similarity index 84%
rename from src/main/resources/data/enva/recipes/titanium_boots.json
rename to src/main/resources/data/enva/recipe/titanium_boots.json
index 622b72e..0356717 100644
--- a/src/main/resources/data/enva/recipes/titanium_boots.json
+++ b/src/main/resources/data/enva/recipe/titanium_boots.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_boots",
+    "id": "enva:titanium_boots",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/titanium_chestplate.json b/src/main/resources/data/enva/recipe/titanium_chestplate.json
similarity index 83%
rename from src/main/resources/data/enva/recipes/titanium_chestplate.json
rename to src/main/resources/data/enva/recipe/titanium_chestplate.json
index 5775855..192bf7c 100644
--- a/src/main/resources/data/enva/recipes/titanium_chestplate.json
+++ b/src/main/resources/data/enva/recipe/titanium_chestplate.json
@@ -11,7 +11,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_chestplate",
+    "id": "enva:titanium_chestplate",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/titanium_coated_glass_bowl.json b/src/main/resources/data/enva/recipe/titanium_coated_glass_bowl.json
similarity index 83%
rename from src/main/resources/data/enva/recipes/titanium_coated_glass_bowl.json
rename to src/main/resources/data/enva/recipe/titanium_coated_glass_bowl.json
index 3bf7ab3..b4f4494 100644
--- a/src/main/resources/data/enva/recipes/titanium_coated_glass_bowl.json
+++ b/src/main/resources/data/enva/recipe/titanium_coated_glass_bowl.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_coated_glass_bowl",
+    "id": "enva:titanium_coated_glass_bowl",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/titanium_coated_glass_helmet.json b/src/main/resources/data/enva/recipe/titanium_coated_glass_helmet.json
similarity index 83%
rename from src/main/resources/data/enva/recipes/titanium_coated_glass_helmet.json
rename to src/main/resources/data/enva/recipe/titanium_coated_glass_helmet.json
index 7a6f20b..e8e3f24 100644
--- a/src/main/resources/data/enva/recipes/titanium_coated_glass_helmet.json
+++ b/src/main/resources/data/enva/recipe/titanium_coated_glass_helmet.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_coated_glass_helmet",
+    "id": "enva:titanium_coated_glass_helmet",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/titanium_dust.json b/src/main/resources/data/enva/recipe/titanium_dust.json
similarity index 81%
rename from src/main/resources/data/enva/recipes/titanium_dust.json
rename to src/main/resources/data/enva/recipe/titanium_dust.json
index ce3c916..498ec25 100644
--- a/src/main/resources/data/enva/recipes/titanium_dust.json
+++ b/src/main/resources/data/enva/recipe/titanium_dust.json
@@ -6,7 +6,7 @@
     }
   ],
   "result": {
-    "item": "enva:titanium_dust",
+    "id": "enva:titanium_dust",
     "count": 9
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/titanium_helmet.json b/src/main/resources/data/enva/recipe/titanium_helmet.json
similarity index 83%
rename from src/main/resources/data/enva/recipes/titanium_helmet.json
rename to src/main/resources/data/enva/recipe/titanium_helmet.json
index f0b463c..e02dceb 100644
--- a/src/main/resources/data/enva/recipes/titanium_helmet.json
+++ b/src/main/resources/data/enva/recipe/titanium_helmet.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_helmet",
+    "id": "enva:titanium_helmet",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/titanium_ingot_from_block.json b/src/main/resources/data/enva/recipe/titanium_ingot_from_block.json
similarity index 81%
rename from src/main/resources/data/enva/recipes/titanium_ingot_from_block.json
rename to src/main/resources/data/enva/recipe/titanium_ingot_from_block.json
index b306ebc..c40e548 100644
--- a/src/main/resources/data/enva/recipes/titanium_ingot_from_block.json
+++ b/src/main/resources/data/enva/recipe/titanium_ingot_from_block.json
@@ -6,7 +6,7 @@
     }
   ],
   "result": {
-    "item": "enva:titanium_ingot",
+    "id": "enva:titanium_ingot",
     "count": 9
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/titanium_ingot_from_dust.json b/src/main/resources/data/enva/recipe/titanium_ingot_from_dust.json
similarity index 84%
rename from src/main/resources/data/enva/recipes/titanium_ingot_from_dust.json
rename to src/main/resources/data/enva/recipe/titanium_ingot_from_dust.json
index e3bfed3..13de238 100644
--- a/src/main/resources/data/enva/recipes/titanium_ingot_from_dust.json
+++ b/src/main/resources/data/enva/recipe/titanium_ingot_from_dust.json
@@ -11,7 +11,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_ingot",
+    "id": "enva:titanium_ingot",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/titanium_ingot_from_ore_blast.json b/src/main/resources/data/enva/recipe/titanium_ingot_from_ore_blast.json
similarity index 72%
rename from src/main/resources/data/enva/recipes/titanium_ingot_from_ore_blast.json
rename to src/main/resources/data/enva/recipe/titanium_ingot_from_ore_blast.json
index cdc0c6f..29da86d 100644
--- a/src/main/resources/data/enva/recipes/titanium_ingot_from_ore_blast.json
+++ b/src/main/resources/data/enva/recipe/titanium_ingot_from_ore_blast.json
@@ -3,7 +3,9 @@
   "ingredient": {
     "item": "enva:titanium_ore"
   },
-  "result": "enva:titanium_ingot",
+  "result": {
+    "id": "enva:titanium_ingot"
+  },
   "experience": 0.3,
   "cookingtime": 100
 }
\ No newline at end of file
diff --git a/src/main/resources/data/enva/recipes/titanium_ingot_from_ore_normal.json b/src/main/resources/data/enva/recipe/titanium_ingot_from_ore_normal.json
similarity index 72%
rename from src/main/resources/data/enva/recipes/titanium_ingot_from_ore_normal.json
rename to src/main/resources/data/enva/recipe/titanium_ingot_from_ore_normal.json
index 64684a7..3747ace 100644
--- a/src/main/resources/data/enva/recipes/titanium_ingot_from_ore_normal.json
+++ b/src/main/resources/data/enva/recipe/titanium_ingot_from_ore_normal.json
@@ -3,7 +3,9 @@
   "ingredient": {
     "item": "enva:titanium_ore"
   },
-  "result": "enva:titanium_ingot",
+  "result": {
+    "id": "enva:titanium_ingot"
+  },
   "experience": 0.3,
   "cookingtime": 200
 }
diff --git a/src/main/resources/data/enva/recipes/titanium_leggings.json b/src/main/resources/data/enva/recipe/titanium_leggings.json
similarity index 83%
rename from src/main/resources/data/enva/recipes/titanium_leggings.json
rename to src/main/resources/data/enva/recipe/titanium_leggings.json
index ee49120..d2a258b 100644
--- a/src/main/resources/data/enva/recipes/titanium_leggings.json
+++ b/src/main/resources/data/enva/recipe/titanium_leggings.json
@@ -11,7 +11,7 @@
     }
   },
   "result": {
-    "item": "enva:titanium_leggings",
+    "id": "enva:titanium_leggings",
     "count": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json
similarity index 57%
rename from src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
rename to src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json
index fa9eb5e..11e701c 100644
--- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
+++ b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json
@@ -2,6 +2,7 @@
   "replace": false,
   "values": [
     "enva:titanium_ore",
-    "enva:titanium_block"
+    "enva:titanium_block",
+    "enva:air_filter"
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json
rename to src/main/resources/data/minecraft/tags/block/needs_iron_tool.json
diff --git a/src/main/resources/data/minecraft/tags/item/chest_armor.json b/src/main/resources/data/minecraft/tags/item/chest_armor.json
new file mode 100644
index 0000000..7dc3503
--- /dev/null
+++ b/src/main/resources/data/minecraft/tags/item/chest_armor.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "enva:titanium_chestplate"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/head_armor.json b/src/main/resources/data/minecraft/tags/item/enchantable/head_armor.json
new file mode 100644
index 0000000..ab0fc43
--- /dev/null
+++ b/src/main/resources/data/minecraft/tags/item/enchantable/head_armor.json
@@ -0,0 +1,10 @@
+{
+  "replace": false,
+  "values": [
+    "enva:glass_helmet",
+    "enva:water_glass_bowl",
+    "enva:glasses",
+    "enva:titanium_coated_glass_helmet",
+    "enva:titanium_coated_water_glass_bowl"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/item/foot_armor.json b/src/main/resources/data/minecraft/tags/item/foot_armor.json
new file mode 100644
index 0000000..154efcb
--- /dev/null
+++ b/src/main/resources/data/minecraft/tags/item/foot_armor.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "enva:titanium_boots"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/item/head_armor.json b/src/main/resources/data/minecraft/tags/item/head_armor.json
new file mode 100644
index 0000000..db44432
--- /dev/null
+++ b/src/main/resources/data/minecraft/tags/item/head_armor.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "enva:titanium_helmet"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/item/leg_armor.json b/src/main/resources/data/minecraft/tags/item/leg_armor.json
new file mode 100644
index 0000000..1823f7d
--- /dev/null
+++ b/src/main/resources/data/minecraft/tags/item/leg_armor.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "enva:titanium_leggings"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/origins/powers/burn_in_daylight.json b/src/main/resources/data/origins/powers/burn_in_daylight.json
index d04ec00..86ea23b 100644
--- a/src/main/resources/data/origins/powers/burn_in_daylight.json
+++ b/src/main/resources/data/origins/powers/burn_in_daylight.json
@@ -4,7 +4,7 @@
   "interval": 20,
   "burn_duration": 6,
   "condition": {
-    "type": "origins:and",
+    "type": "origins:all_of",
     "conditions": [
       {
         "type": "origins:exposed_to_sun"
diff --git a/src/main/resources/data/origins/powers/water_vulnerability.json b/src/main/resources/data/origins/powers/water_vulnerability.json
index f73ce64..c132880 100644
--- a/src/main/resources/data/origins/powers/water_vulnerability.json
+++ b/src/main/resources/data/origins/powers/water_vulnerability.json
@@ -5,11 +5,7 @@
   "onset_delay": 1,
   "damage": 2,
   "damage_easy": 1,
-  "damage_source": {
-    "name": "hurt_by_water",
-    "unblockable": true,
-    "bypasses_armor": true
-  },
+  "damage_type": "origins:hurt_by_water",
   "protection_enchantment": "origins:water_protection",
   "protection_effectiveness": 1.0,
   "condition": {
@@ -27,7 +23,6 @@
           {
             "type": "origins:status_effect",
             "effect": "enva:water_resistance",
-            "min_amplifier": 0,
             "inverted": true
           }
         ]
@@ -41,7 +36,6 @@
           {
             "type": "origins:status_effect",
             "effect": "enva:water_resistance",
-            "min_amplifier": 0,
             "inverted": true
           }
         ]