Shape drawing updated to be...drawable.