new colours, cleanup