Added remaining shapes (WT, ST, S)