Added colors and icons