Setting up highlights theme
hmerge with upstream/ws-4
Merge pull request #9 from rchipman/ws-4

Setting up highlights theme