Add support for dark background and light text
Merge branch 'develop' into eurostile