diff --git a/.gitmodules b/.gitmodules
index 3052d67bd..7d21a2f91 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "Dark-Library"]
 	path = Dark-Library
 	url = git@github.com:DarkGuardsman/Dark-Library.git
-[submodule "Basic-Compoents"]
-	path = Basic-Compoents
-	url = git://github.com/calclavia/Basic-Components.git
 [submodule "API-Bank"]
 	path = API-Bank
 	url = git://github.com/DarkGuardsman/API-Bank.git
diff --git a/Dark-Library b/Dark-Library
index fe90843d4..ce76d225e 160000
--- a/Dark-Library
+++ b/Dark-Library
@@ -1 +1 @@
-Subproject commit fe90843d440be93a48d631278364259797b65cfd
+Subproject commit ce76d225eefc4a53bc8e3e7c8294dee7281a5fc2
diff --git a/src/minecraft/dark/fluid/common/pipes/BlockPipe.java b/src/minecraft/dark/fluid/common/pipes/BlockPipe.java
index 63bb12ec1..42ca60ff8 100644
--- a/src/minecraft/dark/fluid/common/pipes/BlockPipe.java
+++ b/src/minecraft/dark/fluid/common/pipes/BlockPipe.java
@@ -1,6 +1,5 @@
 package dark.fluid.common.pipes;
 
-
 import java.util.List;
 
 import net.minecraft.block.Block;
@@ -10,6 +9,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
+import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.liquids.ILiquidTank;
 import universalelectricity.prefab.block.BlockAdvanced;
 import dark.core.hydraulic.helpers.FluidRestrictionHandler;
@@ -27,8 +27,9 @@ public class BlockPipe extends BlockAdvanced
 		this.setCreativeTab(TabFluidMech.INSTANCE);
 		this.setUnlocalizedName("lmPipe");
 		this.setResistance(3f);
-		
+
 	}
+
 	@Override
 	public boolean isOpaqueCube()
 	{
@@ -80,7 +81,7 @@ public class BlockPipe extends BlockAdvanced
 	@Override
 	public TileEntity createNewTileEntity(World var1)
 	{
-		if(this.blockID == FluidMech.blockGenPipe.blockID)
+		if (this.blockID == FluidMech.blockGenPipe.blockID)
 		{
 			return new TileEntityGenericPipe();
 		}
@@ -128,4 +129,20 @@ public class BlockPipe extends BlockAdvanced
 			}
 		}
 	}
+
+	@Override
+	public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour)
+	{
+		if (this.blockID == FluidMech.blockGenPipe.blockID)
+		{
+			int meta = world.getBlockMetadata(x, y, z);
+			if (meta != colour)
+			{
+				world.setBlockMetadataWithNotify(x, y, z, colour, 3);
+				this.onNeighborBlockChange(world, x, y, z, world.getBlockId(x, y, z));
+				return true;
+			}
+		}
+		return false;
+	}
 }
diff --git a/src/minecraft/dark/fluid/common/pump/BlockDrain.java b/src/minecraft/dark/fluid/common/pump/BlockDrain.java
index f94fa2edd..ea67d7c62 100644
--- a/src/minecraft/dark/fluid/common/pump/BlockDrain.java
+++ b/src/minecraft/dark/fluid/common/pump/BlockDrain.java
@@ -28,6 +28,12 @@ public class BlockDrain extends BlockAdvanced
 		this.setUnlocalizedName("lmDrain");
 	}
 
+	@Override
+	public TileEntity createNewTileEntity(World var1)
+	{
+		return new TileEntityDrain();
+	}
+
 	@Override
 	public void registerIcons(IconRegister par1IconRegister)
 	{
@@ -36,12 +42,6 @@ public class BlockDrain extends BlockAdvanced
 		this.fillIcon = par1IconRegister.registerIcon(FluidMech.TEXTURE_NAME_PREFIX + "drain2");
 	}
 
-	@Override
-	public TileEntity createNewTileEntity(World var1)
-	{
-		return new TileEntityDrain();
-	}
-
 	@Override
 	public Icon getIcon(int par1, int par2)
 	{