Shapes are now components.