rearrange rules
Non-greedy regex
Tweak rules (for highlighting)
Add testing for open-brace outdenting; tweaks