Updated color.xml & designed tasklist rows
Fixed conflict