Fix colors for non-solarized. Simplify compdefs for personal functions.