diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv
index cb314f363..6d18a4b3d 100644
--- a/tools/Conversion_Table.csv
+++ b/tools/Conversion_Table.csv
@@ -19,7 +19,6 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/block,anvil_side.png,/textures,mcl_anvils_anvil_side.png,,,,,,,
 /assets/minecraft/textures/item,name_tag.png,/textures,mobs_nametag.png,,,,,,,
 /assets/minecraft/textures/gui,icons.png,/textures,mobs_blood.png,16,0,9,9,0,0,y
-/assets/minecraft/textures/block,itemframe_background.png,/textures,mcl_itemframes_itemframe_background.png,,,,,,,
 /assets/minecraft/textures/entity/bed,red.png,/textures,mcl_beds_bed_red.png,,,,,,,
 /assets/minecraft/textures/item,acacia_boat.png,/textures,mcl_boats_acacia_boat.png,,,,,,,
 /assets/minecraft/textures/item,oak_boat.png,/textures,mcl_boats_oak_boat.png,,,,,,,
@@ -27,12 +26,12 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/item,dark_oak_boat.png,/textures,mcl_boats_dark_oak_boat.png,,,,,,,
 /assets/minecraft/textures/item,jungle_boat.png,/textures,mcl_boats_jungle_boat.png,,,,,,,
 /assets/minecraft/textures/item,birch_boat.png,/textures,mcl_boats_birch_boat.png,,,,,,,
-/assets/minecraft/textures/entity/boat,boat_acacia.png,/textures,mcl_boats_texture_acacia_boat.png,,,,,,,
-/assets/minecraft/textures/entity/boat,boat_oak.png,/textures,mcl_boats_texture_oak_boat.png,,,,,,,
-/assets/minecraft/textures/entity/boat,boat_darkoak.png,/textures,mcl_boats_texture_dark_oak_boat.png,,,,,,,
-/assets/minecraft/textures/entity/boat,boat_spruce.png,/textures,mcl_boats_texture_spruce_boat.png,,,,,,,
-/assets/minecraft/textures/entity/boat,boat_birch.png,/textures,mcl_boats_texture_birch_boat.png,,,,,,,
-/assets/minecraft/textures/entity/boat,boat_jungle.png,/textures,mcl_boats_texture_jungle_boat.png,,,,,,,
+/assets/minecraft/textures/entity/boat,acacia_boat.png,/textures,mcl_boats_texture_acacia_boat.png,,,,,,,
+/assets/minecraft/textures/entity/boat,oak_boat.png,/textures,mcl_boats_texture_oak_boat.png,,,,,,,
+/assets/minecraft/textures/entity/boat,dark_oak_boat.png,/textures,mcl_boats_texture_dark_oak_boat.png,,,,,,,
+/assets/minecraft/textures/entity/boat,spruce_boat.png,/textures,mcl_boats_texture_spruce_boat.png,,,,,,,
+/assets/minecraft/textures/entity/boat,birch_boat.png,/textures,mcl_boats_texture_birch_boat.png,,,,,,,
+/assets/minecraft/textures/entity/boat,jungle_boat.png,/textures,mcl_boats_texture_jungle_boat.png,,,,,,,
 /assets/minecraft/textures/item,book.png,/textures,default_book.png,,,,,,,
 /assets/minecraft/textures/block,bookshelf.png,/textures,default_bookshelf.png,,,,,,,
 /assets/minecraft/textures/block,oak_planks.png,/textures,mcl_books_bookshelf_top.png,,,,,,,
@@ -53,7 +52,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/block,cocoa_stage_2.png,/textures,mcl_cocoas_cocoa_stage_2.png,,,,,,,y
 /assets/minecraft/textures/block,terracotta.png,/textures,hardened_clay.png,,,,,,,
 /assets/minecraft/textures/block,black_terracotta.png,/textures,hardened_clay_stained_black.png,,,,,,,
