The colours should be correct now, without needing any hacks. There's still other minor issues of course.