Decoupled the colors from the themes