Mass markup conversions
WIP: cleanup
Syntax highlighting cleanup