Removed Colour24 for now, and completed colour tests