Shapes

Some edges are sharp and corners now mismatch.