Added color to the shapes, fixed vertex winding on the ring, and cleaned up code a bit