Color theme changes.
Merge branch 'emacs-update' into ubuntu