Added support for arbitrary marker colours
Fixing unsafe: in link href