Fixed Colors and added track column