reorganizing color variables throughout discourse

Not 100% there - but much closer than the last color variable update