Add/remove options that didn't have matching entries in base.xml
We had rules file entries for those but no corresponding option in base.xml which means they were never reachable via any GUI. Taking a WAG here and removing some that look unused/broken and adding those that look like they're not.
Fixes #445 (closed)
Taken from !663