diff --git a/source/behavior/items/format/components/enchantable.json b/source/behavior/items/format/components/enchantable.json
index 5a3224ff..8159aa08 100644
--- a/source/behavior/items/format/components/enchantable.json
+++ b/source/behavior/items/format/components/enchantable.json
@@ -1,37 +1,42 @@
-{
-  "$id": "blockception.minecraft.behavior.items.minecraft:enchantable",
-  "title": "Enchantable",
-  "description": "The enchantable component determines what enchantments can be applied to the item.",
-  "type": "object",
-  "additionalProperties": false,
-  "required": ["slot"],
-  "properties": {
-    "slot": {
-      "title": "Slot",
-      "description": "If true you can always eat this item (even when not hungry), defaults to false.",
-      "enum": [
-        "axe",
-		    "bow",
-		    "armor_feet",
-		    "armor_torso",
-		    "armor_head",
-		    "armor_legs",
-		    "hoe",
-		    "pickaxe",
-		    "shovel",
-		    "elytra",
-		    "fishing_rod",
-		    "flintsteel",
-		    "sword",
-		    "shears",
-		    "cosmetic_head"
-      ]
-    },
-    "value": {
-      "title": "Value",
-      "description": "The value of the enchantment.",
-      "type": "number",
-      "minimum": 0
-    }
-  }
-}
+{
+  "$id": "blockception.minecraft.behavior.items.minecraft:enchantable",
+  "title": "Enchantable",
+  "description": "The enchantable component determines what enchantments can be applied to the item.",
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["slot"],
+  "properties": {
+    "slot": {
+      "title": "Slot",
+      "description": "If true you can always eat this item (even when not hungry), defaults to false.",
+      "enum": [
+        "all",
+        "axe",
+        "bow",
+        "crossbow",
+        "spear",
+        "armor_feet",
+        "armor_torso",
+        "armor_head",
+        "armor_legs",
+        "hoe",
+        "pickaxe",
+        "shovel",
+        "elytra",
+        "fishing_rod",
+        "flintsteel",
+        "sword",
+        "shield",
+        "shears",
+        "cosmetic_head",
+        "carrotstick"
+      ]
+    },
+    "value": {
+      "title": "Value",
+      "description": "The value of the enchantment.",
+      "type": "number",
+      "minimum": 0
+    }
+  }
+}
diff --git a/source/behavior/loot_tables/conditions/killed_by_player_or_pets.json b/source/behavior/loot_tables/conditions/killed_by_player_or_pets.json
index 9a73f65c..0ac070b9 100644
--- a/source/behavior/loot_tables/conditions/killed_by_player_or_pets.json
+++ b/source/behavior/loot_tables/conditions/killed_by_player_or_pets.json
@@ -3,7 +3,7 @@
   "type": "object",
   "additionalProperties": false,
   "description": "Returns the condition true if the actor of the loot table is killed by player or entities that has owner.",
-  "title": "Killed By Player Or Pets Or Pets",
+  "title": "Killed By Player Or Pets",
   "properties": {
     "condition": { "type": "string", "title": "Condition", "description": "UNDOCUMENTED.", "$comment": "UNDOCUMENTED" }
   }
