HTML markup choosing, partial support
Fixes mocks dependencies
options update
missing comma
removed html markup option