Fixed up dependencies, and removed colour extraction code.