Changed colors somewhat and cleanup