Added more color + rename