#711 API enhancement and a minor color adjustment