Dark theme highlight for more terminals

Supersedes #256 and fixes #255.