More work on a swift highlighter

Website source opens in new tab Fixes #2