Rename colour vars
More colours tweaks