Sidestream sorta-cherry pick from @lmartinho's improvement branch
Hopefully fixes #87
Add quick fix to "px" sized stroke widths messing up GUI to "NaN"
One for the upstream branch, though it's going to need some work.