added more colors;
prevent rendering of empty colors;