Add colors and checks