Matching Angles and Shapes