This is lots of line changes but I figured out since this diff will be large anyway...

We have a mess in lists of support properties here, they're in a completely random order. I made it alphabetical, it'd be good if we kept it that way.