Thread upgrade for Shapes

Started by Blaaa