Moved colors from base to a colors partial