diff --git a/Common/src/main/resources/assets/icarus/lang/en_us.json b/Common/src/main/resources/assets/icarus/lang/en_us.json
index aa7db6f..270dfe1 100644
--- a/Common/src/main/resources/assets/icarus/lang/en_us.json
+++ b/Common/src/main/resources/assets/icarus/lang/en_us.json
@@ -109,5 +109,24 @@
 
   "message.icarus.status.no_fly.dimension": "Flying is not allowed in this dimension!",
   "message.icarus.status.no_fly.hunger": "You cannot fly with an empty stomach!",
-  "message.icarus.status.no_fly.status_effect": "You cannot fly right now!"
+  "message.icarus.status.no_fly.status_effect": "You cannot fly right now!",
+
+  "tag.item.c.feathers": "Feathers",
+  "tag.item.c.elytra": "Elytra",
+
+  "tag.item.icarus.mechanical_leather_wings": "Mechanical Leather Wings",
+  "tag.item.icarus.feathered_wings": "Feathered Wings",
+  "tag.item.icarus.bypasses_armor_slowdown": "Bypasses Icarus Armor Slowdown",
+  "tag.item.icarus.dragon_wings": "Dragon Wings",
+  "tag.item.icarus.free_flight": "Free Flight",
+  "tag.item.icarus.animal_hides": "Animal Hides",
+  "tag.item.icarus.mechanical_feathered_wings": "Mechanical Feathered Wings",
+  "tag.item.icarus.light_wings": "Light Wings",
+  "tag.item.icarus.diamonds_and_emeralds": "Diamonds and Emeralds",
+  "tag.item.icarus.leathers": "Leathers",
+  "tag.item.icarus.wings": "Wings",
+  "tag.item.icarus.melts": "Wings that Melt",
+  "tag.item.icarus.feathers": "Feathers",
+  "tag.item.icarus.wings_base": "Wing Bases",
+  "tag.item.icarus.wing_repair_items": "Wing Repair Items"
 }
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/black.json b/Common/src/main/resources/data/c/tags/item/dyes/black.json
deleted file mode 100644
index f8e96ba..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/black.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:black_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/black",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/blue.json b/Common/src/main/resources/data/c/tags/item/dyes/blue.json
deleted file mode 100644
index c802ab1..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/blue.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:blue_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/blue",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/brown.json b/Common/src/main/resources/data/c/tags/item/dyes/brown.json
deleted file mode 100644
index 3e11091..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/brown.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:brown_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/brown",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/cyan.json b/Common/src/main/resources/data/c/tags/item/dyes/cyan.json
deleted file mode 100644
index 5d8f745..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/cyan.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:cyan_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/cyan",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/gray.json b/Common/src/main/resources/data/c/tags/item/dyes/gray.json
deleted file mode 100644
index 6b5ec78..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/gray.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:gray_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/gray",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/green.json b/Common/src/main/resources/data/c/tags/item/dyes/green.json
deleted file mode 100644
index 4066d7a..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/green.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:green_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/green",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/light_blue.json b/Common/src/main/resources/data/c/tags/item/dyes/light_blue.json
deleted file mode 100644
index 03b4dce..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/light_blue.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:light_blue_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/light_blue",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/light_gray.json b/Common/src/main/resources/data/c/tags/item/dyes/light_gray.json
deleted file mode 100644
index 83fb264..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/light_gray.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:light_gray_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/light_gray",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/lime.json b/Common/src/main/resources/data/c/tags/item/dyes/lime.json
deleted file mode 100644
index a6b1dad..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/lime.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:lime_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/lime",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/magenta.json b/Common/src/main/resources/data/c/tags/item/dyes/magenta.json
deleted file mode 100644
index 0aef65f..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/magenta.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:magenta_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/magenta",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/orange.json b/Common/src/main/resources/data/c/tags/item/dyes/orange.json
deleted file mode 100644
index de0b31c..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/orange.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:orange_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/orange",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/pink.json b/Common/src/main/resources/data/c/tags/item/dyes/pink.json
deleted file mode 100644
index f6a8f61..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/pink.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:pink_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/pink",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/purple.json b/Common/src/main/resources/data/c/tags/item/dyes/purple.json
deleted file mode 100644
index b410398..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/purple.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:purple_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/purple",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/red.json b/Common/src/main/resources/data/c/tags/item/dyes/red.json
deleted file mode 100644
index 89d158e..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/red.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:red_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/red",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/white.json b/Common/src/main/resources/data/c/tags/item/dyes/white.json
deleted file mode 100644
index 9b762da..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/white.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:white_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/white",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/dyes/yellow.json b/Common/src/main/resources/data/c/tags/item/dyes/yellow.json
deleted file mode 100644
index 97d66ee..0000000
--- a/Common/src/main/resources/data/c/tags/item/dyes/yellow.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#c:yellow_dyes",
-      "required": false
-    },
-    {
-      "id": "#forge:dyes/yellow",
-        "required": false
-    }
-  ]
-}
diff --git a/Common/src/main/resources/data/c/tags/item/elytra.json b/Common/src/main/resources/data/c/tags/item/elytra.json
new file mode 100644
index 0000000..0e15b03
--- /dev/null
+++ b/Common/src/main/resources/data/c/tags/item/elytra.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:elytra"
+  ]
+}
diff --git a/Common/src/main/resources/data/c/tags/item/feathers.json b/Common/src/main/resources/data/c/tags/item/feathers.json
new file mode 100644
index 0000000..015b709
--- /dev/null
+++ b/Common/src/main/resources/data/c/tags/item/feathers.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:feather"
+  ]
+}
diff --git a/Common/src/main/resources/data/icarus/recipe/discords_wings.json b/Common/src/main/resources/data/icarus/recipe/discords_wings.json
index 47ef4c5..6cd8b6a 100644
--- a/Common/src/main/resources/data/icarus/recipe/discords_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/discords_wings.json
@@ -1,36 +1,28 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern":
-  [
+  "pattern": [
     "WWW",
     "NEN",
     "L F"
   ],
-  "key":
-  {
-    "E":
-    {
-      "item": "minecraft:elytra"
+  "key": {
+    "E": {
+      "tag": "icarus:wings_base"
     },
-    "F":
-    {
+    "F": {
       "tag": "icarus:feathers"
     },
-    "L":
-    {
-      "tag": "icarus:leather"
+    "L": {
+      "tag": "icarus:leathers"
     },
-    "N":
-    {
+    "N": {
       "item": "minecraft:nether_star"
     },
-    "W":
-    {
+    "W": {
       "item": "minecraft:honeycomb"
     }
   },
-  "result":
-  {
-    "item": "icarus:discords_wings"
+  "result": {
+    "id": "icarus:discords_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/black_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/black_wings.json
index 6828046..9286d7f 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/black_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/black_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/black"
     }
   ],
-  "result":
-  {
-    "item": "icarus:black_dragon_wings"
+  "result": {
+    "id": "icarus:black_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/blue_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/blue_wings.json
index e44295d..403ff3b 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/blue_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/blue_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/blue"
     }
   ],
-  "result":
-  {
-    "item": "icarus:blue_dragon_wings"
+  "result": {
+    "id": "icarus:blue_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/brown_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/brown_wings.json
index 5711f15..45f55bf 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/brown_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/brown_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/brown"
     }
   ],
-  "result":
-  {
-    "item": "icarus:brown_dragon_wings"
+  "result": {
+    "id": "icarus:brown_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/cyan_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/cyan_wings.json
index a8b1f8e..47ee559 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/cyan_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/cyan_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/cyan"
     }
   ],
-  "result":
-  {
-    "item": "icarus:cyan_dragon_wings"
+  "result": {
+    "id": "icarus:cyan_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/gray_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/gray_wings.json
index 18ce299..2447ea6 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/gray_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/gray_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/gray"
     }
   ],
-  "result":
-  {
-    "item": "icarus:gray_dragon_wings"
+  "result": {
+    "id": "icarus:gray_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/green_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/green_wings.json
index 026c3ca..deb147b 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/green_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/green_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/green"
     }
   ],
-  "result":
-  {
-    "item": "icarus:green_dragon_wings"
+  "result": {
+    "id": "icarus:green_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/light_blue_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/light_blue_wings.json
index 25a4a13..09c9b9e 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/light_blue_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/light_blue_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/light_blue"
     }
   ],
-  "result":
-  {
-    "item": "icarus:light_blue_dragon_wings"
+  "result": {
+    "id": "icarus:light_blue_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/light_gray_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/light_gray_wings.json
index 560d2e6..a2a0a4f 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/light_gray_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/light_gray_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/light_gray"
     }
   ],
-  "result":
-  {
-    "item": "icarus:light_gray_dragon_wings"
+  "result": {
+    "id": "icarus:light_gray_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/lime_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/lime_wings.json
index e66da21..84db7a7 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/lime_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/lime_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/lime"
     }
   ],
-  "result":
-  {
-    "item": "icarus:lime_dragon_wings"
+  "result": {
+    "id": "icarus:lime_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/magenta_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/magenta_wings.json
index f2974ad..657c5ab 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/magenta_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/magenta_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/magenta"
     }
   ],
-  "result":
-  {
-    "item": "icarus:magenta_dragon_wings"
+  "result": {
+    "id": "icarus:magenta_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/orange_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/orange_wings.json
index a42c0e9..d7d4577 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/orange_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/orange_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/orange"
     }
   ],
-  "result":
-  {
-    "item": "icarus:orange_dragon_wings"
+  "result": {
+    "id": "icarus:orange_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/pink_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/pink_wings.json
index 1455e88..6a467d3 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/pink_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/pink_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/pink"
     }
   ],
-  "result":
-  {
-    "item": "icarus:pink_dragon_wings"
+  "result": {
+    "id": "icarus:pink_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/purple_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/purple_wings.json
index bbb3a15..94faed8 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/purple_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/purple_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/purple"
     }
   ],
-  "result":
-  {
-    "item": "icarus:purple_dragon_wings"
+  "result": {
+    "id": "icarus:purple_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/red_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/red_wings.json
index 1547cd4..6e0d0f9 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/red_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/red_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/red"
     }
   ],
-  "result":
-  {
-    "item": "icarus:red_dragon_wings"
+  "result": {
+    "id": "icarus:red_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/white_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/white_wings.json
index 650d707..7e5faa1 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/white_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/white_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/white"
     }
   ],
-  "result":
-  {
-    "item": "icarus:white_dragon_wings"
+  "result": {
+    "id": "icarus:white_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon/yellow_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon/yellow_wings.json
index 017ed99..c7d7099 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon/yellow_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon/yellow_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:dragon_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/yellow"
     }
   ],
-  "result":
-  {
-    "item": "icarus:yellow_dragon_wings"
+  "result": {
+    "id": "icarus:yellow_dragon_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/dragon_wings.json b/Common/src/main/resources/data/icarus/recipe/dragon_wings.json
index b439e9f..49b5c52 100644
--- a/Common/src/main/resources/data/icarus/recipe/dragon_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/dragon_wings.json
@@ -1,29 +1,22 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern":
-  [
+  "pattern": [
     "WWW",
     "FEF",
     "F F"
   ],
-  "key":
-  {
-    "E":
-    {
-      "item": "minecraft:elytra"
+  "key": {
+    "E": {
+      "tag": "icarus:wings_base"
     },
-    "F":
-    {
+    "F": {
       "item": "minecraft:dragon_breath"
     },
-    "W":
-    {
+    "W": {
       "item": "minecraft:honeycomb"
     }
   },
-  "result":
-  {
-    "item": "icarus:black_dragon_wings"
+  "result": {
+    "id": "icarus:black_dragon_wings"
   }
 }
-
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/black_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/black_wings.json
index 709e938..1474265 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/black_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/black_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/black"
     }
   ],
-  "result":
-  {
-    "item": "icarus:black_feathered_wings"
+  "result": {
+    "id": "icarus:black_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/blue_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/blue_wings.json
index a3cf7cb..6536e5f 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/blue_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/blue_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/blue"
     }
   ],
-  "result":
-  {
-    "item": "icarus:blue_feathered_wings"
+  "result": {
+    "id": "icarus:blue_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/brown_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/brown_wings.json
index 123f722..b4b23f4 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/brown_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/brown_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/brown"
     }
   ],
-  "result":
-  {
-    "item": "icarus:brown_feathered_wings"
+  "result": {
+    "id": "icarus:brown_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/cyan_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/cyan_wings.json
index 6128557..72baa84 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/cyan_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/cyan_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/cyan"
     }
   ],
-  "result":
-  {
-    "item": "icarus:cyan_feathered_wings"
+  "result": {
+    "id": "icarus:cyan_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/gray_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/gray_wings.json
index 71a2eb4..128cf73 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/gray_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/gray_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/gray"
     }
   ],
-  "result":
-  {
-    "item": "icarus:gray_feathered_wings"
+  "result": {
+    "id": "icarus:gray_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/green_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/green_wings.json
index 623154d..ae99ba1 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/green_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/green_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/green"
     }
   ],
-  "result":
-  {
-    "item": "icarus:green_feathered_wings"
+  "result": {
+    "id": "icarus:green_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/light_blue_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/light_blue_wings.json
index 01d0b26..f3bd597 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/light_blue_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/light_blue_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/light_blue"
     }
   ],
-  "result":
-  {
-    "item": "icarus:light_blue_feathered_wings"
+  "result": {
+    "id": "icarus:light_blue_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/light_gray_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/light_gray_wings.json
index f4fa0da..ae1b49e 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/light_gray_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/light_gray_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/light_gray"
     }
   ],
-  "result":
-  {
-    "item": "icarus:light_gray_feathered_wings"
+  "result": {
+    "id": "icarus:light_gray_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/lime_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/lime_wings.json
index c2cf9a7..f603d84 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/lime_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/lime_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/lime"
     }
   ],
-  "result":
-  {
-    "item": "icarus:lime_feathered_wings"
+  "result": {
+    "id": "icarus:lime_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/magenta_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/magenta_wings.json
index 178dd90..dd0cbdd 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/magenta_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/magenta_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/magenta"
     }
   ],
-  "result":
-  {
-    "item": "icarus:magenta_feathered_wings"
+  "result": {
+    "id": "icarus:magenta_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/orange_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/orange_wings.json
index 3ec78bf..d5078e9 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/orange_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/orange_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/orange"
     }
   ],
-  "result":
-  {
-    "item": "icarus:orange_feathered_wings"
+  "result": {
+    "id": "icarus:orange_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/pink_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/pink_wings.json
index 25acebc..038aba3 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/pink_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/pink_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/pink"
     }
   ],
-  "result":
-  {
-    "item": "icarus:pink_feathered_wings"
+  "result": {
+    "id": "icarus:pink_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/purple_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/purple_wings.json
index ab4cc8f..5baea77 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/purple_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/purple_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/purple"
     }
   ],
-  "result":
-  {
-    "item": "icarus:purple_feathered_wings"
+  "result": {
+    "id": "icarus:purple_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/red_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/red_wings.json
index b899829..26787ac 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/red_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/red_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/red"
     }
   ],
-  "result":
-  {
-    "item": "icarus:red_feathered_wings"
+  "result": {
+    "id": "icarus:red_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/white_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/white_wings.json
index 09254f2..fe08a3e 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/white_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/white_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/white"
     }
   ],
-  "result":
-  {
-    "item": "icarus:white_feathered_wings"
+  "result": {
+    "id": "icarus:white_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered/yellow_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered/yellow_wings.json
index cca23d5..9786f1d 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered/yellow_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered/yellow_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/yellow"
     }
   ],
-  "result":
-  {
-    "item": "icarus:yellow_feathered_wings"
+  "result": {
+    "id": "icarus:yellow_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/feathered_wings.json b/Common/src/main/resources/data/icarus/recipe/feathered_wings.json
index 18e89db..da8239d 100644
--- a/Common/src/main/resources/data/icarus/recipe/feathered_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/feathered_wings.json
@@ -1,28 +1,22 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern":
-  [
+  "pattern": [
     "WWW",
     "FEF",
     "F F"
   ],
-  "key":
-  {
-    "E":
-    {
-      "item": "minecraft:elytra"
+  "key": {
+    "E": {
+      "tag": "icarus:wings_base"
     },
-    "F":
-    {
+    "F": {
       "tag": "icarus:feathers"
     },
-    "W":
-    {
+    "W": {
       "item": "minecraft:honeycomb"
     }
   },
-  "result":
-  {
-    "item": "icarus:white_feathered_wings"
+  "result": {
+    "id": "icarus:white_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/flandres_wings.json b/Common/src/main/resources/data/icarus/recipe/flandres_wings.json
index d906e53..3428ff3 100644
--- a/Common/src/main/resources/data/icarus/recipe/flandres_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/flandres_wings.json
@@ -1,37 +1,28 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern":
-  [
+  "pattern": [
     "WWW",
     "NEN",
     "F G"
   ],
-  "key":
-  {
-    "E":
-    {
-      "item": "minecraft:elytra"
+  "key": {
+    "E": {
+      "tag": "icarus:wings_base"
     },
-    "F":
-    {
-      "item": "minecraft:diamond"
+    "F": {
+      "tag": "c:gems/diamond"
     },
-    "G":
-    {
-      "item": "minecraft:emerald"
+    "G": {
+      "tag": "c:gems/emerald"
     },
-    "N":
-    {
+    "N": {
       "item": "minecraft:nether_star"
     },
-    "W":
-    {
+    "W": {
       "item": "minecraft:honeycomb"
     }
   },
-  "result":
-  {
-    "item": "icarus:flandres_wings"
+  "result": {
+    "id": "icarus:flandres_wings"
   }
 }
-
diff --git a/Common/src/main/resources/data/icarus/recipe/light/black_wings.json b/Common/src/main/resources/data/icarus/recipe/light/black_wings.json
index 09e794b..4389d87 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/black_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/black_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/black"
     }
   ],
-  "result":
-  {
-    "item": "icarus:black_light_wings"
+  "result": {
+    "id": "icarus:black_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/blue_wings.json b/Common/src/main/resources/data/icarus/recipe/light/blue_wings.json
index 50a7f3c..1cfa1b9 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/blue_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/blue_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/blue"
     }
   ],
-  "result":
-  {
-    "item": "icarus:blue_light_wings"
+  "result": {
+    "id": "icarus:blue_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/brown_wings.json b/Common/src/main/resources/data/icarus/recipe/light/brown_wings.json
index e0766c9..709a623 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/brown_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/brown_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/brown"
     }
   ],
-  "result":
-  {
-    "item": "icarus:brown_light_wings"
+  "result": {
+    "id": "icarus:brown_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/cyan_wings.json b/Common/src/main/resources/data/icarus/recipe/light/cyan_wings.json
index 9e82bb7..a783728 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/cyan_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/cyan_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/cyan"
     }
   ],
-  "result":
-  {
-    "item": "icarus:cyan_light_wings"
+  "result": {
+    "id": "icarus:cyan_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/gray_wings.json b/Common/src/main/resources/data/icarus/recipe/light/gray_wings.json
index 09f8fa0..eb7a3ad 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/gray_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/gray_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/gray"
     }
   ],
-  "result":
-  {
-    "item": "icarus:gray_light_wings"
+  "result": {
+    "id": "icarus:gray_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/green_wings.json b/Common/src/main/resources/data/icarus/recipe/light/green_wings.json
index d650c07..01db692 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/green_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/green_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/green"
     }
   ],
-  "result":
-  {
-    "item": "icarus:green_light_wings"
+  "result": {
+    "id": "icarus:green_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/light_blue_wings.json b/Common/src/main/resources/data/icarus/recipe/light/light_blue_wings.json
index 340efa6..b4f3d69 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/light_blue_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/light_blue_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/light_blue"
     }
   ],
-  "result":
-  {
-    "item": "icarus:light_blue_light_wings"
+  "result": {
+    "id": "icarus:light_blue_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/light_gray_wings.json b/Common/src/main/resources/data/icarus/recipe/light/light_gray_wings.json
index 51ff4fc..8d2869b 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/light_gray_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/light_gray_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/light_gray"
     }
   ],
-  "result":
-  {
-    "item": "icarus:light_gray_light_wings"
+  "result": {
+    "id": "icarus:light_gray_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/lime_wings.json b/Common/src/main/resources/data/icarus/recipe/light/lime_wings.json
index 372c964..af7269e 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/lime_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/lime_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/lime"
     }
   ],
-  "result":
-  {
-    "item": "icarus:lime_light_wings"
+  "result": {
+    "id": "icarus:lime_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/magenta_wings.json b/Common/src/main/resources/data/icarus/recipe/light/magenta_wings.json
index 8775e19..be6c5eb 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/magenta_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/magenta_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/magenta"
     }
   ],
-  "result":
-  {
-    "item": "icarus:magenta_light_wings"
+  "result": {
+    "id": "icarus:magenta_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/orange_wings.json b/Common/src/main/resources/data/icarus/recipe/light/orange_wings.json
index dc23e60..fe4ebc2 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/orange_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/orange_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/orange"
     }
   ],
-  "result":
-  {
-    "item": "icarus:orange_light_wings"
+  "result": {
+    "id": "icarus:orange_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/pink_wings.json b/Common/src/main/resources/data/icarus/recipe/light/pink_wings.json
index faa0a71..214a2fa 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/pink_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/pink_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/pink"
     }
   ],
-  "result":
-  {
-    "item": "icarus:pink_light_wings"
+  "result": {
+    "id": "icarus:pink_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/purple_wings.json b/Common/src/main/resources/data/icarus/recipe/light/purple_wings.json
index a7fad50..fbeb57a 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/purple_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/purple_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/purple"
     }
   ],
-  "result":
-  {
-    "item": "icarus:purple_light_wings"
+  "result": {
+    "id": "icarus:purple_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/red_wings.json b/Common/src/main/resources/data/icarus/recipe/light/red_wings.json
index 637a54e..d58ad0d 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/red_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/red_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/red"
     }
   ],
-  "result":
-  {
-    "item": "icarus:red_light_wings"
+  "result": {
+    "id": "icarus:red_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/white_wings.json b/Common/src/main/resources/data/icarus/recipe/light/white_wings.json
index e279d50..36611b3 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/white_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/white_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/white"
     }
   ],
-  "result":
-  {
-    "item": "icarus:white_light_wings"
+  "result": {
+    "id": "icarus:white_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light/yellow_wings.json b/Common/src/main/resources/data/icarus/recipe/light/yellow_wings.json
index 47165d4..b121c67 100644
--- a/Common/src/main/resources/data/icarus/recipe/light/yellow_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light/yellow_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:light_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/yellow"
     }
   ],
-  "result":
-  {
-    "item": "icarus:yellow_light_wings"
+  "result": {
+    "id": "icarus:yellow_light_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/light_wings.json b/Common/src/main/resources/data/icarus/recipe/light_wings.json
index c1e91f6..f6295ee 100644
--- a/Common/src/main/resources/data/icarus/recipe/light_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/light_wings.json
@@ -1,29 +1,22 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern":
-  [
+  "pattern": [
     "WWW",
     "FEF",
     "F F"
   ],
-  "key":
-  {
-    "E":
-    {
-      "item": "minecraft:elytra"
+  "key": {
+    "E": {
+      "tag": "icarus:wings_base"
     },
-    "F":
-    {
-      "item": "minecraft:glowstone_dust"
+    "F": {
+      "tag": "c:dusts/glowstone"
     },
-    "W":
-    {
+    "W": {
       "item": "minecraft:honeycomb"
     }
   },
-  "result":
-  {
-    "item": "icarus:yellow_light_wings"
+  "result": {
+    "id": "icarus:yellow_light_wings"
   }
 }
-
diff --git a/Common/src/main/resources/data/icarus/recipe/mechanical_feathered_wings.json b/Common/src/main/resources/data/icarus/recipe/mechanical_feathered_wings.json
index 05b3051..25a7245 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechanical_feathered_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechanical_feathered_wings.json
@@ -1,32 +1,25 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern":
-  [
+  "pattern": [
     "WWW",
     "IEI",
     "F F"
   ],
-  "key":
-  {
-    "E":
-    {
-      "item": "minecraft:elytra"
+  "key": {
+    "E": {
+      "tag": "icarus:wings_base"
     },
-    "F":
-    {
+    "F": {
       "tag": "icarus:feathers"
     },
-    "I":
-    {
-      "item": "minecraft:iron_ingot"
+    "I": {
+      "tag": "c:ingots/iron"
     },
-    "W":
-    {
+    "W": {
       "item": "minecraft:honeycomb"
     }
   },
-  "result":
-  {
-    "item": "icarus:white_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:white_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechanical_leather_wings.json b/Common/src/main/resources/data/icarus/recipe/mechanical_leather_wings.json
index 507d3c5..2ed62a6 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechanical_leather_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechanical_leather_wings.json
@@ -1,32 +1,25 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern":
-  [
+  "pattern": [
     "WWW",
     "IEI",
     "F F"
   ],
-  "key":
-  {
-    "E":
-    {
-      "item": "minecraft:elytra"
+  "key": {
+    "E": {
+      "tag": "icarus:wings_base"
     },
-    "F":
-    {
-      "tag": "icarus:leather"
+    "F": {
+      "tag": "icarus:leathers"
     },
-    "I":
-    {
-      "item": "minecraft:iron_ingot"
+    "I": {
+      "tag": "c:ingots/iron"
     },
-    "W":
-    {
+    "W": {
       "item": "minecraft:honeycomb"
     }
   },
-  "result":
-  {
-    "item": "icarus:orange_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:orange_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/black_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/black_wings.json
index 41560aa..a98658a 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/black_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/black_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/black"
     }
   ],
-  "result":
-  {
-    "item": "icarus:black_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:black_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/blue_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/blue_wings.json
index a604f69..18b7f06 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/blue_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/blue_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/blue"
     }
   ],
-  "result":
-  {
-    "item": "icarus:blue_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:blue_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/brown_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/brown_wings.json
index 4622b69..33edcf0 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/brown_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/brown_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/brown"
     }
   ],
-  "result":
-  {
-    "item": "icarus:brown_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:brown_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/cyan_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/cyan_wings.json
index 6587e2a..3cf5a91 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/cyan_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/cyan_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/cyan"
     }
   ],
-  "result":
-  {
-    "item": "icarus:cyan_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:cyan_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/gray_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/gray_wings.json
index bcd4cb7..1e15ff5 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/gray_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/gray_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/gray"
     }
   ],
-  "result":
-  {
-    "item": "icarus:gray_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:gray_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/green_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/green_wings.json
index 6473cfb..3eba08f 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/green_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/green_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/green"
     }
   ],
-  "result":
-  {
-    "item": "icarus:green_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:green_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/light_blue_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/light_blue_wings.json
index 8e8c235..7b44975 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/light_blue_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/light_blue_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/light_blue"
     }
   ],
-  "result":
-  {
-    "item": "icarus:light_blue_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:light_blue_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/light_gray_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/light_gray_wings.json
index f9f9d17..d3fc063 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/light_gray_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/light_gray_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/light_gray"
     }
   ],
-  "result":
-  {
-    "item": "icarus:light_gray_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:light_gray_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/lime_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/lime_wings.json
index 03c6498..d0c6e7f 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/lime_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/lime_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/lime"
     }
   ],
-  "result":
-  {
-    "item": "icarus:lime_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:lime_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/magenta_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/magenta_wings.json
index 4306c3d..4ecf207 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/magenta_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/magenta_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/magenta"
     }
   ],
-  "result":
-  {
-    "item": "icarus:magenta_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:magenta_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/orange_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/orange_wings.json
index 93df275..8b57696 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/orange_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/orange_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/orange"
     }
   ],
-  "result":
-  {
-    "item": "icarus:orange_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:orange_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/pink_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/pink_wings.json
index 6dd42e8..0a715e6 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/pink_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/pink_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/pink"
     }
   ],
-  "result":
-  {
-    "item": "icarus:pink_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:pink_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/purple_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/purple_wings.json
index cfd1663..075ab9c 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/purple_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/purple_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/purple"
     }
   ],
-  "result":
-  {
-    "item": "icarus:purple_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:purple_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/red_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/red_wings.json
index b2d3db6..bfa0da1 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/red_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/red_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/red"
     }
   ],
-  "result":
-  {
-    "item": "icarus:red_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:red_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/white_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/white_wings.json
index 3e45cb3..c8c692b 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/white_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/white_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/white"
     }
   ],
-  "result":
-  {
-    "item": "icarus:white_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:white_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechfeathered/yellow_wings.json b/Common/src/main/resources/data/icarus/recipe/mechfeathered/yellow_wings.json
index 2b4ecc9..cd0cb6e 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechfeathered/yellow_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechfeathered/yellow_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_feathered_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/yellow"
     }
   ],
-  "result":
-  {
-    "item": "icarus:yellow_mechanical_feathered_wings"
+  "result": {
+    "id": "icarus:yellow_mechanical_feathered_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/black_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/black_wings.json
index e0a40af..2598a07 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/black_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/black_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/black"
     }
   ],
-  "result":
-  {
-    "item": "icarus:black_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:black_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/blue_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/blue_wings.json
index 77b3f5e..0a27aff 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/blue_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/blue_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/blue"
     }
   ],
-  "result":
-  {
-    "item": "icarus:blue_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:blue_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/brown_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/brown_wings.json
index a06fa33..2cc3af4 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/brown_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/brown_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/brown"
     }
   ],
-  "result":
-  {
-    "item": "icarus:brown_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:brown_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/cyan_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/cyan_wings.json
index beac9a5..842babd 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/cyan_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/cyan_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/cyan"
     }
   ],
-  "result":
-  {
-    "item": "icarus:cyan_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:cyan_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/gray_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/gray_wings.json
index 579e4e7..95c32bf 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/gray_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/gray_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/gray"
     }
   ],
-  "result":
-  {
-    "item": "icarus:gray_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:gray_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/green_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/green_wings.json
index 120a0f0..bd30ddd 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/green_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/green_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/green"
     }
   ],
-  "result":
-  {
-    "item": "icarus:green_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:green_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/light_blue_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/light_blue_wings.json
index dff0624..322b171 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/light_blue_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/light_blue_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/light_blue"
     }
   ],
-  "result":
-  {
-    "item": "icarus:light_blue_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:light_blue_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/light_gray_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/light_gray_wings.json
index 99d0603..e0abb75 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/light_gray_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/light_gray_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/light_gray"
     }
   ],
-  "result":
-  {
-    "item": "icarus:light_gray_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:light_gray_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/lime_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/lime_wings.json
index e7ee494..22d8d4c 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/lime_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/lime_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/lime"
     }
   ],
-  "result":
-  {
-    "item": "icarus:lime_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:lime_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/magenta_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/magenta_wings.json
index 2f22a24..28e6f43 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/magenta_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/magenta_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/magenta"
     }
   ],
-  "result":
-  {
-    "item": "icarus:magenta_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:magenta_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/orange_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/orange_wings.json
index c70f875..03a022d 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/orange_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/orange_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/orange"
     }
   ],
-  "result":
-  {
-    "item": "icarus:orange_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:orange_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/pink_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/pink_wings.json
index 9837846..91ec1fa 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/pink_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/pink_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/pink"
     }
   ],
-  "result":
-  {
-    "item": "icarus:pink_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:pink_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/purple_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/purple_wings.json
index 0c97c0d..aeddac5 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/purple_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/purple_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/purple"
     }
   ],
-  "result":
-  {
-    "item": "icarus:purple_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:purple_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/red_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/red_wings.json
index 6833155..5bc120a 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/red_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/red_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/red"
     }
   ],
-  "result":
-  {
-    "item": "icarus:red_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:red_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/white_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/white_wings.json
index d9be270..65fbd8c 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/white_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/white_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/white"
     }
   ],
-  "result":
-  {
-    "item": "icarus:white_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:white_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/mechleather/yellow_wings.json b/Common/src/main/resources/data/icarus/recipe/mechleather/yellow_wings.json
index 507b2a0..096eb58 100644
--- a/Common/src/main/resources/data/icarus/recipe/mechleather/yellow_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/mechleather/yellow_wings.json
@@ -1,7 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "ingredients":
-  [
+  "ingredients": [
     {
       "tag": "icarus:mechanical_leather_wings"
     },
@@ -9,8 +8,7 @@
       "tag": "c:dyes/yellow"
     }
   ],
-  "result":
-  {
-    "item": "icarus:yellow_mechanical_leather_wings"
+  "result": {
+    "id": "icarus:yellow_mechanical_leather_wings"
   }
 }
diff --git a/Common/src/main/resources/data/icarus/recipe/zanzas_wings.json b/Common/src/main/resources/data/icarus/recipe/zanzas_wings.json
index 828d313..26be721 100644
--- a/Common/src/main/resources/data/icarus/recipe/zanzas_wings.json
+++ b/Common/src/main/resources/data/icarus/recipe/zanzas_wings.json
@@ -1,33 +1,25 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern":
-  [
+  "pattern": [
     "WWW",
     "NEN",
     "F F"
   ],
-  "key":
-  {
-    "E":
-    {
-      "item": "minecraft:elytra"
+  "key": {
+    "E": {
+      "tag": "icarus:wings_base"
     },
-    "F":
-    {
-      "item": "minecraft:glowstone_dust"
+    "F": {
+      "tag": "c:dusts/glowstone"
     },
-    "N":
-    {
+    "N": {
       "item": "minecraft:nether_star"
     },
-    "W":
-    {
+    "W": {
       "item": "minecraft:honeycomb"
     }
   },
-  "result":
-  {
-    "item": "icarus:zanzas_wings"
+  "result": {
+    "id": "icarus:zanzas_wings"
   }
 }
-
diff --git a/Common/src/main/resources/data/icarus/tags/item/leather.json b/Common/src/main/resources/data/icarus/tags/item/animal_hides.json
similarity index 66%
rename from Common/src/main/resources/data/icarus/tags/item/leather.json
rename to Common/src/main/resources/data/icarus/tags/item/animal_hides.json
index bb2c350..456b148 100644
--- a/Common/src/main/resources/data/icarus/tags/item/leather.json
+++ b/Common/src/main/resources/data/icarus/tags/item/animal_hides.json
@@ -2,10 +2,9 @@
   "replace": false,
   "values":
   [
-    "minecraft:leather",
     "minecraft:rabbit_hide",
     {
-      "id": "#forge:leather",
+      "id": "#c:leather",
       "required": false
     }
   ]
diff --git a/Common/src/main/resources/data/icarus/tags/item/gems.json b/Common/src/main/resources/data/icarus/tags/item/diamonds_and_emeralds.json
similarity index 60%
rename from Common/src/main/resources/data/icarus/tags/item/gems.json
rename to Common/src/main/resources/data/icarus/tags/item/diamonds_and_emeralds.json
index 3a2974c..5a32234 100644
--- a/Common/src/main/resources/data/icarus/tags/item/gems.json
+++ b/Common/src/main/resources/data/icarus/tags/item/diamonds_and_emeralds.json
@@ -3,11 +3,7 @@
   "values":
   [
     {
-      "id": "#c:gems",
-      "required": false
-    },
-    {
-      "id": "#forge:gems/diamond",
+      "id": "#c:gems/diamond",
       "required": false
     },
     {
diff --git a/Common/src/main/resources/data/icarus/tags/item/feathers.json b/Common/src/main/resources/data/icarus/tags/item/feathers.json
index ac9ad57..395868c 100644
--- a/Common/src/main/resources/data/icarus/tags/item/feathers.json
+++ b/Common/src/main/resources/data/icarus/tags/item/feathers.json
@@ -5,10 +5,6 @@
     {
       "id": "#c:feathers",
       "required": false
-    },
-    {
-      "id": "#forge:feathers",
-      "required": false
     }
   ]
 }
diff --git a/Common/src/main/resources/data/icarus/tags/item/leathers.json b/Common/src/main/resources/data/icarus/tags/item/leathers.json
new file mode 100644
index 0000000..da8d12c
--- /dev/null
+++ b/Common/src/main/resources/data/icarus/tags/item/leathers.json
@@ -0,0 +1,9 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "#c:leathers",
+      "required": false
+    }
+  ]
+}
diff --git a/Common/src/main/resources/data/icarus/tags/item/wings_base.json b/Common/src/main/resources/data/icarus/tags/item/wings_base.json
new file mode 100644
index 0000000..a820e02
--- /dev/null
+++ b/Common/src/main/resources/data/icarus/tags/item/wings_base.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "#c:elytra"
+  ]
+}