Added colors and others to match the mockup2