Feature/colors