-/assets/minecraft/textures/block,blue_terracotta,/textures,hardened_clay_stained_blue.png,,,,,,,
+/assets/minecraft/textures/block,blue_terracotta.png,/textures,hardened_clay_stained_blue.png,,,,,,,
 /assets/minecraft/textures/block,brown_terracotta.png,/textures,hardened_clay_stained_brown.png,,,,,,,
 /assets/minecraft/textures/block,cyan_terracotta.png,/textures,hardened_clay_stained_cyan.png,,,,,,,
 /assets/minecraft/textures/block,gray_terracotta.png,/textures,hardened_clay_stained_grey.png,,,,,,,
@@ -327,7 +326,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/block,end_portal_frame_top.png,/textures,mcl_end_endframe_top.png,,,,,,,
 /assets/minecraft/textures/block,end_stone.png,/textures,mcl_end_end_stone.png,,,,,,,
 /assets/minecraft/textures/item,end_crystal.png,/textures,mcl_end_crystal_item.png,,,,,,,
-/assets/minecraft/textures/entity/endercrystal,endercrystal.png,/textures,mcl_end_crystal.png,,,,,,,
+/assets/minecraft/textures/entity/end_crystal,end_crystal.png,/textures,mcl_end_crystal.png,,,,,,,
 /assets/minecraft/textures/block,purpur_block.png,/textures,mcl_end_purpur_block.png,,,,,,,
 /assets/minecraft/textures/block,purpur_pillar.png,/textures,mcl_end_purpur_pillar.png,,,,,,,
 /assets/minecraft/textures/block,purpur_pillar_top.png,/textures,mcl_end_purpur_pillar_top.png,,,,,,,
@@ -647,25 +646,8 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/block,piston_top.png,/textures,mesecons_piston_pusher_right.png,,,,,,,
 /assets/minecraft/textures/block,piston_top.png,/textures,mesecons_piston_pusher_top.png,,,,,,,
 /assets/minecraft/textures/block,redstone_block.png,/textures,redstone_redstone_block.png,,,,,,,
-/assets/minecraft/textures/item,oak_sign.png,/mods/ITEMS/mcl_signs/textures,default_sign.png,,,,,,,
 /assets/minecraft/textures/block,iron_bars.png,/textures,xpanes_pane_iron.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_black.png,/textures,xpanes_top_glass_black.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_blue.png,/textures,xpanes_top_glass_blue.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_brown.png,/textures,xpanes_top_glass_brown.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_cyan.png,/textures,xpanes_top_glass_cyan.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_gray.png,/textures,xpanes_top_glass_gray.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_green.png,/textures,xpanes_top_glass_green.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_light_blue.png,/textures,xpanes_top_glass_light_blue.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_lime.png,/textures,xpanes_top_glass_lime.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_magenta.png,/textures,xpanes_top_glass_magenta.png,,,,,,,
 /assets/minecraft/textures/block,glass_pane_top.png,/textures,xpanes_top_glass_natural.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_orange.png,/textures,xpanes_top_glass_orange.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_pink.png,/textures,xpanes_top_glass_pink.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_purple.png,/textures,xpanes_top_glass_purple.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_red.png,/textures,xpanes_top_glass_red.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_silver.png,/textures,xpanes_top_glass_silver.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_white.png,/textures,xpanes_top_glass_white.png,,,,,,,
-/assets/minecraft/textures/block,glass_pane_top_yellow.png,/textures,xpanes_top_glass_yellow.png,,,,,,,
 /assets/minecraft/textures/item,totem_of_undying.png,/textures,mcl_totems_totem.png,,,,,,,
 /assets/minecraft/textures/entity,bat.png,/textures,mobs_mc_bat.png,,,,,,,
 /assets/minecraft/textures/entity,blaze.png,/textures,mobs_mc_blaze.png,,,,,,,
@@ -680,7 +662,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/item,diamond_horse_armor.png,/textures,mobs_mc_diamond_horse_armor.png,,,,,,,
 /assets/minecraft/textures/entity/horse,donkey.png,/textures,mobs_mc_donkey.png,,,,,,,
 /assets/minecraft/textures/entity/enderdragon,dragon.png,/textures,mobs_mc_dragon.png,,,,,,,
