finally fix colours everywhere