new layout and more colors