Adjust names to those discussed in issue #13
Adjusted the stopwatch colours so that there is no cognitive dissonance in basic mode e.g. "Red giant" is now red.