The shapes and solids stuff is probably better off in the Stingray library.