-/assets/minecraft/textures/entity/shulker,endergolem.png,/textures,mobs_mc_endergolem.png,,,,,,,
+/assets/minecraft/textures/entity/shulker,shulker.png,/textures,mobs_mc_endergolem.png,,,,,,,
 /assets/minecraft/textures/entity/enderman,enderman_eyes.png,/textures,mobs_mc_enderman_eyes.png,,,,,,,
 /assets/minecraft/textures/entity/enderman,enderman.png,/textures,mobs_mc_enderman.png,,,,,,,
 /assets/minecraft/textures/entity,endermite.png,/textures,mobs_mc_endermite.png,,,,,,,
@@ -704,7 +686,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/entity/horse,horse_white.png,/textures,mobs_mc_horse_white.png,,,,,,,
 /assets/minecraft/textures/entity/horse,horse_zombie.png,/textures,mobs_mc_horse_zombie.png,,,,,,,
 /assets/minecraft/textures/entity/zombie,husk.png,/textures,mobs_mc_husk.png,,,,,,,
-/assets/minecraft/textures/entity,iron_golem.png,/textures,mobs_mc_iron_golem.png,,,,,,,
+/assets/minecraft/textures/entity/iron_golem,iron_golem.png,/textures,mobs_mc_iron_golem.png,,,,,,,
 /assets/minecraft/textures/item,iron_horse_armor.png,/textures,mobs_mc_iron_horse_armor.png,,,,,,,
 /assets/minecraft/textures/entity/slime,magmacube.png,/textures,mobs_mc_magmacube.png,,,,,,,
 /assets/minecraft/textures/entity/cow,mooshroom.png,/textures,mobs_mc_mooshroom.png,,,,,,,
@@ -741,23 +723,18 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/entity,silverfish.png,/textures,mobs_mc_silverfish.png,,,,,,,
 /assets/minecraft/textures/entity/skeleton,skeleton.png,/textures,mobs_mc_skeleton.png,,,,,,,
 /assets/minecraft/textures/entity/slime,slime.png,/textures,mobs_mc_slime.png,,,,,,,
-/assets/minecraft/textures/entity,snowman.png,/textures,mobs_mc_snowman.png,,,,,,,
+/assets/minecraft/textures/entity,snow_golem.png,/textures,mobs_mc_snowman.png,,,,,,,
 /assets/minecraft/textures/entity,spider_eyes.png,/textures,mobs_mc_spider_eyes.png,,,,,,,
 /assets/minecraft/textures/entity/spider,spider.png,/textures,mobs_mc_spider.png,,,,,,,
-/assets/minecraft/textures/entity,squid.png,/textures,mobs_mc_squid.png,,,,,,,
+/assets/minecraft/textures/entity/squid,squid.png,/textures,mobs_mc_squid.png,,,,,,,
 /assets/minecraft/textures/entity/skeleton,stray.png,/textures,mobs_mc_stray.png,,,,,,,
 /assets/minecraft/textures/entity/skeleton,stray_overlay.png,/textures,mobs_mc_stray_overlay.png,,,,,,,
-/assets/minecraft/textures/entity/villager,butcher.png,/textures,mobs_mc_villager_butcher.png,,,,,,,
-/assets/minecraft/textures/entity/villager,farmer.png,/textures,mobs_mc_villager_farmer.png,,,,,,,
-/assets/minecraft/textures/entity/villager,librarian.png,/textures,mobs_mc_villager_librarian.png,,,,,,,
 /assets/minecraft/textures/entity/villager,villager.png,/textures,mobs_mc_villager.png,,,,,,,
-/assets/minecraft/textures/entity/villager,priest.png,/textures,mobs_mc_villager_priest.png,,,,,,,
-/assets/minecraft/textures/entity/villager,smith.png,/textures,mobs_mc_villager_smith.png,,,,,,,
 /assets/minecraft/textures/entity/illager,vex.png,/textures,mobs_mc_vex.png,,,,,,,
 /assets/minecraft/textures/entity/illager,vex_charging.png,/textures,mobs_mc_vex_charging.png,,,,,,,
 /assets/minecraft/textures/entity/illager,vindicator.png,/textures,mobs_mc_vindicator.png,,,,,,,
 /assets/minecraft/textures/entity/illager,evoker.png,/textures,mobs_mc_evoker.png,,,,,,,
