Remove Colorkage and remove ETA. Merge settings