Adding styles for ferries.
Fixing locality text colour.
Make waterway labels avoid edges to stop clipping.