Jade recolour and some other edits

That's it, really.