Added more colors, more motion events