diff --git a/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java b/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java
index 0032fc6d4..bff2ba8e5 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java
+++ b/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java
@@ -73,7 +73,9 @@ public class AllShapes {
 				makeCuboidShape(0, 0, 0, 16, 2, 16),
 				makeCuboidShape(1, 1, 1, 15, 15, 15),
 				makeCuboidShape(0, 14, 0, 16, 16, 16)),
-		BASIN_BLOCK_SHAPE = makeCuboidShape(0, 0, 0, 16, 13, 16),//todo can be improved when someone finds the time :D
+		BASIN_BLOCK_SHAPE = VoxelShapes.or(
+				makeCuboidShape(2, 0, 2, 14, 2, 14), 
+				makeCuboidShape(0, 2, 0, 16, 13, 16)),
 		CRUSHING_WHEEL_COLLISION_SHAPE = makeCuboidShape(0, 0, 0, 16, 22, 16),
 		MECHANICAL_PROCESSOR_SHAPE = VoxelShapes.combineAndSimplify(
 				VoxelShapes.fullCube(),
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/IWrenchable.java b/src/main/java/com/simibubi/create/modules/contraptions/IWrenchable.java
new file mode 100644
index 000000000..986f7c183
--- /dev/null
+++ b/src/main/java/com/simibubi/create/modules/contraptions/IWrenchable.java
@@ -0,0 +1,13 @@
+package com.simibubi.create.modules.contraptions;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.item.ItemUseContext;
+import net.minecraft.util.ActionResultType;
+
+public interface IWrenchable {
+
+	public default ActionResultType onWrenched(BlockState state, ItemUseContext context) {
+		return ActionResultType.PASS;
+	}
+
+}
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/WrenchItem.java b/src/main/java/com/simibubi/create/modules/contraptions/WrenchItem.java
index 48c8018e2..cc6b5cdcf 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/WrenchItem.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/WrenchItem.java
@@ -1,7 +1,5 @@
 package com.simibubi.create.modules.contraptions;
 
-import com.simibubi.create.modules.contraptions.base.IRotate;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
@@ -27,9 +25,9 @@ public class WrenchItem extends Item {
 		World world = context.getWorld();
 		BlockPos pos = context.getPos();
 		BlockState state = world.getBlockState(pos);
-		if (!(state.getBlock() instanceof IRotate))
+		if (!(state.getBlock() instanceof IWrenchable))
 			return super.onItemUse(context);
-		IRotate actor = (IRotate) state.getBlock();
+		IWrenchable actor = (IWrenchable) state.getBlock();
 
 		if (player.isSneaking()) {
 			if (world instanceof ServerWorld) {
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/IRotate.java b/src/main/java/com/simibubi/create/modules/contraptions/base/IRotate.java
index 0e33e5f9f..d7da35144 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/base/IRotate.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/base/IRotate.java
@@ -1,17 +1,16 @@
 package com.simibubi.create.modules.contraptions.base;
 
 import com.simibubi.create.CreateConfig;
+import com.simibubi.create.modules.contraptions.IWrenchable;
 
 import net.minecraft.block.BlockState;
-import net.minecraft.item.ItemUseContext;
-import net.minecraft.util.ActionResultType;
 import net.minecraft.util.Direction;
 import net.minecraft.util.Direction.Axis;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 
-public interface IRotate {
+public interface IRotate extends IWrenchable {
 
 	public enum SpeedLevel {
 		NONE, MEDIUM, FAST;
@@ -55,10 +54,6 @@ public interface IRotate {
 
 	public Axis getRotationAxis(BlockState state);
 
-	public default ActionResultType onWrenched(BlockState state, ItemUseContext context) {
-		return ActionResultType.PASS;
-	}
-
 	public default SpeedLevel getMinimumRequiredSpeedLevel() {
 		return SpeedLevel.NONE;
 	}
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTunnelBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTunnelBlock.java
index 40e919e34..4ffca89aa 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTunnelBlock.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTunnelBlock.java
@@ -3,17 +3,20 @@ package com.simibubi.create.modules.contraptions.relays.belt;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.foundation.block.IWithTileEntity;
 import com.simibubi.create.foundation.utility.Lang;
+import com.simibubi.create.modules.contraptions.IWrenchable;
 import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.item.BlockItemUseContext;
+import net.minecraft.item.ItemUseContext;
 import net.minecraft.state.EnumProperty;
 import net.minecraft.state.IProperty;
 import net.minecraft.state.StateContainer.Builder;
 import net.minecraft.state.properties.BlockStateProperties;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ActionResultType;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.Direction;
 import net.minecraft.util.Direction.Axis;
@@ -27,7 +30,7 @@ import net.minecraft.world.IWorld;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 
-public class BeltTunnelBlock extends Block implements IWithTileEntity<BeltTunnelTileEntity> {
+public class BeltTunnelBlock extends Block implements IWithTileEntity<BeltTunnelTileEntity>, IWrenchable {
 
 	public static final IProperty<Shape> SHAPE = EnumProperty.create("shape", Shape.class);
 	public static final IProperty<Axis> HORIZONTAL_AXIS = BlockStateProperties.HORIZONTAL_AXIS;
@@ -38,7 +41,7 @@ public class BeltTunnelBlock extends Block implements IWithTileEntity<BeltTunnel
 	}
 
 	public enum Shape implements IStringSerializable {
-		STRAIGHT, WINDOW, T_LEFT, T_RIGHT, CROSS;
+		STRAIGHT, WINDOW, HALFSHADE, FULLSHADE, T_LEFT, T_RIGHT, CROSS;
 
 		@Override
 		public String getName() {
@@ -80,11 +83,20 @@ public class BeltTunnelBlock extends Block implements IWithTileEntity<BeltTunnel
 
 	@Override
 	public boolean canRenderInLayer(BlockState state, BlockRenderLayer layer) {
-		if (state.get(SHAPE) == Shape.WINDOW)
+		if (hasWindow(state))
 			return layer == BlockRenderLayer.CUTOUT_MIPPED;
 		return super.canRenderInLayer(state, layer);
 	}
 
+	public static boolean hasWindow(BlockState state) {
+		Shape shape = state.get(SHAPE);
+		return shape == Shape.WINDOW || shape == Shape.HALFSHADE || shape == Shape.FULLSHADE;
+	}
+
+	public static boolean isStraight(BlockState state) {
+		return hasWindow(state) || state.get(SHAPE) == Shape.STRAIGHT;
+	}
+
 	@Override
 	public BlockState getStateForPlacement(BlockItemUseContext context) {
 		return getTunnelState(context.getWorld(), context.getPos());
@@ -94,7 +106,14 @@ public class BeltTunnelBlock extends Block implements IWithTileEntity<BeltTunnel
 	public BlockState updatePostPlacement(BlockState state, Direction facing, BlockState facingState, IWorld worldIn,
 			BlockPos currentPos, BlockPos facingPos) {
 		withTileEntityDo(worldIn, currentPos, BeltTunnelTileEntity::initFlaps);
-		return getTunnelState(worldIn, currentPos);
+		BlockState tunnelState = getTunnelState(worldIn, currentPos);
+		
+		if (tunnelState.get(HORIZONTAL_AXIS) == state.get(HORIZONTAL_AXIS)) {
+			if (hasWindow(tunnelState) == hasWindow(state))
+				return state;
+		}
+		
+		return tunnelState;
 	}
 
 	public static void updateTunnel(World world, BlockPos pos) {
@@ -138,6 +157,29 @@ public class BeltTunnelBlock extends Block implements IWithTileEntity<BeltTunnel
 		return state;
 	}
 
+	@Override
+	public ActionResultType onWrenched(BlockState state, ItemUseContext context) {
+		if (!hasWindow(state))
+			return IWrenchable.super.onWrenched(state, context);
+		Shape next = state.get(SHAPE);
+		switch (state.get(SHAPE)) {
+		case FULLSHADE:
+			next = Shape.WINDOW;
+			break;
+		case HALFSHADE:
+			next = Shape.FULLSHADE;
+			break;
+		case WINDOW:
+			next = Shape.HALFSHADE;
+			break;
+		default:
+			break;
+		}
+		if (!context.getWorld().isRemote) 
+			context.getWorld().setBlockState(context.getPos(), state.with(SHAPE, next), 2);
+		return ActionResultType.SUCCESS;
+	}
+
 	@Override
 	public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos,
 			boolean isMoving) {
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTunnelShapes.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTunnelShapes.java
index 29e2cf319..6d840fff0 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTunnelShapes.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTunnelShapes.java
@@ -14,45 +14,22 @@ public class BeltTunnelShapes {
 
 	private static VoxelShape block = makeCuboidShape(0, -5, 0, 16, 16, 16);
 
-	private static VoxelShaper opening = VoxelShaper.forHorizontal( makeCuboidShape(2, -5, 14, 14, 8, 16), Direction.SOUTH);
-	private static VoxelShaper notch = VoxelShaper.forHorizontal(makeCuboidShape(2, 14, 14, 14, 16, 16), Direction.SOUTH);
+	private static VoxelShaper opening = VoxelShaper.forHorizontal(makeCuboidShape(2, -5, 14, 14, 8, 16),
+			Direction.SOUTH);
 
-	private static final VoxelShaper
-			STRAIGHT = VoxelShaper.forHorizontalAxis(
-					VoxelShapes.combineAndSimplify(
-							block,
-							VoxelShapes.or(
-									opening.get(Direction.SOUTH),
-									opening.get(Direction.NORTH),
-									notch.get(Direction.WEST),
-									notch.get(Direction.EAST)
-							),
-							IBooleanFunction.NOT_SAME),
-					Direction.SOUTH),
+	private static final VoxelShaper STRAIGHT = VoxelShaper.forHorizontalAxis(VoxelShapes.combineAndSimplify(block,
+			VoxelShapes.or(opening.get(Direction.SOUTH), opening.get(Direction.NORTH)), IBooleanFunction.NOT_SAME),
+			Direction.SOUTH),
 
 			TEE = VoxelShaper.forHorizontal(
-					VoxelShapes.combineAndSimplify(
-							block,
-							VoxelShapes.or(
-									notch.get(Direction.SOUTH),
-									opening.get(Direction.NORTH),
-									opening.get(Direction.WEST),
-									opening.get(Direction.EAST)
-							),
-							IBooleanFunction.NOT_SAME),
+					VoxelShapes.combineAndSimplify(block, VoxelShapes.or(opening.get(Direction.NORTH),
+							opening.get(Direction.WEST), opening.get(Direction.EAST)), IBooleanFunction.NOT_SAME),
 					Direction.SOUTH);
 
-	private static final VoxelShape
-			CROSS = VoxelShapes.combineAndSimplify(
-					block,
-					VoxelShapes.or(
-							opening.get(Direction.SOUTH),
-							opening.get(Direction.NORTH),
-							opening.get(Direction.WEST),
-							opening.get(Direction.EAST)
-					),
-					IBooleanFunction.NOT_SAME);
-
+	private static final VoxelShape CROSS = VoxelShapes.combineAndSimplify(block,
+			VoxelShapes.or(opening.get(Direction.SOUTH), opening.get(Direction.NORTH), opening.get(Direction.WEST),
+					opening.get(Direction.EAST)),
+			IBooleanFunction.NOT_SAME);
 
 	public static VoxelShape getShape(BlockState state) {
 		BeltTunnelBlock.Shape shape = state.get(BeltTunnelBlock.SHAPE);
@@ -61,7 +38,7 @@ public class BeltTunnelShapes {
 		if (shape == BeltTunnelBlock.Shape.CROSS)
 			return CROSS;
 
-		if (shape == BeltTunnelBlock.Shape.STRAIGHT || shape == BeltTunnelBlock.Shape.WINDOW)
+		if (BeltTunnelBlock.isStraight(state))
 			return STRAIGHT.get(axis);
 
 		if (shape == BeltTunnelBlock.Shape.T_LEFT)
@@ -70,7 +47,7 @@ public class BeltTunnelShapes {
 		if (shape == BeltTunnelBlock.Shape.T_RIGHT)
 			return TEE.get(axis == Direction.Axis.Z ? Direction.WEST : Direction.SOUTH);
 
-		//something went wrong
+		// something went wrong
 		return VoxelShapes.fullCube();
 	}
 }
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTunnelTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTunnelTileEntity.java
index 3f73cda33..d6c6edb09 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTunnelTileEntity.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTunnelTileEntity.java
@@ -101,7 +101,7 @@ public class BeltTunnelTileEntity extends SyncedTileEntity implements ITickableT
 				boolean positive = direction.getAxisDirection() == AxisDirection.POSITIVE
 						^ direction.getAxis() == Axis.Z;
 				Shape shape = tunnelState.get(BeltTunnelBlock.SHAPE);
-				if (shape == Shape.STRAIGHT || shape == Shape.WINDOW)
+				if (BeltTunnelBlock.isStraight(tunnelState))
 					continue;
 				if (positive && shape == Shape.T_LEFT)
 					continue;
diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/BeltFunnelBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/BeltFunnelBlock.java
deleted file mode 100644
index 45f2a0444..000000000
--- a/src/main/java/com/simibubi/create/modules/logistics/block/BeltFunnelBlock.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.simibubi.create.modules.logistics.block;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
-import com.simibubi.create.AllBlocks;
-import com.simibubi.create.foundation.block.IWithTileEntity;
-import com.simibubi.create.foundation.utility.VecHelper;
-import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.BeltAttachmentState;
-import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.IBeltAttachment;
-import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock;
-import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope;
-import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.block.HorizontalBlock;
-import net.minecraft.block.material.PushReaction;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.ItemEntity;
-import net.minecraft.item.BlockItemUseContext;
-import net.minecraft.state.StateContainer.Builder;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.math.shapes.ISelectionContext;
-import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.util.math.shapes.VoxelShapes;
-import net.minecraft.world.IBlockReader;
-import net.minecraft.world.IWorld;
-import net.minecraft.world.IWorldReader;
-import net.minecraft.world.World;
-
-public class BeltFunnelBlock extends HorizontalBlock implements IBeltAttachment, IWithTileEntity<BeltFunnelTileEntity> {
-
-	public static final VoxelShape 
-			SHAPE_NORTH = makeCuboidShape(3, -4, -1, 13, 8, 5),
-			SHAPE_SOUTH = makeCuboidShape(3, -4, 11, 13, 8, 17), 
-			SHAPE_WEST = makeCuboidShape(-1, -4, 3, 5, 8, 13),
-			SHAPE_EAST = makeCuboidShape(11, -4, 3, 17, 8, 13);
-
-	public BeltFunnelBlock() {
-		super(Properties.from(Blocks.ANDESITE));
-	}
-
-	@Override
-	public boolean hasTileEntity(BlockState state) {
-		return true;
-	}
-
-	@Override
-	public TileEntity createTileEntity(BlockState state, IBlockReader world) {
-		return new BeltFunnelTileEntity();
-	}
-
-	@Override
-	protected void fillStateContainer(Builder<Block, BlockState> builder) {
-		builder.add(HORIZONTAL_FACING);
-		super.fillStateContainer(builder);
-	}
-
-	@Override
-	public BlockState getStateForPlacement(BlockItemUseContext context) {
-		BlockState state = getDefaultState();
-
-		if (context.getFace().getAxis().isHorizontal()) {
-			state = state.with(HORIZONTAL_FACING, context.getFace().getOpposite());
-		} else {
-			state = state.with(HORIZONTAL_FACING, context.getPlacementHorizontalFacing());
-		}
-
-		return state;
-	}
-
-	@Override
-	public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) {
-		Direction facing = state.get(HORIZONTAL_FACING);
-
-		if (facing == Direction.EAST)
-			return SHAPE_EAST;
-		if (facing == Direction.WEST)
-			return SHAPE_WEST;
-		if (facing == Direction.SOUTH)
-			return SHAPE_SOUTH;
-		if (facing == Direction.NORTH)
-			return SHAPE_NORTH;
-
-		return VoxelShapes.empty();
-	}
-
-	@Override
-	public void onBlockAdded(BlockState state, World worldIn, BlockPos pos, BlockState oldState, boolean isMoving) {
-		onAttachmentPlaced(worldIn, pos, state);
-		updateObservedInventory(state, worldIn, pos);
-	}
-
-	@Override
-	public void onNeighborChange(BlockState state, IWorldReader world, BlockPos pos, BlockPos neighbor) {
-		if (!neighbor.equals(pos.offset(state.get(HORIZONTAL_FACING))))
-			return;
-		updateObservedInventory(state, world, pos);
-	}
-
-	private void updateObservedInventory(BlockState state, IWorldReader world, BlockPos pos) {
-		IInventoryManipulator te = (IInventoryManipulator) world.getTileEntity(pos);
-		if (te == null)
-			return;
-		te.neighborChanged();
-	}
-
-	@Override
-	public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) {
-		onAttachmentRemoved(worldIn, pos, state);
-		if (state.hasTileEntity() && state.getBlock() != newState.getBlock()) {
-			worldIn.removeTileEntity(pos);
-		}
-	}
-
-	@Override
-	public List<BlockPos> getPotentialAttachmentLocations(BeltTileEntity te) {
-		return Arrays.asList(te.getPos().up());
-	}
-
-	@Override
-	public Optional<BlockPos> getValidBeltPositionFor(IWorld world, BlockPos pos, BlockState state) {
-		BlockPos validPos = pos.down();
-		BlockState blockState = world.getBlockState(validPos);
-		if (!AllBlocks.BELT.typeOf(blockState)
-				|| blockState.get(HORIZONTAL_FACING).getAxis() != state.get(HORIZONTAL_FACING).getAxis())
-			return Optional.empty();
-		return Optional.of(validPos);
-	}
-
-	@Override
-	public boolean handleEntity(BeltTileEntity te, Entity entity, BeltAttachmentState state) {
-		if (!(entity instanceof ItemEntity))
-			return false;
-		boolean slope = te.getBlockState().get(BeltBlock.SLOPE) != Slope.HORIZONTAL;
-		if (entity.getPositionVec().distanceTo(VecHelper.getCenterOf(te.getPos())) > (slope ? .6f : .4f))
-			return false;
-
-		entity.setMotion(Vec3d.ZERO);
-		withTileEntityDo(te.getWorld(), state.attachmentPos, funnelTE -> {
-			funnelTE.tryToInsert((ItemEntity) entity);
-		});
-
-		return true;
-	}
-	
-	@Override
-	public PushReaction getPushReaction(BlockState state) {
-		return PushReaction.BLOCK;
-	}
-
-}
diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltFunnelBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltFunnelBlock.java
index e23ce5c3e..1e23564d3 100644
--- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltFunnelBlock.java
+++ b/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltFunnelBlock.java
@@ -20,6 +20,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.HorizontalBlock;
+import net.minecraft.block.material.PushReaction;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.BlockItemUseContext;
 import net.minecraft.item.ItemStack;
@@ -216,5 +217,10 @@ public class BeltFunnelBlock extends HorizontalBlock implements IBeltAttachment,
 	public Direction getFilterFacing(BlockState state) {
 		return state.get(HORIZONTAL_FACING).getOpposite();
 	}
+	
+	@Override
+	public PushReaction getPushReaction(BlockState state) {
+		return PushReaction.BLOCK;
+	}
 
 }
diff --git a/src/main/resources/assets/create/blockstates/belt_tunnel.json b/src/main/resources/assets/create/blockstates/belt_tunnel.json
index 25965e395..28fb1709d 100644
--- a/src/main/resources/assets/create/blockstates/belt_tunnel.json
+++ b/src/main/resources/assets/create/blockstates/belt_tunnel.json
@@ -3,7 +3,9 @@
   "variants": {
     "shape": {
       "straight": { "model": "create:block/belt_tunnel/straight" },
-      "window": { "model": "create:block/belt_tunnel/window" },
+      "window": { "model": "create:block/belt_tunnel/straight_windowed" },
+      "halfshade": { "model": "create:block/belt_tunnel/straight_halfshade" },
+      "fullshade": { "model": "create:block/belt_tunnel/straight_fullshade" },
       "t_left": { "model": "create:block/belt_tunnel/t_left" },
       "t_right": { "model": "create:block/belt_tunnel/t_right" },
       "cross": { "model": "create:block/belt_tunnel/cross" }
diff --git a/src/main/resources/assets/create/models/block/basin.json b/src/main/resources/assets/create/models/block/basin.json
index ebcb1694a..be76f1771 100644
--- a/src/main/resources/assets/create/models/block/basin.json
+++ b/src/main/resources/assets/create/models/block/basin.json
@@ -1,7 +1,7 @@
 {
 	"credit": "Made with Blockbench",
-	"parent": "block/cube",
-	"ambientocclusion": false,
+	"parent": "block/block",
+	"ambientocclusion": true,
 	"textures": {
 		"12": "create:block/basin",
 		"particle": "create:block/basin"
@@ -9,161 +9,76 @@
 	"elements": [
 		{
 			"name": "Side1",
-			"from": [0, 5, 0],
+			"from": [0, 2, 0],
 			"to": [2, 13, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]},
 			"faces": {
-				"north": {"uv": [7, 0, 8, 4], "texture": "#12"},
-				"east": {"uv": [0, 0, 8, 4.5], "texture": "#12"},
-				"south": {"uv": [0, 0, 1, 4], "texture": "#12"},
-				"west": {"uv": [0, 0, 8, 4], "texture": "#12"},
+				"north": {"uv": [7, 0, 8, 5.5], "texture": "#12"},
+				"east": {"uv": [0, 0, 8, 5.5], "texture": "#12"},
+				"south": {"uv": [0, 0, 1, 5.5], "texture": "#12"},
+				"west": {"uv": [0, 0, 8, 5.5], "texture": "#12"},
 				"up": {"uv": [8, 0, 9, 8], "texture": "#12"},
 				"down": {"uv": [8, 0, 9, 8], "texture": "#12"}
 			}
 		},
-		{
-			"name": "Leg1",
-			"from": [0, 0, 0],
-			"to": [2, 5, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]},
-			"faces": {
-				"north": {"uv": [7, 4, 8, 6.5], "texture": "#12"},
-				"east": {"uv": [7, 4, 8, 6.5], "texture": "#12"},
-				"south": {"uv": [0, 4, 1, 6.5], "texture": "#12"},
-				"west": {"uv": [0, 4, 1, 6.5], "texture": "#12"},
-				"down": {"uv": [7, 5.5, 8, 6.5], "texture": "#12"}
-			}
-		},
-		{
-			"name": "Leg2",
-			"from": [0, 0, 14],
-			"to": [2, 5, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 22]},
-			"faces": {
-				"north": {"uv": [7, 4, 8, 6.5], "texture": "#12"},
-				"east": {"uv": [0, 4, 1, 6.5], "texture": "#12"},
-				"south": {"uv": [0, 4, 1, 6.5], "texture": "#12"},
-				"west": {"uv": [7, 4.5, 8, 6.5], "texture": "#12"},
-				"down": {"uv": [1, 10, 2, 11], "texture": "#12"}
-			}
-		},
-		{
-			"name": "Leg3",
-			"from": [14, 0, 0],
-			"to": [16, 5, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]},
-			"faces": {
-				"north": {"uv": [0, 4, 1, 6.5], "texture": "#12"},
-				"east": {"uv": [7, 4, 8, 6.5], "texture": "#12"},
-				"south": {"uv": [7, 4, 8, 6.5], "texture": "#12"},
-				"west": {"uv": [0, 4, 1, 6.5], "texture": "#12"},
-				"down": {"uv": [0, 5.5, 1, 6.5], "texture": "#12"}
-			}
-		},
-		{
-			"name": "Leg4",
-			"from": [14, 0, 14],
-			"to": [16, 5, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 22]},
-			"faces": {
-				"north": {"uv": [0, 4, 1, 6.5], "texture": "#12"},
-				"east": {"uv": [0, 4, 1, 6.5], "texture": "#12"},
-				"south": {"uv": [7, 4, 8, 6.5], "texture": "#12"},
-				"west": {"uv": [7, 4, 8, 6.5], "texture": "#12"},
-				"down": {"uv": [1, 11, 2, 12], "texture": "#12"}
-			}
-		},
-		{
-			"name": "Bottom1",
-			"from": [2, 1, 2],
-			"to": [4, 6, 14],
-			"rotation": {"angle": 22.5, "axis": "z", "origin": [2, 1, 8]},
-			"faces": {
-				"east": {"uv": [1, 4.5, 7, 7], "texture": "#12"},
-				"west": {"uv": [1, 4.5, 7, 7], "texture": "#12"}
-			}
-		},
-		{
-			"name": "Bottom2",
-			"from": [2, 1, 12],
-			"to": [14, 6, 14],
-			"rotation": {"angle": 22.5, "axis": "x", "origin": [4, 1, 14]},
-			"faces": {
-				"north": {"uv": [1, 4.5, 7, 7], "texture": "#12"},
-				"south": {"uv": [1, 4.5, 7, 7], "texture": "#12"}
-			}
-		},
-		{
-			"name": "Bottom4",
-			"from": [2, 1, 2],
-			"to": [14, 6, 4],
-			"rotation": {"angle": -22.5, "axis": "x", "origin": [4, 1, 2]},
-			"faces": {
-				"north": {"uv": [1, 4.5, 7, 7], "texture": "#12"},
-				"south": {"uv": [1, 4.5, 7, 7], "texture": "#12"}
-			}
-		},
-		{
-			"name": "Bottom3",
-			"from": [12, 1, 2],
-			"to": [14, 6, 14],
-			"rotation": {"angle": -22.5, "axis": "z", "origin": [14, 1, 8]},
-			"faces": {
-				"east": {"uv": [1, 4.5, 7, 7], "texture": "#12"},
-				"west": {"uv": [1, 4.5, 7, 7], "texture": "#12"}
-			}
-		},
 		{
 			"name": "BasinBottom",
 			"from": [2, 0, 2],
 			"to": [14, 2, 14],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 25, 8]},
 			"faces": {
-				"north": {"uv": [1, 6.5, 7, 7.5], "texture": "#12"},
-				"east": {"uv": [1, 6.5, 7, 7.5], "texture": "#12"},
-				"south": {"uv": [1, 6.5, 7, 7.5], "texture": "#12"},
-				"west": {"uv": [1, 6.5, 7, 7.5], "texture": "#12"},
+				"north": {"uv": [1, 5.5, 7, 6.5], "texture": "#12"},
+				"east": {"uv": [1, 5.5, 7, 6.5], "texture": "#12"},
+				"south": {"uv": [1, 5.5, 7, 6.5], "texture": "#12"},
+				"west": {"uv": [1, 5.5, 7, 6.5], "texture": "#12"},
 				"up": {"uv": [0, 10, 6, 16], "texture": "#12"},
 				"down": {"uv": [0, 10, 6, 16], "rotation": 90, "texture": "#12"}
 			}
 		},
 		{
 			"name": "Side4",
-			"from": [2, 5, 0],
+			"from": [2, 2, 0],
 			"to": [14, 13, 2],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]},
 			"faces": {
-				"north": {"uv": [1, 0, 7, 4], "texture": "#12"},
-				"south": {"uv": [0, 0, 8, 4.5], "texture": "#12"},
+				"north": {"uv": [1, 0, 7, 5.5], "texture": "#12"},
+				"south": {"uv": [0, 0, 8, 5.5], "texture": "#12"},
 				"up": {"uv": [9, 0, 15, 1], "texture": "#12"},
 				"down": {"uv": [9, 7, 15, 8], "texture": "#12"}
 			}
 		},
 		{
 			"name": "Side2",
-			"from": [2, 5, 14],
+			"from": [2, 2, 14],
 			"to": [14, 13, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]},
 			"faces": {
-				"north": {"uv": [1, 0, 7, 4.5], "texture": "#12"},
-				"south": {"uv": [1, 0, 7, 4], "texture": "#12"},
+				"north": {"uv": [1, 0, 7, 5.5], "texture": "#12"},
+				"south": {"uv": [1, 0, 7, 5.5], "texture": "#12"},
 				"up": {"uv": [9, 7, 15, 8], "texture": "#12"},
 				"down": {"uv": [9, 0, 15, 1], "texture": "#12"}
 			}
 		},
 		{
 			"name": "Side3",
-			"from": [14, 5, 0],
+			"from": [14, 2, 0],
 			"to": [16, 13, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 40, 8]},
 			"faces": {
-				"north": {"uv": [0, 0, 1, 4], "texture": "#12"},
-				"east": {"uv": [0, 0, 8, 4], "texture": "#12"},
-				"south": {"uv": [7, 0, 8, 4], "texture": "#12"},
-				"west": {"uv": [0, 0, 8, 4.5], "texture": "#12"},
+				"north": {"uv": [0, 0, 1, 5.5], "texture": "#12"},
+				"east": {"uv": [0, 0, 8, 5.5], "texture": "#12"},
+				"south": {"uv": [7, 0, 8, 5.5], "texture": "#12"},
+				"west": {"uv": [0, 0, 8, 5.5], "texture": "#12"},
 				"up": {"uv": [15, 0, 16, 8], "texture": "#12"},
 				"down": {"uv": [15, 0, 16, 8], "texture": "#12"}
 			}
 		}
+	],
+	"groups": [
+		{
+			"name": "Basin",
+			"origin": [8, 8, 8],
+			"children": [0, 1, 2, 3, 4]
+		}
 	]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/cross.json b/src/main/resources/assets/create/models/block/belt_tunnel/cross.json
index 8c92f774c..81c29b76d 100644
--- a/src/main/resources/assets/create/models/block/belt_tunnel/cross.json
+++ b/src/main/resources/assets/create/models/block/belt_tunnel/cross.json
@@ -2,186 +2,176 @@
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
-		"0": "create:block/belttunnel",
-		"particle": "create:block/belttunnel"
+		"0": "create:block/belt_tunnel",
+		"particle": "create:block/belt_tunnel"
 	},
 	"elements": [
+		{
+			"name": "LeftWall",
+			"from": [2, 8, 0],
+			"to": [14, 16, 2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-9, -24, 8]},
+			"faces": {
+				"north": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"east": {"uv": [3.5, 4, 4, 6], "texture": "#0"},
+				"south": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"west": {"uv": [0, 4, 0.5, 6], "texture": "#0"},
+				"up": {"uv": [0.5, 3.5, 3.5, 4], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.75, 4, 3.5, 4.5], "texture": "#0"}
+			}
+		},
 		{
 			"name": "TopPiece",
 			"from": [2, 14, 2],
 			"to": [14, 16, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, -24, 8]},
 			"faces": {
-				"north": {"uv": [16, 0, 10, 1], "texture": "#0"},
-				"south": {"uv": [16, 0, 10, 1], "texture": "#0"},
-				"up": {"uv": [1, 15, 7, 9], "texture": "#0"},
-				"down": {"uv": [7, 9, 1, 15], "rotation": 90, "texture": "#0"}
+				"up": {"uv": [0.5, 0.5, 3.5, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 0.5, 3.5, 3.5], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"name": "BackLeft",
-			"from": [14, -5, 0],
-			"to": [16, -3, 1],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [10, 15, 9, 16], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [9.5, 15, 9, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [10, 15, 9, 16], "texture": "#0"},
-				"west": {"uv": [10, 15, 9.5, 16], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "BackLeft",
-			"from": [0, -5, 0],
-			"to": [2, -3, 1],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [9, 15, 10, 16], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [9.5, 15, 10, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [9, 15, 10, 16], "texture": "#0"},
-				"west": {"uv": [9, 15, 9.5, 16], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "BackLeft",
-			"from": [14, -5, 15],
-			"to": [16, -3, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [9, 15, 10, 16], "texture": "#0"},
-				"east": {"uv": [9, 15, 9.5, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [9, 15, 10, 16], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [9.5, 15, 10, 16], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "BackLeft",
-			"from": [0, -5, 15],
-			"to": [2, -3, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [10, 15, 9, 16], "texture": "#0"},
-				"east": {"uv": [10, 15, 9.5, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [10, 15, 9, 16], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [9.5, 15, 9, 16], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "FrontLeft",
-			"from": [14, -3, 0],
-			"to": [16, 8, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [10, 9.5, 9, 15], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [10, 9.5, 9, 15], "texture": "#0"},
-				"south": {"uv": [10, 9.5, 9, 15], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [10, 9.5, 9, 15], "texture": "#0"}
-			}
-		},
-		{
-			"name": "FrontLeft",
-			"from": [0, -3, 0],
-			"to": [2, 8, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [9, 9.5, 10, 15], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [9, 9.5, 10, 15], "texture": "#0"},
-				"south": {"uv": [9, 9.5, 10, 15], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [9, 9.5, 10, 15], "texture": "#0"}
-			}
-		},
-		{
-			"name": "FrontLeft",
-			"from": [14, -3, 14],
-			"to": [16, 8, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [9, 9.5, 10, 15], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [9, 9.5, 10, 15], "texture": "#0"},
-				"south": {"uv": [9, 9.5, 10, 15], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [9, 9.5, 10, 15], "texture": "#0"}
-			}
-		},
-		{
-			"name": "FrontLeft",
+			"name": "LeftT",
 			"from": [0, -3, 14],
-			"to": [2, 8, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"to": [2, 16, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
 			"faces": {
-				"north": {"uv": [10, 9.5, 9, 15], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [10, 9.5, 9, 15], "texture": "#0"},
-				"south": {"uv": [10, 9.5, 9, 15], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [10, 9.5, 9, 15], "texture": "#0"}
+				"north": {"uv": [7.5, 3.5, 8, 8.25], "texture": "#0"},
+				"east": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"south": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"west": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 3.5, 0.5, 4], "texture": "#0"}
+			}
+		},
+		{
+			"name": "LeftT",
+			"from": [0, -3, 0],
+			"to": [2, 16, 2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"faces": {
+				"north": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"east": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"south": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"west": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 3.5, 0.5, 4], "texture": "#0"}
+			}
+		},
+		{
+			"name": "RightT",
+			"from": [14, -3, 14],
+			"to": [16, 16, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"faces": {
+				"north": {"uv": [4, 3.5, 4.5, 8.25], "texture": "#0"},
+				"east": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"south": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"west": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"up": {"uv": [3.5, 3.5, 4, 4], "texture": "#0"}
+			}
+		},
+		{
+			"name": "RightT",
+			"from": [14, -3, 0],
+			"to": [16, 16, 2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"faces": {
+				"north": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"east": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"south": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"west": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"up": {"uv": [3.5, 3.5, 4, 4], "texture": "#0"}
+			}
+		},
+		{
+			"name": "LeftTRail",
+			"from": [0, -5, 15],
+			"to": [1, -3, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 23]},
+			"faces": {
+				"north": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"east": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"south": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"west": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "LeftTRail",
+			"from": [0, -5, 0],
+			"to": [1, -3, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"faces": {
+				"north": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"east": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"south": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"west": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "RIghtTRail",
+			"from": [15, -5, 15],
+			"to": [16, -3, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 23]},
+			"faces": {
+				"north": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"east": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"south": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"west": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "RIghtTRail",
+			"from": [15, -5, 0],
+			"to": [16, -3, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"faces": {
+				"north": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"east": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"south": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"west": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"}
 			}
 		},
 		{
 			"name": "FrontTop",
-			"from": [14, 8, 0],
-			"to": [16, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"from": [0, 8, 2],
+			"to": [2, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
 			"faces": {
-				"north": {"uv": [10, 8, 9, 12], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [16, 2.5, 8, 6.5], "texture": "#0"},
-				"south": {"uv": [10, 8, 9, 12], "texture": "#0"},
-				"west": {"uv": [8, 0, 0, 4], "texture": "#0"},
-				"up": {"uv": [7, 16, 8, 8], "texture": "#0"},
-				"down": {"uv": [16, 2.5, 8, 3.5], "rotation": 90, "texture": "#0"}
+				"east": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"west": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"up": {"uv": [3.5, 0.5, 4, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 5.5, 3.5, 6], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"name": "BackTop",
-			"from": [2, 8, 0],
-			"to": [14, 16, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
-			"faces": {
-				"north": {"uv": [15, 2.5, 9, 6.5], "texture": "#0"},
-				"east": {"uv": [10, 8, 9, 12], "texture": "#0"},
-				"south": {"uv": [8, 0, 0, 4], "texture": "#0"},
-				"west": {"uv": [10, 8, 9, 12], "rotation": 180, "texture": "#0"},
-				"up": {"uv": [1, 8, 0, 16], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [8, 6.5, 16, 5.5], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "BackTop",
+			"name": "TTop",
 			"from": [2, 8, 14],
 			"to": [14, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
 			"faces": {
-				"north": {"uv": [0, 0, 8, 4], "texture": "#0"},
-				"east": {"uv": [9, 8, 10, 12], "texture": "#0"},
-				"south": {"uv": [9, 2.5, 15, 6.5], "texture": "#0"},
-				"west": {"uv": [9, 8, 10, 12], "rotation": 180, "texture": "#0"},
-				"up": {"uv": [0, 8, 1, 16], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [8, 5.5, 16, 6.5], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"south": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"up": {"uv": [0.5, 3.5, 3.5, 4], "texture": "#0"},
+				"down": {"uv": [0.5, 5.5, 3.5, 6], "texture": "#0"}
 			}
 		},
 		{
 			"name": "BackTop",
-			"from": [0, 8, 0],
-			"to": [2, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"from": [14, 8, 2],
+			"to": [16, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -8, 8]},
 			"faces": {
-				"north": {"uv": [10, 8, 9, 12], "texture": "#0"},
-				"east": {"uv": [8, 0, 0, 4], "texture": "#0"},
-				"south": {"uv": [10, 8, 9, 12], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [16, 2.5, 8, 6.5], "texture": "#0"},
-				"up": {"uv": [0, 16, 1, 8], "texture": "#0"},
-				"down": {"uv": [16, 5.5, 8, 6.5], "rotation": 90, "texture": "#0"}
+				"east": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"west": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"up": {"uv": [0, 0.5, 0.5, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 4, 3.5, 4.5], "rotation": 270, "texture": "#0"}
 			}
 		}
 	],
 	"groups": [
 		{
-			"name": "belttunnel",
+			"name": "Cover",
 			"origin": [8, 8, 8],
-			"children": [
-				{
-					"name": "Cover",
-					"origin": [8, 8, 8],
-					"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
-				}
-			]
+			"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
 		}
 	]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/flap.json b/src/main/resources/assets/create/models/block/belt_tunnel/flap.json
index f5e91442b..b1b1e371e 100644
--- a/src/main/resources/assets/create/models/block/belt_tunnel/flap.json
+++ b/src/main/resources/assets/create/models/block/belt_tunnel/flap.json
@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
-		"0": "create:block/belttunnel",
-		"particle": "create:block/belttunnel"
+		"0": "create:block/belt_tunnel",
+		"particle": "create:block/belt_tunnel"
 	},
 	"elements": [
 		{
@@ -12,12 +12,12 @@
 			"to": [15.5, 8.5, 14],
 			"rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 8]},
 			"faces": {
-				"north": {"uv": [1, 4, 1.5, 9], "texture": "#0"},
-				"east": {"uv": [1, 4, 2.5, 9], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [2, 4, 2.5, 9], "texture": "#0"},
-				"west": {"uv": [1, 4, 2.5, 9], "texture": "#0"},
-				"up": {"uv": [1, 4, 2.5, 4.5], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [1, 4, 2.5, 4.5], "rotation": 270, "texture": "#0"}
+				"north": {"uv": [4, 0, 4.25, 2.5], "texture": "#0"},
+				"east": {"uv": [4, 0, 4.75, 2.5], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [4.5, 0, 4.75, 2.5], "texture": "#0"},
+				"west": {"uv": [4, 0, 4.75, 2.5], "texture": "#0"},
+				"up": {"uv": [4, 1.25, 4.75, 1.5], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [4, 1, 4.75, 1.25], "rotation": 270, "texture": "#0"}
 			}
 		}
 	],
diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/item.json b/src/main/resources/assets/create/models/block/belt_tunnel/item.json
index d25e2ab05..dc73dabf0 100644
--- a/src/main/resources/assets/create/models/block/belt_tunnel/item.json
+++ b/src/main/resources/assets/create/models/block/belt_tunnel/item.json
@@ -2,256 +2,204 @@
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
-		"0": "create:block/belttunnel",
-		"particle": "create:block/belttunnel"
+		"0": "create:block/belt_tunnel",
+		"particle": "create:block/belt_tunnel"
 	},
 	"elements": [
 		{
 			"name": "LeftWall",
-			"from": [2, -3, 0],
-			"to": [14, 14, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"from": [0, -3, 0],
+			"to": [16, 16, 2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-9, -24, 8]},
 			"faces": {
-				"north": {"uv": [10, 7.5, 16, 16], "texture": "#0"},
-				"south": {"uv": [10, 7.5, 16, 16], "texture": "#0"},
-				"up": {"uv": [10, 1, 16, 2], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [4, 3.5, 8, 8.25], "texture": "#0"},
+				"east": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"south": {"uv": [4, 3.5, 8, 8.25], "texture": "#0"},
+				"west": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 3.5, 4, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
 			"name": "TopPiece",
 			"from": [2, 14, 2],
 			"to": [14, 16, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [24, -24, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, -24, 8]},
 			"faces": {
-				"north": {"uv": [10, 0, 16, 1], "texture": "#0"},
-				"south": {"uv": [10, 0, 16, 1], "texture": "#0"},
-				"up": {"uv": [1, 9, 7, 15], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [1, 9, 7, 15], "rotation": 270, "texture": "#0"}
+				"up": {"uv": [0.5, 0.5, 3.5, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 0.5, 3.5, 3.5], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
 			"name": "RightWall",
-			"from": [2, -3, 14],
-			"to": [14, 14, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"from": [0, -3, 14],
+			"to": [16, 16, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
 			"faces": {
-				"north": {"uv": [10, 7.5, 16, 16], "texture": "#0"},
-				"south": {"uv": [10, 7.5, 16, 16], "texture": "#0"},
-				"up": {"uv": [10, 1, 16, 2], "texture": "#0"}
+				"north": {"uv": [4, 3.5, 8, 8.25], "texture": "#0"},
+				"east": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"south": {"uv": [4, 3.5, 8, 8.25], "texture": "#0"},
+				"west": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
 			"name": "LeftRail",
 			"from": [0, -5, 0],
 			"to": [16, -3, 1],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
 			"faces": {
-				"north": {"uv": [8, 6.5, 16, 7.5], "texture": "#0"},
-				"east": {"uv": [9, 13, 9.5, 14], "texture": "#0"},
-				"south": {"uv": [8, 6.5, 16, 7.5], "texture": "#0"},
-				"west": {"uv": [9, 15, 9.5, 16], "texture": "#0"},
-				"up": {"uv": [8, 7, 16, 7.5], "texture": "#0"}
+				"north": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"east": {"uv": [7.75, 8.25, 8, 8.75], "texture": "#0"},
+				"south": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"west": {"uv": [4, 7.25, 4.25, 7.75], "texture": "#0"}
 			}
 		},
 		{
 			"name": "RightRail",
 			"from": [0, -5, 15],
 			"to": [16, -3, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 23]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 23]},
 			"faces": {
-				"north": {"uv": [8, 6.5, 16, 7.5], "texture": "#0"},
-				"east": {"uv": [9, 13, 9.5, 14], "texture": "#0"},
-				"south": {"uv": [8, 6.5, 16, 7.5], "texture": "#0"},
-				"west": {"uv": [9, 15, 9.5, 16], "texture": "#0"},
-				"up": {"uv": [8, 7, 16, 7.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "FrontRight",
-			"from": [0, -3, 14],
-			"to": [2, 8, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
-			"faces": {
-				"north": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"east": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"west": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "BackRight",
-			"from": [14, -3, 14],
-			"to": [16, 8, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
-			"faces": {
-				"north": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"south": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [9, 10.5, 10, 16], "texture": "#0"}
-			}
-		},
-		{
-			"name": "BackLeft",
-			"from": [14, -3, 0],
-			"to": [16, 8, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
-			"faces": {
-				"north": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"east": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"west": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "FrontLeft",
-			"from": [0, -3, 0],
-			"to": [2, 8, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
-			"faces": {
-				"north": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"south": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [9, 10.5, 10, 16], "texture": "#0"}
+				"north": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"east": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"south": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"west": {"uv": [3.75, 7.25, 4, 7.75], "texture": "#0"}
 			}
 		},
 		{
 			"name": "FrontTop",
-			"from": [0, 8, 0],
-			"to": [2, 16, 16],
+			"from": [0, 8, 2],
+			"to": [2, 16, 14],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
 			"faces": {
-				"north": {"uv": [9, 8, 10, 12], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [0, 0, 8, 4], "texture": "#0"},
-				"south": {"uv": [9, 8, 10, 12], "texture": "#0"},
-				"west": {"uv": [8, 2.5, 16, 6.5], "texture": "#0"},
-				"up": {"uv": [7, 8, 8, 16], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [8, 2.5, 16, 3.5], "rotation": 270, "texture": "#0"}
+				"east": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"west": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"up": {"uv": [3.5, 0.5, 4, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 5.5, 3.5, 6], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
 			"name": "BackTop",
-			"from": [14, 8, 0],
-			"to": [16, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
+			"from": [14, 8, 2],
+			"to": [16, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -8, 8]},
 			"faces": {
-				"north": {"uv": [9, 8, 10, 12], "texture": "#0"},
-				"east": {"uv": [8, 2.5, 16, 6.5], "texture": "#0"},
-				"south": {"uv": [9, 8, 10, 12], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [0, 0, 8, 4], "texture": "#0"},
-				"up": {"uv": [0, 8, 1, 16], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [8, 5.5, 16, 6.5], "rotation": 270, "texture": "#0"}
+				"east": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"west": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"up": {"uv": [0, 0.5, 0.5, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 4, 3.5, 4.5], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
 			"name": "F1",
-			"from": [14.5, -2.5, 2],
-			"to": [15.5, 8.5, 5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 8]},
-			"faces": {
-				"north": {"uv": [1, 4, 1.5, 9], "texture": "#0"},
-				"east": {"uv": [1, 4, 2.5, 9], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [2, 4, 2.5, 9], "texture": "#0"},
-				"west": {"uv": [1, 4, 2.5, 9], "texture": "#0"},
-				"up": {"uv": [1, 4, 2.5, 4.5], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [1, 4, 2.5, 4.5], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"name": "F2",
-			"from": [0.5, -2.5, 2],
-			"to": [1.5, 8.5, 5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-38.5, -7.5, 8]},
-			"faces": {
-				"north": {"uv": [1, 4, 1.5, 9], "texture": "#0"},
-				"east": {"uv": [1, 4, 2.5, 9], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [2, 4, 2.5, 9], "texture": "#0"},
-				"west": {"uv": [1, 4, 2.5, 9], "texture": "#0"},
-				"up": {"uv": [1, 4, 2.5, 4.5], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [1, 4, 2.5, 4.5], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"name": "F2",
-			"from": [14.5, -2.5, 5],
-			"to": [15.5, 8.5, 8],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 8]},
-			"faces": {
-				"north": {"uv": [1, 4, 1.5, 9], "texture": "#0"},
-				"east": {"uv": [1, 4, 2.5, 9], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [2, 4, 2.5, 9], "texture": "#0"},
-				"west": {"uv": [1, 4, 2.5, 9], "texture": "#0"},
-				"up": {"uv": [1, 4, 2.5, 4.5], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [1, 4, 2.5, 4.5], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"name": "F3",
-			"from": [0.5, -2.5, 5],
-			"to": [1.5, 8.5, 8],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-38.5, -7.5, 8]},
-			"faces": {
-				"north": {"uv": [1, 4, 1.5, 9], "texture": "#0"},
-				"east": {"uv": [1, 4, 2.5, 9], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [2, 4, 2.5, 9], "texture": "#0"},
-				"west": {"uv": [1, 4, 2.5, 9], "texture": "#0"},
-				"up": {"uv": [1, 4, 2.5, 4.5], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [1, 4, 2.5, 4.5], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"name": "F3",
-			"from": [14.5, -2.5, 8],
-			"to": [15.5, 8.5, 11],
-			"rotation": {"angle": 0, "axis": "x", "origin": [-24.5, -7.5, 8]},
-			"faces": {
-				"north": {"uv": [1, 4, 1.5, 9], "texture": "#0"},
-				"east": {"uv": [1, 4, 2.5, 9], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [2, 4, 2.5, 9], "texture": "#0"},
-				"west": {"uv": [1, 4, 2.5, 9], "texture": "#0"},
-				"up": {"uv": [1, 4, 2.5, 4.5], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [1, 4, 2.5, 4.5], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"name": "F4",
-			"from": [0.5, -2.5, 8],
-			"to": [1.5, 8.5, 11],
-			"rotation": {"angle": 0, "axis": "x", "origin": [-38.5, -7.5, 8]},
-			"faces": {
-				"north": {"uv": [1, 4, 1.5, 9], "texture": "#0"},
-				"east": {"uv": [1, 4, 2.5, 9], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [2, 4, 2.5, 9], "texture": "#0"},
-				"west": {"uv": [1, 4, 2.5, 9], "texture": "#0"},
-				"up": {"uv": [1, 4, 2.5, 4.5], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [1, 4, 2.5, 4.5], "rotation": 270, "texture": "#0"}
-			}
-		},
-		{
-			"name": "F4",
 			"from": [14.5, -2.5, 11],
 			"to": [15.5, 8.5, 14],
 			"rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 8]},
 			"faces": {
-				"north": {"uv": [1, 4, 1.5, 9], "texture": "#0"},
-				"east": {"uv": [1, 4, 2.5, 9], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [2, 4, 2.5, 9], "texture": "#0"},
-				"west": {"uv": [1, 4, 2.5, 9], "texture": "#0"},
-				"up": {"uv": [1, 4, 2.5, 4.5], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [1, 4, 2.5, 4.5], "rotation": 270, "texture": "#0"}
+				"north": {"uv": [4, 0, 4.25, 2.5], "texture": "#0"},
+				"east": {"uv": [4, 0, 4.75, 2.5], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [4.5, 0, 4.75, 2.5], "texture": "#0"},
+				"west": {"uv": [4, 0, 4.75, 2.5], "texture": "#0"},
+				"up": {"uv": [4, 0.25, 4.75, 0.5], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [4, 2.25, 4.75, 2.5], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"name": "F5",
+			"name": "F2",
 			"from": [0.5, -2.5, 11],
 			"to": [1.5, 8.5, 14],
 			"rotation": {"angle": 0, "axis": "y", "origin": [-38.5, -7.5, 8]},
 			"faces": {
-				"north": {"uv": [1, 4, 1.5, 9], "texture": "#0"},
-				"east": {"uv": [1, 4, 2.5, 9], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [2, 4, 2.5, 9], "texture": "#0"},
-				"west": {"uv": [1, 4, 2.5, 9], "texture": "#0"},
-				"up": {"uv": [1, 4, 2.5, 4.5], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [1, 4, 2.5, 4.5], "rotation": 270, "texture": "#0"}
+				"north": {"uv": [4, 0, 4.25, 2.5], "texture": "#0"},
+				"east": {"uv": [4, 0, 4.75, 2.5], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [4.5, 0, 4.75, 2.5], "texture": "#0"},
+				"west": {"uv": [4, 0, 4.75, 2.5], "texture": "#0"},
+				"up": {"uv": [4, 0.25, 4.75, 0.5], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [4, 2.25, 4.75, 2.5], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "F3",
+			"from": [14.5, -2.5, 5],
+			"to": [15.5, 8.5, 8],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 2]},
+			"faces": {
+				"north": {"uv": [4, 0, 4.25, 2.5], "texture": "#0"},
+				"east": {"uv": [4, 0, 4.75, 2.5], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [4.5, 0, 4.75, 2.5], "texture": "#0"},
+				"west": {"uv": [4, 0, 4.75, 2.5], "texture": "#0"},
+				"up": {"uv": [4, 0.25, 4.75, 0.5], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [4, 2.25, 4.75, 2.5], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "F4",
+			"from": [0.5, -2.5, 5],
+			"to": [1.5, 8.5, 8],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-38.5, -7.5, 2]},
+			"faces": {
+				"north": {"uv": [4, 0, 4.25, 2.5], "texture": "#0"},
+				"east": {"uv": [4, 0, 4.75, 2.5], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [4.5, 0, 4.75, 2.5], "texture": "#0"},
+				"west": {"uv": [4, 0, 4.75, 2.5], "texture": "#0"},
+				"up": {"uv": [4, 0.25, 4.75, 0.5], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [4, 2.25, 4.75, 2.5], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "F2",
+			"from": [14.5, -2.5, 8],
+			"to": [15.5, 8.5, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 8]},
+			"faces": {
+				"north": {"uv": [4, 0, 4.25, 2.5], "texture": "#0"},
+				"east": {"uv": [4, 0, 4.75, 2.5], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [4.5, 0, 4.75, 2.5], "texture": "#0"},
+				"west": {"uv": [4, 0, 4.75, 2.5], "texture": "#0"},
+				"up": {"uv": [4, 0.25, 4.75, 0.5], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [4, 2.25, 4.75, 2.5], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "F3",
+			"from": [0.5, -2.5, 8],
+			"to": [1.5, 8.5, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-38.5, -7.5, 8]},
+			"faces": {
+				"north": {"uv": [4, 0, 4.25, 2.5], "texture": "#0"},
+				"east": {"uv": [4, 0, 4.75, 2.5], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [4.5, 0, 4.75, 2.5], "texture": "#0"},
+				"west": {"uv": [4, 0, 4.75, 2.5], "texture": "#0"},
+				"up": {"uv": [4, 0.25, 4.75, 0.5], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [4, 2.25, 4.75, 2.5], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "F4",
+			"from": [14.5, -2.5, 2],
+			"to": [15.5, 8.5, 5],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 2]},
+			"faces": {
+				"north": {"uv": [4, 0, 4.25, 2.5], "texture": "#0"},
+				"east": {"uv": [4, 0, 4.75, 2.5], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [4.5, 0, 4.75, 2.5], "texture": "#0"},
+				"west": {"uv": [4, 0, 4.75, 2.5], "texture": "#0"},
+				"up": {"uv": [4, 0.25, 4.75, 0.5], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [4, 2.25, 4.75, 2.5], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "F5",
+			"from": [0.5, -2.5, 2],
+			"to": [1.5, 8.5, 5],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-38.5, -7.5, 2]},
+			"faces": {
+				"north": {"uv": [4, 0, 4.25, 2.5], "texture": "#0"},
+				"east": {"uv": [4, 0, 4.75, 2.5], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [4.5, 0, 4.75, 2.5], "texture": "#0"},
+				"west": {"uv": [4, 0, 4.75, 2.5], "texture": "#0"},
+				"up": {"uv": [4, 0.25, 4.75, 0.5], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [4, 2.25, 4.75, 2.5], "rotation": 270, "texture": "#0"}
 			}
 		}
 	],
@@ -296,12 +244,12 @@
 		{
 			"name": "Cover",
 			"origin": [8, 8, 8],
-			"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+			"children": [0, 1, 2, 3, 4, 5, 6]
 		},
 		{
 			"name": "Flap",
 			"origin": [8, 8, 8],
-			"children": [11, 12, 13, 14, 15, 16, 17, 18]
+			"children": [7, 8, 9, 10, 11, 12, 13, 14]
 		}
 	]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/straight.json b/src/main/resources/assets/create/models/block/belt_tunnel/straight.json
index 95c507dfc..027b65eb7 100644
--- a/src/main/resources/assets/create/models/block/belt_tunnel/straight.json
+++ b/src/main/resources/assets/create/models/block/belt_tunnel/straight.json
@@ -2,144 +2,92 @@
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
-		"0": "create:block/belttunnel",
-		"particle": "create:block/belttunnel"
+		"0": "create:block/belt_tunnel",
+		"particle": "create:block/belt_tunnel"
 	},
 	"elements": [
 		{
 			"name": "LeftWall",
-			"from": [2, -3, 0],
-			"to": [14, 14, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"from": [0, -3, 0],
+			"to": [16, 16, 2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-9, -24, 8]},
 			"faces": {
-				"north": {"uv": [10, 7.5, 16, 16], "texture": "#0"},
-				"south": {"uv": [10, 7.5, 16, 16], "texture": "#0"},
-				"up": {"uv": [10, 1, 16, 2], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [4, 3.5, 8, 8.25], "texture": "#0"},
+				"east": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"south": {"uv": [4, 3.5, 8, 8.25], "texture": "#0"},
+				"west": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 3.5, 4, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
 			"name": "TopPiece",
 			"from": [2, 14, 2],
 			"to": [14, 16, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [24, -24, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, -24, 8]},
 			"faces": {
-				"north": {"uv": [10, 0, 16, 1], "texture": "#0"},
-				"south": {"uv": [10, 0, 16, 1], "texture": "#0"},
-				"up": {"uv": [1, 9, 7, 15], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [1, 9, 7, 15], "rotation": 270, "texture": "#0"}
+				"up": {"uv": [0.5, 0.5, 3.5, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 0.5, 3.5, 3.5], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
 			"name": "RightWall",
-			"from": [2, -3, 14],
-			"to": [14, 14, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"from": [0, -3, 14],
+			"to": [16, 16, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
 			"faces": {
-				"north": {"uv": [10, 7.5, 16, 16], "texture": "#0"},
-				"south": {"uv": [10, 7.5, 16, 16], "texture": "#0"},
-				"up": {"uv": [10, 1, 16, 2], "texture": "#0"}
+				"north": {"uv": [4, 3.5, 8, 8.25], "texture": "#0"},
+				"east": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"south": {"uv": [4, 3.5, 8, 8.25], "texture": "#0"},
+				"west": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
 			"name": "LeftRail",
 			"from": [0, -5, 0],
 			"to": [16, -3, 1],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
 			"faces": {
-				"north": {"uv": [8, 6.5, 16, 7.5], "texture": "#0"},
-				"east": {"uv": [9, 13, 9.5, 14], "texture": "#0"},
-				"south": {"uv": [8, 6.5, 16, 7.5], "texture": "#0"},
-				"west": {"uv": [9, 15, 9.5, 16], "texture": "#0"},
-				"up": {"uv": [8, 7, 16, 7.5], "texture": "#0"}
+				"north": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"east": {"uv": [7.75, 8.25, 8, 8.75], "texture": "#0"},
+				"south": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"west": {"uv": [4, 7.25, 4.25, 7.75], "texture": "#0"}
 			}
 		},
 		{
 			"name": "RightRail",
 			"from": [0, -5, 15],
 			"to": [16, -3, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 23]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 23]},
 			"faces": {
-				"north": {"uv": [8, 6.5, 16, 7.5], "texture": "#0"},
-				"east": {"uv": [9, 13, 9.5, 14], "texture": "#0"},
-				"south": {"uv": [8, 6.5, 16, 7.5], "texture": "#0"},
-				"west": {"uv": [9, 15, 9.5, 16], "texture": "#0"},
-				"up": {"uv": [8, 7, 16, 7.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "FrontRight",
-			"from": [0, -3, 14],
-			"to": [2, 8, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
-			"faces": {
-				"north": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"east": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"west": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "BackRight",
-			"from": [14, -3, 14],
-			"to": [16, 8, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
-			"faces": {
-				"north": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"south": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [9, 10.5, 10, 16], "texture": "#0"}
-			}
-		},
-		{
-			"name": "BackLeft",
-			"from": [14, -3, 0],
-			"to": [16, 8, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
-			"faces": {
-				"north": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"east": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"west": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "FrontLeft",
-			"from": [0, -3, 0],
-			"to": [2, 8, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
-			"faces": {
-				"north": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"south": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [9, 10.5, 10, 16], "texture": "#0"}
+				"north": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"east": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"south": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"west": {"uv": [3.75, 7.25, 4, 7.75], "texture": "#0"}
 			}
 		},
 		{
 			"name": "FrontTop",
-			"from": [0, 8, 0],
-			"to": [2, 16, 16],
+			"from": [0, 8, 2],
+			"to": [2, 16, 14],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
 			"faces": {
-				"north": {"uv": [9, 8, 10, 12], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [0, 0, 8, 4], "texture": "#0"},
-				"south": {"uv": [9, 8, 10, 12], "texture": "#0"},
-				"west": {"uv": [8, 2.5, 16, 6.5], "texture": "#0"},
-				"up": {"uv": [7, 8, 8, 16], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [8, 2.5, 16, 3.5], "rotation": 270, "texture": "#0"}
+				"east": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"west": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"up": {"uv": [3.5, 0.5, 4, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 5.5, 3.5, 6], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
 			"name": "BackTop",
-			"from": [14, 8, 0],
-			"to": [16, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
+			"from": [14, 8, 2],
+			"to": [16, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -8, 8]},
 			"faces": {
-				"north": {"uv": [9, 8, 10, 12], "texture": "#0"},
-				"east": {"uv": [8, 2.5, 16, 6.5], "texture": "#0"},
-				"south": {"uv": [9, 8, 10, 12], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [0, 0, 8, 4], "texture": "#0"},
-				"up": {"uv": [0, 8, 1, 16], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [8, 5.5, 16, 6.5], "rotation": 270, "texture": "#0"}
+				"east": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"west": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"up": {"uv": [0, 0.5, 0.5, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 4, 3.5, 4.5], "rotation": 270, "texture": "#0"}
 			}
 		}
 	],
@@ -147,7 +95,7 @@
 		{
 			"name": "Cover",
 			"origin": [8, 8, 8],
-			"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+			"children": [0, 1, 2, 3, 4, 5, 6]
 		}
 	]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/straight_fullshade.json b/src/main/resources/assets/create/models/block/belt_tunnel/straight_fullshade.json
new file mode 100644
index 000000000..2deeb5bfa
--- /dev/null
+++ b/src/main/resources/assets/create/models/block/belt_tunnel/straight_fullshade.json
@@ -0,0 +1,101 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "block/block",
+	"textures": {
+		"0": "create:block/belt_tunnel",
+		"particle": "create:block/belt_tunnel"
+	},
+	"elements": [
+		{
+			"name": "LeftWall",
+			"from": [0, -3, 0],
+			"to": [16, 16, 2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-9, -24, 8]},
+			"faces": {
+				"north": {"uv": [12, 8.25, 16, 13], "texture": "#0"},
+				"east": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"south": {"uv": [12, 8.25, 16, 13], "texture": "#0"},
+				"west": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 3.5, 4, 4], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"name": "TopPiece",
+			"from": [2, 14, 2],
+			"to": [14, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, -24, 8]},
+			"faces": {
+				"up": {"uv": [8.5, 0.25, 11.5, 3.25], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 0.5, 3.5, 3.5], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "RightWall",
+			"from": [0, -3, 14],
+			"to": [16, 16, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"faces": {
+				"north": {"uv": [12, 8.25, 16, 13], "texture": "#0"},
+				"east": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"south": {"uv": [12, 8.25, 16, 13], "texture": "#0"},
+				"west": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"name": "LeftRail",
+			"from": [0, -5, 0],
+			"to": [16, -3, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"faces": {
+				"north": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"east": {"uv": [7.75, 8.25, 8, 8.75], "texture": "#0"},
+				"south": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"west": {"uv": [4, 7.25, 4.25, 7.75], "texture": "#0"}
+			}
+		},
+		{
+			"name": "RightRail",
+			"from": [0, -5, 15],
+			"to": [16, -3, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 23]},
+			"faces": {
+				"north": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"east": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"south": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"west": {"uv": [3.75, 7.25, 4, 7.75], "texture": "#0"}
+			}
+		},
+		{
+			"name": "FrontTop",
+			"from": [0, 8, 2],
+			"to": [2, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
+			"faces": {
+				"east": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"west": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"up": {"uv": [3.5, 0.5, 4, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 5.5, 3.5, 6], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "BackTop",
+			"from": [14, 8, 2],
+			"to": [16, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -8, 8]},
+			"faces": {
+				"east": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"west": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"up": {"uv": [0, 0.5, 0.5, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 4, 3.5, 4.5], "rotation": 270, "texture": "#0"}
+			}
+		}
+	],
+	"groups": [
+		{
+			"name": "Cover",
+			"origin": [8, 8, 8],
+			"children": [0, 1, 2, 3, 4, 5, 6]
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/straight_halfshade.json b/src/main/resources/assets/create/models/block/belt_tunnel/straight_halfshade.json
new file mode 100644
index 000000000..bdc3759ca
--- /dev/null
+++ b/src/main/resources/assets/create/models/block/belt_tunnel/straight_halfshade.json
@@ -0,0 +1,101 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "block/block",
+	"textures": {
+		"0": "create:block/belt_tunnel",
+		"particle": "create:block/belt_tunnel"
+	},
+	"elements": [
+		{
+			"name": "LeftWall",
+			"from": [0, -3, 0],
+			"to": [16, 16, 2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-9, -24, 8]},
+			"faces": {
+				"north": {"uv": [8, 3.5, 12, 8.25], "texture": "#0"},
+				"east": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"south": {"uv": [8, 3.5, 12, 8.25], "texture": "#0"},
+				"west": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 3.5, 4, 4], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"name": "TopPiece",
+			"from": [2, 14, 2],
+			"to": [14, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, -24, 8]},
+			"faces": {
+				"up": {"uv": [8.5, 0.25, 11.5, 3.25], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 0.5, 3.5, 3.5], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "RightWall",
+			"from": [0, -3, 14],
+			"to": [16, 16, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"faces": {
+				"north": {"uv": [8, 3.5, 12, 8.25], "texture": "#0"},
+				"east": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"south": {"uv": [8, 3.5, 12, 8.25], "texture": "#0"},
+				"west": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"name": "LeftRail",
+			"from": [0, -5, 0],
+			"to": [16, -3, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"faces": {
+				"north": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"east": {"uv": [7.75, 8.25, 8, 8.75], "texture": "#0"},
+				"south": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"west": {"uv": [4, 7.25, 4.25, 7.75], "texture": "#0"}
+			}
+		},
+		{
+			"name": "RightRail",
+			"from": [0, -5, 15],
+			"to": [16, -3, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 23]},
+			"faces": {
+				"north": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"east": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"south": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"west": {"uv": [3.75, 7.25, 4, 7.75], "texture": "#0"}
+			}
+		},
+		{
+			"name": "FrontTop",
+			"from": [0, 8, 2],
+			"to": [2, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
+			"faces": {
+				"east": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"west": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"up": {"uv": [3.5, 0.5, 4, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 5.5, 3.5, 6], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "BackTop",
+			"from": [14, 8, 2],
+			"to": [16, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -8, 8]},
+			"faces": {
+				"east": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"west": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"up": {"uv": [0, 0.5, 0.5, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 4, 3.5, 4.5], "rotation": 270, "texture": "#0"}
+			}
+		}
+	],
+	"groups": [
+		{
+			"name": "Cover",
+			"origin": [8, 8, 8],
+			"children": [0, 1, 2, 3, 4, 5, 6]
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/straight_windowed.json b/src/main/resources/assets/create/models/block/belt_tunnel/straight_windowed.json
new file mode 100644
index 000000000..dda810dce
--- /dev/null
+++ b/src/main/resources/assets/create/models/block/belt_tunnel/straight_windowed.json
@@ -0,0 +1,101 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "block/block",
+	"textures": {
+		"0": "create:block/belt_tunnel",
+		"particle": "create:block/belt_tunnel"
+	},
+	"elements": [
+		{
+			"name": "LeftWall",
+			"from": [0, -3, 0],
+			"to": [16, 16, 2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-9, -24, 8]},
+			"faces": {
+				"north": {"uv": [12, 3.5, 16, 8.25], "texture": "#0"},
+				"east": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"south": {"uv": [12, 3.5, 16, 8.25], "texture": "#0"},
+				"west": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 3.5, 4, 4], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"name": "TopPiece",
+			"from": [2, 14, 2],
+			"to": [14, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, -24, 8]},
+			"faces": {
+				"up": {"uv": [8.5, 0.25, 11.5, 3.25], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 0.5, 3.5, 3.5], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "RightWall",
+			"from": [0, -3, 14],
+			"to": [16, 16, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"faces": {
+				"north": {"uv": [12, 3.5, 16, 8.25], "texture": "#0"},
+				"east": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"south": {"uv": [12, 3.5, 16, 8.25], "texture": "#0"},
+				"west": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"name": "LeftRail",
+			"from": [0, -5, 0],
+			"to": [16, -3, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"faces": {
+				"north": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"east": {"uv": [7.75, 8.25, 8, 8.75], "texture": "#0"},
+				"south": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"west": {"uv": [4, 7.25, 4.25, 7.75], "texture": "#0"}
+			}
+		},
+		{
+			"name": "RightRail",
+			"from": [0, -5, 15],
+			"to": [16, -3, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 23]},
+			"faces": {
+				"north": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"east": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"south": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"west": {"uv": [3.75, 7.25, 4, 7.75], "texture": "#0"}
+			}
+		},
+		{
+			"name": "FrontTop",
+			"from": [0, 8, 2],
+			"to": [2, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
+			"faces": {
+				"east": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"west": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"up": {"uv": [3.5, 0.5, 4, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 5.5, 3.5, 6], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "BackTop",
+			"from": [14, 8, 2],
+			"to": [16, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -8, 8]},
+			"faces": {
+				"east": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"west": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"up": {"uv": [0, 0.5, 0.5, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 4, 3.5, 4.5], "rotation": 270, "texture": "#0"}
+			}
+		}
+	],
+	"groups": [
+		{
+			"name": "Cover",
+			"origin": [8, 8, 8],
+			"children": [0, 1, 2, 3, 4, 5, 6]
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/t_left.json b/src/main/resources/assets/create/models/block/belt_tunnel/t_left.json
index 8acc5808b..fbb3568b4 100644
--- a/src/main/resources/assets/create/models/block/belt_tunnel/t_left.json
+++ b/src/main/resources/assets/create/models/block/belt_tunnel/t_left.json
@@ -2,171 +2,137 @@
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
-		"0": "create:block/belttunnel",
-		"particle": "create:block/belttunnel"
+		"0": "create:block/belt_tunnel",
+		"particle": "create:block/belt_tunnel"
 	},
 	"elements": [
+		{
+			"name": "LeftWall",
+			"from": [0, -3, 0],
+			"to": [16, 16, 2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-9, -24, 8]},
+			"faces": {
+				"north": {"uv": [4, 3.5, 8, 8.25], "texture": "#0"},
+				"east": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"south": {"uv": [4, 3.5, 8, 8.25], "texture": "#0"},
+				"west": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 3.5, 4, 4], "rotation": 180, "texture": "#0"}
+			}
+		},
 		{
 			"name": "TopPiece",
 			"from": [2, 14, 2],
 			"to": [14, 16, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, -24, 8]},
 			"faces": {
-				"north": {"uv": [10, 0, 16, 1], "texture": "#0"},
-				"south": {"uv": [10, 0, 16, 1], "texture": "#0"},
-				"up": {"uv": [1, 9, 7, 15], "texture": "#0"},
-				"down": {"uv": [1, 9, 7, 15], "rotation": 90, "texture": "#0"}
+				"up": {"uv": [0.5, 0.5, 3.5, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 0.5, 3.5, 3.5], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"name": "RightWall",
-			"from": [2, -3, 0],
-			"to": [14, 14, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"name": "LeftT",
+			"from": [0, -3, 14],
+			"to": [2, 16, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
 			"faces": {
-				"north": {"uv": [10, 7.5, 16, 16], "texture": "#0"},
-				"south": {"uv": [10, 7.5, 16, 16], "texture": "#0"},
-				"up": {"uv": [10, 1, 16, 2], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [7.5, 3.5, 8, 8.25], "texture": "#0"},
+				"east": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"south": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"west": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 3.5, 0.5, 4], "texture": "#0"}
 			}
 		},
 		{
-			"name": "RightRail",
+			"name": "RightT",
+			"from": [14, -3, 14],
+			"to": [16, 16, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"faces": {
+				"north": {"uv": [4, 3.5, 4.5, 8.25], "texture": "#0"},
+				"east": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"south": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"west": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"up": {"uv": [3.5, 3.5, 4, 4], "texture": "#0"}
+			}
+		},
+		{
+			"name": "LeftRail",
 			"from": [0, -5, 0],
 			"to": [16, -3, 1],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
 			"faces": {
-				"north": {"uv": [8, 6.5, 16, 7.5], "texture": "#0"},
-				"east": {"uv": [9, 15, 9.5, 16], "texture": "#0"},
-				"south": {"uv": [8, 6.5, 16, 7.5], "texture": "#0"},
-				"west": {"uv": [9, 13, 9.5, 14], "texture": "#0"},
-				"up": {"uv": [8, 7, 16, 7.5], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"east": {"uv": [7.75, 8.25, 8, 8.75], "texture": "#0"},
+				"south": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"west": {"uv": [4, 7.25, 4.25, 7.75], "texture": "#0"}
 			}
 		},
 		{
-			"name": "FrontRight",
-			"from": [14, -3, 0],
-			"to": [16, 8, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"name": "LeftTRail",
+			"from": [0, -5, 15],
+			"to": [1, -3, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 23]},
 			"faces": {
-				"north": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"east": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"west": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"east": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"south": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"west": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"}
 			}
 		},
 		{
-			"name": "BackRight",
-			"from": [0, -3, 0],
-			"to": [2, 8, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"name": "RIghtTRail",
+			"from": [15, -5, 15],
+			"to": [16, -3, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 23]},
 			"faces": {
-				"north": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [9, 10.5, 10, 16], "texture": "#0"},
-				"south": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [9, 10.5, 10, 16], "texture": "#0"}
-			}
-		},
-		{
-			"name": "BackLeft",
-			"from": [0, -3, 14],
-			"to": [2, 8, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [9, 9.5, 10, 15], "texture": "#0"},
-				"east": {"uv": [9, 9.5, 10, 15], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [9, 9.5, 10, 15], "texture": "#0"},
-				"west": {"uv": [9, 9.5, 10, 15], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "FrontLeft",
-			"from": [14, -3, 14],
-			"to": [16, 8, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [9, 9.5, 10, 15], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [9, 9.5, 10, 15], "texture": "#0"},
-				"south": {"uv": [9, 9.5, 10, 15], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [9, 9.5, 10, 15], "texture": "#0"}
+				"north": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"east": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"south": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"west": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"}
 			}
 		},
 		{
 			"name": "FrontTop",
-			"from": [14, 8, 0],
-			"to": [16, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"from": [0, 8, 2],
+			"to": [2, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
 			"faces": {
-				"north": {"uv": [9, 8, 10, 12], "texture": "#0"},
-				"east": {"uv": [8, 2.5, 16, 6.5], "texture": "#0"},
-				"south": {"uv": [9, 8, 10, 12], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [0, 0, 8, 4], "texture": "#0"},
-				"up": {"uv": [7, 8, 8, 16], "texture": "#0"},
-				"down": {"uv": [8, 2.5, 16, 3.5], "rotation": 90, "texture": "#0"}
+				"east": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"west": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"up": {"uv": [3.5, 0.5, 4, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 5.5, 3.5, 6], "rotation": 270, "texture": "#0"}
 			}
 		},
 		{
-			"name": "BackTop",
+			"name": "TTop",
 			"from": [2, 8, 14],
 			"to": [14, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
 			"faces": {
-				"north": {"uv": [0, 0, 8, 4], "texture": "#0"},
-				"east": {"uv": [9, 8, 10, 12], "texture": "#0"},
-				"south": {"uv": [9, 2.5, 15, 6.5], "texture": "#0"},
-				"west": {"uv": [9, 8, 10, 12], "rotation": 180, "texture": "#0"},
-				"up": {"uv": [0, 8, 1, 16], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [8, 5.5, 16, 6.5], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"south": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"up": {"uv": [0.5, 3.5, 3.5, 4], "texture": "#0"},
+				"down": {"uv": [0.5, 5.5, 3.5, 6], "texture": "#0"}
 			}
 		},
 		{
 			"name": "BackTop",
-			"from": [0, 8, 0],
-			"to": [2, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"from": [14, 8, 2],
+			"to": [16, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -8, 8]},
 			"faces": {
-				"north": {"uv": [9, 8, 10, 12], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [0, 0, 8, 4], "texture": "#0"},
-				"south": {"uv": [9, 8, 10, 12], "texture": "#0"},
-				"west": {"uv": [8, 2.5, 16, 6.5], "texture": "#0"},
-				"up": {"uv": [0, 8, 1, 16], "texture": "#0"},
-				"down": {"uv": [8, 5.5, 16, 6.5], "rotation": 90, "texture": "#0"}
-			}
-		},
-		{
-			"name": "BackLeft",
-			"from": [14, -5, 15],
-			"to": [16, -3, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [9, 15, 10, 16], "texture": "#0"},
-				"east": {"uv": [9, 15, 9.5, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [9, 15, 10, 16], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [9.5, 15, 10, 16], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "BackLeft",
-			"from": [0, -5, 15],
-			"to": [2, -3, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [10, 15, 9, 16], "texture": "#0"},
-				"east": {"uv": [10, 15, 9.5, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [10, 15, 9, 16], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [9.5, 15, 9, 16], "rotation": 180, "texture": "#0"}
+				"east": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"west": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"up": {"uv": [0, 0.5, 0.5, 3.5], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 4, 3.5, 4.5], "rotation": 270, "texture": "#0"}
 			}
 		}
 	],
 	"groups": [
 		{
-			"name": "belttunnel",
+			"name": "Cover",
 			"origin": [8, 8, 8],
-			"children": [
-				{
-					"name": "Cover",
-					"origin": [8, 8, 8],
-					"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-				}, 10, 11]
+			"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
 		}
 	]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/t_right.json b/src/main/resources/assets/create/models/block/belt_tunnel/t_right.json
index 7a3542ea0..85bb96bcf 100644
--- a/src/main/resources/assets/create/models/block/belt_tunnel/t_right.json
+++ b/src/main/resources/assets/create/models/block/belt_tunnel/t_right.json
@@ -2,175 +2,137 @@
 	"credit": "Made with Blockbench",
 	"parent": "block/block",
 	"textures": {
-		"0": "create:block/belttunnel",
-		"particle": "create:block/belttunnel"
+		"0": "create:block/belt_tunnel",
+		"particle": "create:block/belt_tunnel"
 	},
 	"elements": [
+		{
+			"name": "LeftWall",
+			"from": [0, -3, 14],
+			"to": [16, 16, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, -24, 8]},
+			"faces": {
+				"north": {"uv": [4, 3.5, 8, 8.25], "texture": "#0"},
+				"east": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"south": {"uv": [4, 3.5, 8, 8.25], "texture": "#0"},
+				"west": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 3.5, 4, 4], "texture": "#0"}
+			}
+		},
 		{
 			"name": "TopPiece",
 			"from": [2, 14, 2],
 			"to": [14, 16, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, -24, 8]},
 			"faces": {
-				"north": {"uv": [16, 0, 10, 1], "texture": "#0"},
-				"south": {"uv": [16, 0, 10, 1], "texture": "#0"},
-				"up": {"uv": [1, 15, 7, 9], "texture": "#0"},
-				"down": {"uv": [7, 9, 1, 15], "rotation": 90, "texture": "#0"}
+				"up": {"uv": [0.5, 0.5, 3.5, 3.5], "texture": "#0"},
+				"down": {"uv": [0.5, 0.5, 3.5, 3.5], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"name": "RightWall",
-			"from": [2, -3, 14],
-			"to": [14, 14, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"name": "LeftT",
+			"from": [14, -3, 0],
+			"to": [16, 16, 2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, -24, 8]},
 			"faces": {
-				"north": {"uv": [16, 7.5, 10, 16], "texture": "#0"},
-				"south": {"uv": [16, 7.5, 10, 16], "texture": "#0"},
-				"up": {"uv": [10, 2, 16, 1], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"east": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"south": {"uv": [7.5, 3.5, 8, 8.25], "texture": "#0"},
+				"west": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"up": {"uv": [0, 3.5, 0.5, 4], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
-			"name": "RightRail",
+			"name": "RightT",
+			"from": [0, -3, 0],
+			"to": [2, 16, 2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, -24, 8]},
+			"faces": {
+				"north": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"east": {"uv": [3.5, 4, 4, 8.75], "texture": "#0"},
+				"south": {"uv": [4, 3.5, 4.5, 8.25], "texture": "#0"},
+				"west": {"uv": [0, 4, 0.5, 8.75], "texture": "#0"},
+				"up": {"uv": [3.5, 3.5, 4, 4], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"name": "LeftRail",
 			"from": [0, -5, 15],
 			"to": [16, -3, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, -24, 8]},
 			"faces": {
-				"north": {"uv": [16, 6.5, 8, 7.5], "texture": "#0"},
-				"east": {"uv": [9.5, 15, 9, 16], "texture": "#0"},
-				"south": {"uv": [16, 6.5, 8, 7.5], "texture": "#0"},
-				"west": {"uv": [9.5, 13, 9, 14], "texture": "#0"},
-				"up": {"uv": [8, 7.5, 16, 7], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"east": {"uv": [4, 7.25, 4.25, 7.75], "texture": "#0"},
+				"south": {"uv": [4, 8.25, 8, 8.75], "texture": "#0"},
+				"west": {"uv": [7.75, 8.25, 8, 8.75], "texture": "#0"}
 			}
 		},
 		{
-			"name": "FrontRight",
-			"from": [14, -3, 14],
-			"to": [16, 8, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"name": "LeftTRail",
+			"from": [15, -5, 0],
+			"to": [16, -3, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, -24, 8]},
 			"faces": {
-				"north": {"uv": [10, 10.5, 9, 16], "texture": "#0"},
-				"east": {"uv": [10, 10.5, 9, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [10, 10.5, 9, 16], "texture": "#0"},
-				"west": {"uv": [10, 10.5, 9, 16], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"east": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"south": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"west": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"}
 			}
 		},
 		{
-			"name": "BackRight",
-			"from": [0, -3, 14],
-			"to": [2, 8, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"name": "RIghtTRail",
+			"from": [0, -5, 0],
+			"to": [1, -3, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, -24, 8]},
 			"faces": {
-				"north": {"uv": [10, 10.5, 9, 16], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [10, 10.5, 9, 16], "texture": "#0"},
-				"south": {"uv": [10, 10.5, 9, 16], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [10, 10.5, 9, 16], "texture": "#0"}
-			}
-		},
-		{
-			"name": "BackLeft",
-			"from": [0, -3, 0],
-			"to": [2, 8, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [10, 9.5, 9, 15], "texture": "#0"},
-				"east": {"uv": [10, 10.5, 9, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [10, 10.5, 9, 16], "texture": "#0"},
-				"west": {"uv": [10, 9.5, 9, 15], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "FrontLeft",
-			"from": [14, -3, 0],
-			"to": [16, 8, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [10, 10.5, 9, 16], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [10, 9.5, 9, 15], "texture": "#0"},
-				"south": {"uv": [10, 9.5, 9, 15], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [10, 9.5, 9, 15], "texture": "#0"}
+				"north": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"east": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"south": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"},
+				"west": {"uv": [4, 8, 4.25, 8.5], "texture": "#0"}
 			}
 		},
 		{
 			"name": "FrontTop",
-			"from": [14, 8, 0],
-			"to": [16, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"from": [14, 8, 2],
+			"to": [16, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, -24, 8]},
 			"faces": {
-				"north": {"uv": [10, 8, 9, 12], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [16, 2.5, 8, 6.5], "texture": "#0"},
-				"south": {"uv": [10, 8, 9, 12], "texture": "#0"},
-				"west": {"uv": [8, 0, 0, 4], "texture": "#0"},
-				"up": {"uv": [7, 16, 8, 8], "texture": "#0"},
-				"down": {"uv": [16, 2.5, 8, 3.5], "rotation": 90, "texture": "#0"}
+				"east": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"west": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"up": {"uv": [3.5, 0.5, 4, 3.5], "texture": "#0"},
+				"down": {"uv": [0.5, 5.5, 3.5, 6], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"name": "BackTop",
+			"name": "TTop",
 			"from": [2, 8, 0],
 			"to": [14, 16, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -24, 8]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, -24, 8]},
 			"faces": {
-				"north": {"uv": [15, 2.5, 9, 6.5], "texture": "#0"},
-				"east": {"uv": [10, 8, 9, 12], "texture": "#0"},
-				"south": {"uv": [8, 0, 0, 4], "texture": "#0"},
-				"west": {"uv": [10, 8, 9, 12], "rotation": 180, "texture": "#0"},
-				"up": {"uv": [1, 8, 0, 16], "rotation": 270, "texture": "#0"},
-				"down": {"uv": [8, 6.5, 16, 5.5], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"south": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"up": {"uv": [0.5, 3.5, 3.5, 4], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0.5, 5.5, 3.5, 6], "rotation": 180, "texture": "#0"}
 			}
 		},
 		{
 			"name": "BackTop",
-			"from": [0, 8, 0],
-			"to": [2, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
+			"from": [0, 8, 2],
+			"to": [2, 16, 14],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, -24, 8]},
 			"faces": {
-				"north": {"uv": [10, 8, 9, 12], "texture": "#0"},
-				"east": {"uv": [8, 0, 0, 4], "texture": "#0"},
-				"south": {"uv": [10, 8, 9, 12], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [16, 2.5, 8, 6.5], "texture": "#0"},
-				"up": {"uv": [0, 16, 1, 8], "texture": "#0"},
-				"down": {"uv": [16, 5.5, 8, 6.5], "rotation": 90, "texture": "#0"}
-			}
-		},
-		{
-			"name": "BackLeft",
-			"from": [0, -5, 0],
-			"to": [2, -3, 1],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [9, 15, 10, 16], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [9.5, 15, 10, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [9, 15, 10, 16], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [9.5, 15, 9, 16], "rotation": 180, "texture": "#0"},
-				"up": {"uv": [9, 15, 10, 16], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [9, 15, 10, 16], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"name": "BackLeft",
-			"from": [14, -5, 0],
-			"to": [16, -3, 1],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [10, 15, 9, 16], "rotation": 180, "texture": "#0"},
-				"east": {"uv": [9.5, 15, 9, 16], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [10, 15, 9, 16], "rotation": 180, "texture": "#0"},
-				"west": {"uv": [10, 15, 9.5, 16], "rotation": 180, "texture": "#0"},
-				"up": {"uv": [10, 15, 9, 16], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [10, 15, 9, 16], "rotation": 180, "texture": "#0"}
+				"east": {"uv": [0.5, 6, 3.5, 8], "texture": "#0"},
+				"west": {"uv": [0.5, 4, 3.5, 6], "texture": "#0"},
+				"up": {"uv": [0, 0.5, 0.5, 3.5], "texture": "#0"},
+				"down": {"uv": [0.5, 4, 3.5, 4.5], "rotation": 90, "texture": "#0"}
 			}
 		}
 	],
 	"groups": [
 		{
-			"name": "belttunnel",
+			"name": "Cover",
 			"origin": [8, 8, 8],
-			"children": [
-				{
-					"name": "Cover",
-					"origin": [8, 8, 8],
-					"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-				}, 10, 11]
+			"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
 		}
 	]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/window.json b/src/main/resources/assets/create/models/block/belt_tunnel/window.json
deleted file mode 100644
index ddb0cfd8c..000000000
--- a/src/main/resources/assets/create/models/block/belt_tunnel/window.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-	"credit": "Made with Blockbench",
-	"parent": "block/block",
-	"textures": {
-		"6": "create:block/windowed_belttunnel",
-		"particle": "create:block/windowed_belttunnel"
-	},
-	"elements": [
-		{
-			"name": "LeftWall",
-			"from": [2, -3, 0],
-			"to": [14, 14, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [10, 7.5, 16, 16], "texture": "#6"},
-				"south": {"uv": [10, 7.5, 16, 16], "texture": "#6"},
-				"up": {"uv": [10, 1, 16, 2], "rotation": 180, "texture": "#6"}
-			}
-		},
-		{
-			"name": "TopPiece",
-			"from": [2, 14, 2],
-			"to": [14, 16, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [24, -24, 8]},
-			"faces": {
-				"north": {"uv": [10, 0, 16, 1], "texture": "#6"},
-				"south": {"uv": [10, 0, 16, 1], "texture": "#6"},
-				"up": {"uv": [1, 9, 7, 15], "rotation": 180, "texture": "#6"},
-				"down": {"uv": [1, 9, 7, 15], "rotation": 270, "texture": "#6"}
-			}
-		},
-		{
-			"name": "RightWall",
-			"from": [2, -3, 14],
-			"to": [14, 14, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [10, 7.5, 16, 16], "texture": "#6"},
-				"south": {"uv": [10, 7.5, 16, 16], "texture": "#6"},
-				"up": {"uv": [10, 1, 16, 2], "texture": "#6"}
-			}
-		},
-		{
-			"name": "LeftRail",
-			"from": [0, -5, 0],
-			"to": [16, -3, 1],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 8]},
-			"faces": {
-				"north": {"uv": [8, 6.5, 16, 7.5], "texture": "#6"},
-				"east": {"uv": [9, 13, 9.5, 14], "texture": "#6"},
-				"south": {"uv": [8, 6.5, 16, 7.5], "texture": "#6"},
-				"west": {"uv": [9, 15, 9.5, 16], "texture": "#6"},
-				"up": {"uv": [8, 7, 16, 7.5], "texture": "#6"}
-			}
-		},
-		{
-			"name": "RightRail",
-			"from": [0, -5, 15],
-			"to": [16, -3, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -24, 23]},
-			"faces": {
-				"north": {"uv": [8, 6.5, 16, 7.5], "texture": "#6"},
-				"east": {"uv": [9, 13, 9.5, 14], "texture": "#6"},
-				"south": {"uv": [8, 6.5, 16, 7.5], "texture": "#6"},
-				"west": {"uv": [9, 15, 9.5, 16], "texture": "#6"},
-				"up": {"uv": [8, 7, 16, 7.5], "texture": "#6"}
-			}
-		},
-		{
-			"name": "FrontRight",
-			"from": [0, -3, 14],
-			"to": [2, 8, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
-			"faces": {
-				"north": {"uv": [9, 10.5, 10, 16], "texture": "#6"},
-				"east": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#6"},
-				"south": {"uv": [9, 10.5, 10, 16], "texture": "#6"},
-				"west": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#6"}
-			}
-		},
-		{
-			"name": "BackRight",
-			"from": [14, -3, 14],
-			"to": [16, 8, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
-			"faces": {
-				"north": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#6"},
-				"east": {"uv": [9, 10.5, 10, 16], "texture": "#6"},
-				"south": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#6"},
-				"west": {"uv": [9, 10.5, 10, 16], "texture": "#6"}
-			}
-		},
-		{
-			"name": "BackLeft",
-			"from": [14, -3, 0],
-			"to": [16, 8, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
-			"faces": {
-				"north": {"uv": [9, 10.5, 10, 16], "texture": "#6"},
-				"east": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#6"},
-				"south": {"uv": [9, 10.5, 10, 16], "texture": "#6"},
-				"west": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#6"}
-			}
-		},
-		{
-			"name": "FrontLeft",
-			"from": [0, -3, 0],
-			"to": [2, 8, 2],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
-			"faces": {
-				"north": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#6"},
-				"east": {"uv": [9, 10.5, 10, 16], "texture": "#6"},
-				"south": {"uv": [9, 10.5, 10, 16], "rotation": 180, "texture": "#6"},
-				"west": {"uv": [9, 10.5, 10, 16], "texture": "#6"}
-			}
-		},
-		{
-			"name": "FrontTop",
-			"from": [0, 8, 0],
-			"to": [2, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
-			"faces": {
-				"north": {"uv": [9, 8, 10, 12], "rotation": 180, "texture": "#6"},
-				"east": {"uv": [0, 0, 8, 4], "texture": "#6"},
-				"south": {"uv": [9, 8, 10, 12], "texture": "#6"},
-				"west": {"uv": [8, 2.5, 16, 6.5], "texture": "#6"},
-				"up": {"uv": [7, 8, 8, 16], "rotation": 180, "texture": "#6"},
-				"down": {"uv": [8, 2.5, 16, 3.5], "rotation": 270, "texture": "#6"}
-			}
-		},
-		{
-			"name": "BackTop",
-			"from": [14, 8, 0],
-			"to": [16, 16, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
-			"faces": {
-				"north": {"uv": [9, 8, 10, 12], "texture": "#6"},
-				"east": {"uv": [8, 2.5, 16, 6.5], "texture": "#6"},
-				"south": {"uv": [9, 8, 10, 12], "rotation": 180, "texture": "#6"},
-				"west": {"uv": [0, 0, 8, 4], "texture": "#6"},
-				"up": {"uv": [0, 8, 1, 16], "rotation": 180, "texture": "#6"},
-				"down": {"uv": [8, 5.5, 16, 6.5], "rotation": 270, "texture": "#6"}
-			}
-		}
-	],
-	"groups": [
-		{
-			"name": "Cover",
-			"origin": [8, 8, 8],
-			"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-		}
-	]
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/create/textures/block/basin.png b/src/main/resources/assets/create/textures/block/basin.png
index 470fc5edf..d95aef9b9 100644
Binary files a/src/main/resources/assets/create/textures/block/basin.png and b/src/main/resources/assets/create/textures/block/basin.png differ
diff --git a/src/main/resources/assets/create/textures/block/belt_tunnel.png b/src/main/resources/assets/create/textures/block/belt_tunnel.png
new file mode 100644
index 000000000..8f2cd7010
Binary files /dev/null and b/src/main/resources/assets/create/textures/block/belt_tunnel.png differ
diff --git a/src/main/resources/assets/create/textures/block/belttunnel.png b/src/main/resources/assets/create/textures/block/belttunnel.png
deleted file mode 100644
index 8ef94125a..000000000
Binary files a/src/main/resources/assets/create/textures/block/belttunnel.png and /dev/null differ
diff --git a/src/main/resources/assets/create/textures/block/brass_casing_side.png b/src/main/resources/assets/create/textures/block/brass_casing_side.png
index f231eb76d..169847187 100644
Binary files a/src/main/resources/assets/create/textures/block/brass_casing_side.png and b/src/main/resources/assets/create/textures/block/brass_casing_side.png differ
diff --git a/src/main/resources/assets/create/textures/block/crushing_wheel_body.png b/src/main/resources/assets/create/textures/block/crushing_wheel_body.png
index 74d1350e3..542f0f541 100644
Binary files a/src/main/resources/assets/create/textures/block/crushing_wheel_body.png and b/src/main/resources/assets/create/textures/block/crushing_wheel_body.png differ