Add colorIds
Use Duration instead of Int for times