Fix #60 - added theme support 'remove-comments'
Tidied up display