Separate colors from typography and update warning color
Rebuild