added color classes to the different cards
merged conflicts