Updated to latest features revamp.

Hopefully this is the last time.
Still broken though, I don't think we support OR logic in features.