-/assets/minecraft/textures/entity/illager,illusionist.png,/textures,mobs_mc_illusionist.png,,,,,,,
+/assets/minecraft/textures/entity/illager,illusioner.png,/textures,mobs_mc_illusionist.png,,,,,,,
 /assets/minecraft/textures/entity,witch.png,/textures,mobs_mc_witch.png,,,,,,,
 /assets/minecraft/textures/entity/wither,wither.png,/textures,mobs_mc_wither.png,,,,,,,
 /assets/minecraft/textures/entity/skeleton,wither_skeleton.png,/textures,mobs_mc_wither_skeleton.png,,,,,,,
@@ -765,13 +742,8 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/entity/wolf,wolf_collar.png,/textures,mobs_mc_wolf_collar.png,,,,,,,
 /assets/minecraft/textures/entity/wolf,wolf.png,/textures,mobs_mc_wolf.png,,,,,,,
 /assets/minecraft/textures/entity/wolf,wolf_tame.png,/textures,mobs_mc_wolf_tame.png,,,,,,,
-/assets/minecraft/textures/entity/zombie_villager,zombie_butcher.png,/textures,mobs_mc_zombie_butcher.png,,,,,,,
-/assets/minecraft/textures/entity/zombie_villager,zombie_farmer.png,/textures,mobs_mc_zombie_farmer.png,,,,,,,
-/assets/minecraft/textures/entity/zombie_villager,zombie_librarian.png,/textures,mobs_mc_zombie_librarian.png,,,,,,,
-/assets/minecraft/textures/entity/zombie_villager,zombie_priest.png,/textures,mobs_mc_zombie_priest.png,,,,,,,
-/assets/minecraft/textures/entity/zombie_villager,zombie_smith.png,/textures,mobs_mc_zombie_smith.png,,,,,,,
 /assets/minecraft/textures/entity/zombie_villager,zombie_villager.png,/textures,mobs_mc_zombie_villager.png,,,,,,,
-/assets/minecraft/textures/entity,zombie_pigman.png,/textures,mobs_mc_zombie_pigman.png,,,,,,,
+/assets/minecraft/textures/entity/piglin,zombified_piglin.png,/textures,mobs_mc_zombie_pigman.png,,,,,,,
 /assets/minecraft/textures/entity/zombie,zombie.png,/textures,mobs_mc_zombie.png,,,,,,,
 /assets/minecraft/textures/gui,icons.png,/textures,hbhunger_bgicon.png,16,27,9,9,0,0,y
 /assets/minecraft/textures/gui,icons.png,/textures,hbhunger_icon_health_poison.png,88,0,9,9,0,0,y
@@ -798,11 +770,6 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/block,flower_pot.png,/textures,mcl_flowerpots_flowerpot.png,,,,,,,y
 /assets/minecraft/textures/gui,widgets.png,/textures,mcl_inventory_hotbar.png,0,0,182,22,0,0,y
 /assets/minecraft/textures/gui,widgets.png,/textures,mcl_inventory_hotbar_selected.png,0,22,24,24,0,0,y
-/assets/minecraft/textures/block,bed_head_end.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_side_bottom_red.png,,,,,,,
-/assets/minecraft/textures/block,bed_feet_side.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_side_bottom_r_red.png,,,,,,,
-/assets/minecraft/textures/block,bed_feet_top.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_top_bottom_red.png,,,,,,,
-/assets/minecraft/textures/block,bed_head_side.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_side_top_r_red.png,,,,,,,
-/assets/minecraft/textures/block,bed_head_top.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_top_top_red.png,,,,,,,
 /assets/minecraft/textures/item,compass_00.png,/textures,mcl_compass_compass_00.png,,,,,,,
 /assets/minecraft/textures/item,compass_01.png,/textures,mcl_compass_compass_01.png,,,,,,,
 /assets/minecraft/textures/item,compass_02.png,/textures,mcl_compass_compass_02.png,,,,,,,
