Added colors and can pocketing to p1-tray2, finishing up p1 main