Tightened up the language

Use formal Euclidean plane geometric terms instead of the vague notion of shapes. Also drop the colour stuff, which isn't related to geometry.