Back to mostly straight corners, less padding
Merge pull request #161 from bullcitydave/35-final

Back to mostly straight corners, less padding