Update colors in rendering_types to match new scheme
Replace 'colour' with 'color'
Fix color in rendering_types
Fix colors
Tweak natural=land and coastline colors
Add rendering of capitals