Move some color defintions to colorscheme/*.json