Added colors to list view
Fixing merge conflict