Highlighting 2

[mrjacobbloom]

All the changes you loved about #262, now without the extra commits!

This implements the highlighting from #255 with some improvements:

• [x] prettier highlighting for the blocks with rounded edges
• [x] highlight both at the same time
• [x] turn it on or off in the new View menu