Remove one class at a time
Use cross-compatible gradients and colors
Merge changes
Standardization