added support for more color names
added support for figure references, different improvements