Tidy up color terminology and variable names.

Use "default" to mean the default physical color, and "base" to mean
the base logical color.