cleanup and updated colors