Reworked parameters for P2, P2S and P3. Grouped items together separated out score cut and engrave to different layers