Resurrect c++ source/header toggle and map a key to it that actually seems to work on the Mac.
Revised themes are safe