Improved color fitting

Looks good!