Finished the colour setting. Cleaned up old code.