Annotation fill and highlight fill now configurable