Move color into base