moved colour vars into base