diff --git a/source/behavior/loot_tables/conditions/match_tool.json b/source/behavior/loot_tables/conditions/match_tool.json
index a0ca2bba..66e0d5aa 100644
--- a/source/behavior/loot_tables/conditions/match_tool.json
+++ b/source/behavior/loot_tables/conditions/match_tool.json
@@ -1,68 +1,122 @@
-{
-    "$id": "blockception.minecraft.behavior.condition.match_tool",
-    "type": "object",
-    "additionalProperties": false,
-    "description": "Returns the condition true if the block of the loot table was broken with a specific item.",
-    "title": "Killed By Player",
-  "required": ["condition"],
-    "properties": {
-      "condition": { "type": "string",  "const": "match_tool", "title": "Condition", "description": "UNDOCUMENTED.", "$comment": "UNDOCUMENTED" },
-      "item": {
-        "title": "Item",
-        "description": "The item to match",
-        "type": "string"
-      },
-      "count": {
-        "title": "Count",
-        "description": "Minimum count to match of the given item",
-        "type": "integer",
-        "minimum": 0
-      },
-      "enchantments": {
-        "title": "Enchantments",
-        "description": "List of enchantments to check for",
-        "type": "array",
-        "items": {
-            "type": "object",
-            "patternProperties": {
-              "^[a-zA-Z]+$": {
-                "type": "object",
-                "properties": {
-                  "level": {
-                    "type": "integer"
-                  }
-                },
-                "required": ["level"]
-              }
-            },
-            "minProperties": 1,
-            "maxProperties": 1
-        },
-        "minItems": 1
-      },
-      "minecraft:match_tool_filter_all": {
-        "title": "Match Tool Filter All",
-        "description": "List of tags the item must have",
-        "type": "array",
-        "items": {
-            "type": "string"
-        }
-      },
-      "minecraft:match_tool_filter_none": {
-        "title": "Match Tool Filter None",
-        "description": "List of tags the item must NOT have",
-        "type": "array",
-        "items": {
-            "type": "string"
-        }
-      },
-      "minecraft:match_tool_filter_any": {
-        "title": "Match Tool Filter Any",
-        "description": "List of tags the item must have at least one of",
-        "type": "array",
-        "items": {
-            "type": "string"
-        }
-      }
-    }
-}  
\ No newline at end of file
+{
+  "$id": "blockception.minecraft.behavior.condition.match_tool",
+  "type": "object",
+  "additionalProperties": false,
+  "description": "Returns the condition true if the block of the loot table was broken with a specific item.",
+  "title": "Match Tool",
+  "required": ["condition"],
+  "properties": {
+    "condition": { "type": "string", "const": "match_tool", "title": "Condition", "description": "UNDOCUMENTED.", "$comment": "UNDOCUMENTED" },
+    "item": {
+      "title": "Item",
+      "description": "The item to match",
+      "type": "string"
+    },
+    "count": {
+      "title": "Count",
+      "description": "Minimum count to match of the given item",
+      "type": "integer",
+      "minimum": 0
+    },
+    "enchantments": {
+      "title": "Enchantments",
+      "description": "List of enchantments to check for",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": ["enchantment"],
+        "properties": {
+          "enchantment": {
+            "title": "Enchantment",
+            "description": "The enchantment ID to check for",
+            "type": "string",
+            "enum": [
+              "protection",
+              "fire_protection",
+              "feather_falling",
+              "blast_protection",
+              "projectile_protection",
+              "thorns",
+              "respiration",
+              "depth_strider",
+              "aqua_affinity",
+              "sharpness",
+              "smite",
+              "bane_of_arthropods",
+              "knockback",
+              "fire_aspect",
+              "looting",
+              "efficiency",
+              "silk_touch",
+              "unbreaking",
+              "fortune",
+              "power",
+              "punch",
+              "flame",
+              "infinity",
+              "luck_of_the_sea",
+              "lure",
+              "frost_walker",
+              "mending",
+              "binding",
+              "vanishing",
+              "impaling",
+              "riptide",
+              "loyalty",
+              "channeling",
+              "multishot",
+              "piercing",
+              "quick_charge",
+              "soul_speed",
+              "swift_sneak",
+              "wind_burst",
+              "density",
+              "breach"
+            ]
+          },
+          "levels": {
+            "title": "Levels",
+            "description": "The level of the enchantment",
+            "type": "object",
+            "properties": {
+              "range_min": {
+                "title": "Minimum",
+                "description": "The minimum level of the enchantment",
+                "type": "integer"
+              },
+              "range_max": {
+                "title": "Maximum",
+                "description": "The maximum level of the enchantment",
+                "type": "integer"
+              }
+            }
+          }
+        }
+      }
+    },
+    "minecraft:match_tool_filter_all": {
+      "title": "Match Tool Filter All",
+      "description": "List of tags the item must have",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "minecraft:match_tool_filter_none": {
+      "title": "Match Tool Filter None",
+      "description": "List of tags the item must NOT have",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "minecraft:match_tool_filter_any": {
+      "title": "Match Tool Filter Any",
+      "description": "List of tags the item must have at least one of",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    }
+  }
+}
diff --git a/source/resource/materials/materials.json b/source/resource/materials/materials.json
index 968c6785..6cbe5d2d 100644
--- a/source/resource/materials/materials.json
+++ b/source/resource/materials/materials.json
@@ -235,7 +235,7 @@
         "title": "Variant",
         "description": "UNDOCUMENTED.",
         "$comment": "UNDOCUMENTED",
-        "propertyNames": { "enum": ["fading", "fog", "fog.underwater", "lit", "skinning", "skinning_color", "underlava", "underwater"] },
+        "propertyNames": { "enum": ["fading", "fog", "fog.underwater", "lit", "skinning", "skinning_color", "skinning_alphatest", "underlava", "underwater"] },
         "additionalProperties": {
           "title": "Variant Item",
           "description": "UNDOCUMENTED.",
diff --git a/source/skinpacks/skins.json b/source/skinpacks/skins.json
index f2445a86..974e4093 100644
--- a/source/skinpacks/skins.json
+++ b/source/skinpacks/skins.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
-  "title": "Skip Pack",
+  "title": "Skin Pack",
   "description": "Skin pack definition.",
   "type": "object",
   "additionalProperties": false,