Simplify colorscheme to remove extra checks