Converted triangles to quads where applicable.

In connect_2d_shapes, rectangles can be connected using quads instead
of triangles.