Add second color field and other fix