Highlighting is preserved when new colorschemes are loaded. Slight
reorganization.