fixes, making scheme more consistent

This is a collection of corrections to the theme I've made over the past several months to overall: match the original scheme, add missing highlights, and better unify the terminal and GUI schemes.