Add more units and eliminate some duplicates

see https://developer.mozilla.org/en-US/docs/CSS/length#Units