@@ -929,19 +896,15 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/entity,banner_base.png,/textures,mcl_banners_banner_base.png,,,,,,,
 /assets/minecraft/textures/entity/banner,base.png,/textures,mcl_banners_base.png,,,,,,,
 /assets/minecraft/textures/block,oak_planks.png,/textures,mcl_banners_fallback_wood.png,,,,,,,
-/assets/minecraft/textures/item,banner_base.png,/textures,mcl_banners_item_base.png,,,,,,,
-/assets/minecraft/textures/item,banner_overlay.png,/textures,mcl_banners_item_overlay.png,,,,,,,
 /assets/minecraft/textures/block,nether_portal.png,/textures,mcl_portals_portal.png,,,,,,,
 /assets/minecraft/textures/entity,end_portal.png,/textures,mcl_portals_end_portal.png,,,,,,,
 /assets/minecraft/textures/environment,end_sky.png,/textures,mcl_playerplus_end_sky.png,,,,,,,
 /assets/minecraft/textures/entity/chest,normal.png,/textures,mcl_chests_normal.png,,,,,,,
-/assets/minecraft/textures/entity/chest,normal_double.png,/textures,mcl_chests_normal_double.png,,,,,,,
 /assets/minecraft/textures/entity/chest,trapped.png,/textures,mcl_chests_trapped.png,,,,,,,
-/assets/minecraft/textures/entity/chest,trapped_double.png,/textures,mcl_chests_trapped_double.png,,,,,,,
 /assets/minecraft/textures/entity/chest,ender.png,/textures,mcl_chests_ender.png,,,,,,,
-/assets/minecraft/textures/block,endframe_top.png,/textures,mcl_portals_endframe_top.png,,,,,,,
-/assets/minecraft/textures/block,endframe_side.png,/textures,mcl_portals_endframe_side.png,,,,,,,
-/assets/minecraft/textures/block,endframe_eye.png,/textures,mcl_portals_endframe_eye.png,,,,,,,
+/assets/minecraft/textures/block,end_portal_frame_top.png,/textures,mcl_portals_endframe_top.png,,,,,,,
+/assets/minecraft/textures/block,end_portal_frame_side.png,/textures,mcl_portals_endframe_side.png,,,,,,,
+/assets/minecraft/textures/block,end_portal_frame_eye.png,/textures,mcl_portals_endframe_eye.png,,,,,,,
 /assets/minecraft/textures/block,end_stone.png,/textures,mcl_portals_endframe_bottom.png,,,,,,,
 /assets/minecraft/textures/block,red_nether_bricks.png,/textures,mcl_fences_fence_red_nether_brick.png,,,,,,,
 /assets/minecraft/textures/block,red_nether_bricks.png,/textures,mcl_fences_fence_gate_red_nether_brick.png,,,,,,,
@@ -981,9 +944,8 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/block,stripped_cherry_log_top.png,/textures,mcl_cherry_blossom_log_top_stripped.png,,,,,,,
 /assets/minecraft/textures/block,stripped_cherry_log.png,/textures,mcl_cherry_blossom_log_stripped.png,,,,,,,
 /assets/minecraft/textures/item,cherry_sign.png,/textures,mcl_cherry_blossom_sign_inv.png,,,,,,,
-/assets/minecraft/textures/item,cherry_chest_boat.png,/textures,mcl_boats_cherry_chest_boat.png,,,,,,,
+/assets/minecraft/textures/entity/chest_boat,cherry.png,/textures,mcl_boats_cherry_chest_boat.png,,,,,,,
 /assets/minecraft/textures/item,cherry_door.png,/textures,mcl_cherry_blossom_door_inv.png,,,,,,,
 /assets/minecraft/textures/item,cherry_boat.png,/textures,mcl_boats_cherry_boat.png,,,,,,,
 /assets/minecraft/textures/entity/signs,cherry.png,/textures,mcl_cherry_blossom_sign.png,,,,,,,
 /assets/minecraft/textures/entity/boat,cherry.png,/textures,mcl_boats_texture_cherry_boat.png,,,,,,,
-/assets/minecraft/textures/entity/chest_boat,cherry.png,/textures,mcl_boats_cherry_chest_boat.png,,,,,,,