Color improvements by Federica.